diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-20 15:11:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-20 15:11:08 +0200 |
| commit | cb612a12b952e349b96d427645aaeb55d15f509a (patch) | |
| tree | f29298f41d2a7ea2a976616243aca64c2c2547ce /plugins/shotwell-publishing/PicasaPublishing.vala | |
| parent | e7be93745e4a2ff3aa255227bef7b9d3b733aafa (diff) | |
| parent | 143bfc9f801c84428074312d661f8e08803df83b (diff) | |
Merge tag 'upstream/0.23.5'
Upstream version 0.23.5
Diffstat (limited to 'plugins/shotwell-publishing/PicasaPublishing.vala')
| -rw-r--r-- | plugins/shotwell-publishing/PicasaPublishing.vala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala index cb6352c..a393c08 100644 --- a/plugins/shotwell-publishing/PicasaPublishing.vala +++ b/plugins/shotwell-publishing/PicasaPublishing.vala @@ -11,7 +11,8 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service { public PicasaService(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) { @@ -351,9 +352,8 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher { try { // the trailing get_path() is required, since add_from_file can't cope // with File objects directly and expects a pathname instead. - builder.add_from_file( - get_host().get_module_file().get_parent(). - get_child("picasa_publishing_options_pane.glade").get_path()); + builder.add_from_resource(Resources.RESOURCE_PATH + "/" + + "picasa_publishing_options_pane.ui"); } catch (Error e) { warning("Could not parse UI file! Error: %s.", e.message); get_host().post_error( |