summaryrefslogtreecommitdiff
path: root/src/direct
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-10-09 11:56:47 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-10-09 11:56:47 +0200
commit61daf2ebd98acb99ef2e06a743cf0dc76ecde3c6 (patch)
tree55c4c914bb35e1a85de2a95e10be499731e6d2d8 /src/direct
parent1c172114dfae26e3861c65510b45d9f6b7bdab67 (diff)
parent7b10dbdcb4c9027cd6f4690d6d70a2f36b37ab26 (diff)
Merge branch 'master' of ssh://git.debian.org/git/collab-maint/shotwell
Diffstat (limited to 'src/direct')
-rw-r--r--src/direct/DirectPhoto.vala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/direct/DirectPhoto.vala b/src/direct/DirectPhoto.vala
index 98886ba..f7271ba 100644
--- a/src/direct/DirectPhoto.vala
+++ b/src/direct/DirectPhoto.vala
@@ -38,6 +38,8 @@ public class DirectPhoto : Photo {
}
public static void init(File initial_file) {
+ init_photo();
+
global = new DirectPhotoSourceCollection(initial_file);
DirectPhoto photo;
string? reason = global.fetch(initial_file, out photo, false);
@@ -47,6 +49,7 @@ public class DirectPhoto : Photo {
}
public static void terminate() {
+ terminate_photo();
}
// Gets the dimensions of this photo's pixbuf when scaled to original
@@ -257,7 +260,7 @@ public class DirectPhotoSourceCollection : DatabaseSourceCollection {
}
public void reimport_photo(DirectPhoto photo) {
- photo.discard_prefetched(true);
+ photo.discard_prefetched();
DirectPhoto reimported_photo;
fetch(photo.get_file(), out reimported_photo, true);
}