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-data-imports/FSpotImporter.vala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'plugins/shotwell-data-imports/FSpotImporter.vala') diff --git a/plugins/shotwell-data-imports/FSpotImporter.vala b/plugins/shotwell-data-imports/FSpotImporter.vala index bd408cc..be04cf9 100644 --- a/plugins/shotwell-data-imports/FSpotImporter.vala +++ b/plugins/shotwell-data-imports/FSpotImporter.vala @@ -13,7 +13,9 @@ public class FSpotService : Object, Spit.Pluggable, Spit.DataImports.Service { // initialize the database layer DataImports.FSpot.Db.init(); 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("/org/gnome/Shotwell/Imports/" + + ICON_FILENAME); } public int get_pluggable_interface(int min_host_interface, int max_host_interface) { @@ -252,8 +254,8 @@ public class FSpotImportableEvent : Spit.DataImports.ImportableEvent, GLib.Objec } public class FSpotImportableRating : Spit.DataImports.ImportableRating, GLib.Object { - public static const int REJECTED = -1; - public static const int UNRATED = 0; + public const int REJECTED = -1; + public const int UNRATED = 0; private int rating_value; -- cgit v1.2.3