summaryrefslogtreecommitdiff
path: root/plugins/shotwell-publishing-extras/TumblrPublishing.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-08-20 15:11:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-08-20 15:11:08 +0200
commitcb612a12b952e349b96d427645aaeb55d15f509a (patch)
treef29298f41d2a7ea2a976616243aca64c2c2547ce /plugins/shotwell-publishing-extras/TumblrPublishing.vala
parente7be93745e4a2ff3aa255227bef7b9d3b733aafa (diff)
parent143bfc9f801c84428074312d661f8e08803df83b (diff)
Merge tag 'upstream/0.23.5'
Upstream version 0.23.5
Diffstat (limited to 'plugins/shotwell-publishing-extras/TumblrPublishing.vala')
-rw-r--r--plugins/shotwell-publishing-extras/TumblrPublishing.vala16
1 files changed, 7 insertions, 9 deletions
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