summaryrefslogtreecommitdiff
path: root/plugins/shotwell-data-imports/FSpotImporter.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-data-imports/FSpotImporter.vala
parente7be93745e4a2ff3aa255227bef7b9d3b733aafa (diff)
parent143bfc9f801c84428074312d661f8e08803df83b (diff)
Merge tag 'upstream/0.23.5'
Upstream version 0.23.5
Diffstat (limited to 'plugins/shotwell-data-imports/FSpotImporter.vala')
-rw-r--r--plugins/shotwell-data-imports/FSpotImporter.vala8
1 files changed, 5 insertions, 3 deletions
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;