summaryrefslogtreecommitdiff
path: root/src/direct
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-10-03 14:54:01 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-10-03 14:54:01 +0200
commit7b10dbdcb4c9027cd6f4690d6d70a2f36b37ab26 (patch)
tree8c2dc037df8983a487c4f271a95e38c87f4711e3 /src/direct
parent021b663419ce8524fe1bd3f928062bef96f215c4 (diff)
parente97c1ca41f345bcf57417f6dc06e0d42f3547443 (diff)
Merge tag 'upstream/0.20.1'
Upstream version 0.20.1
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);
}