From 143bfc9f801c84428074312d661f8e08803df83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Aug 2016 15:09:31 +0200 Subject: Imported Upstream version 0.23.5 --- plugins/shotwell-publishing-extras/TumblrPublishing.vala | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'plugins/shotwell-publishing-extras/TumblrPublishing.vala') diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala index 9e17b4e..3f5a2ed 100644 --- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala +++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala @@ -13,7 +13,9 @@ public class TumblrService : Object, Spit.Pluggable, Spit.Publishing.Service { public TumblrService(GLib.File resource_directory) { if (icon_pixbuf_set == null) - icon_pixbuf_set = Resources.load_icon_set(resource_directory.get_child(ICON_FILENAME)); + icon_pixbuf_set = + Resources.load_from_resource(Resources.RESOURCE_PATH + "/" + + ICON_FILENAME); } public int get_pluggable_interface(int min_host_interface, int max_host_interface) { @@ -596,12 +598,9 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object { public AuthenticationPane(TumblrPublisher publisher, Mode mode = Mode.INTRO) { this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0); - File ui_file = publisher.get_host().get_module_file().get_parent(). - get_child("tumblr_authentication_pane.glade"); - try { builder = new Gtk.Builder(); - builder.add_from_file(ui_file.get_path()); + builder.add_from_resource (Resources.RESOURCE_PATH + "/tumblr_authentication_pane.ui"); builder.connect_signals(null); Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment; @@ -714,12 +713,11 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { this.media_type = media_type; this.sizes = sizes; this.blogs=blogs; - File ui_file = publisher.get_host().get_module_file().get_parent(). - get_child("tumblr_publishing_options_pane.glade"); - + try { builder = new Gtk.Builder(); - builder.add_from_file(ui_file.get_path()); + builder.add_from_resource (Resources.RESOURCE_PATH + + "/tumblr_publishing_options_pane.ui"); builder.connect_signals(null); // pull in the necessary widgets from the glade file -- cgit v1.2.3