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 --- .../shotwell-publishing-extras/GalleryConnector.vala | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'plugins/shotwell-publishing-extras/GalleryConnector.vala') diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.vala b/plugins/shotwell-publishing-extras/GalleryConnector.vala index 6eb5a3a..ee7bd19 100644 --- a/plugins/shotwell-publishing-extras/GalleryConnector.vala +++ b/plugins/shotwell-publishing-extras/GalleryConnector.vala @@ -5,9 +5,9 @@ */ -static const string G3_VERSION = "0.1"; +const string G3_VERSION = "0.1"; -static const string G3_LICENSE = """ +const string G3_LICENSE = """ The Gallery3Publishing module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 @@ -24,7 +24,7 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA """; -static const string WEBSITE_URL = +const string WEBSITE_URL = "https://github.com/sappjw/shotwell-gallery3"; // This module's Spit.Module @@ -63,8 +63,8 @@ public class Gallery3Service : Object, Spit.Pluggable, public Gallery3Service(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, @@ -1011,9 +1011,8 @@ public class GalleryPublisher : Spit.Publishing.Publisher, GLib.Object { Gtk.Builder builder = new Gtk.Builder(); try { - builder.add_from_file( - host.get_module_file().get_parent().get_child( - "gallery3_publishing_options_pane.glade").get_path()); + builder.add_from_resource(Resources.RESOURCE_PATH + + "/gallery3_publishing_options_pane.ui"); } catch (Error e) { warning("Could not parse UI file! Error: %s.", e.message); @@ -1764,9 +1763,8 @@ internal class CredentialsPane : Spit.Publishing.DialogPane, GLib.Object { Gtk.Builder builder = new Gtk.Builder(); try { - builder.add_from_file( - host.get_module_file().get_parent().get_child( - "gallery3_authentication_pane.glade").get_path()); + builder.add_from_resource (Resources.RESOURCE_PATH + + "/gallery3_authentication_pane.ui"); } catch (Error e) { warning("Could not parse UI file! Error: %s.", e.message); -- cgit v1.2.3