summaryrefslogtreecommitdiff
path: root/plugins/shotwell-publishing-extras/GalleryConnector.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/GalleryConnector.vala
parente7be93745e4a2ff3aa255227bef7b9d3b733aafa (diff)
parent143bfc9f801c84428074312d661f8e08803df83b (diff)
Merge tag 'upstream/0.23.5'
Upstream version 0.23.5
Diffstat (limited to 'plugins/shotwell-publishing-extras/GalleryConnector.vala')
-rw-r--r--plugins/shotwell-publishing-extras/GalleryConnector.vala20
1 files changed, 9 insertions, 11 deletions
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);