summaryrefslogtreecommitdiff
path: root/src/direct
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-09 06:55:40 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-09 06:55:40 +0100
commit71376a8631a4262793351e3431b3bc2df93b15dd (patch)
treea7b7313268ffc0e98a0f51e15fb2477b00194458 /src/direct
parent524a49de17c1c432b0ad6b16f11e64586bf10e7c (diff)
parent7152401783578b56343f578b4ec920998660de33 (diff)
Merge tag 'upstream/0.25.0.1'
Upstream version 0.25.0.1
Diffstat (limited to 'src/direct')
-rw-r--r--src/direct/Direct.c2
-rw-r--r--src/direct/DirectPhoto.c4
-rw-r--r--src/direct/DirectPhotoPage.c2
-rw-r--r--src/direct/DirectView.c2
-rw-r--r--src/direct/DirectWindow.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index 91704cf..f526072 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.34.1, the Vala compiler
+/* Direct.c generated by valac 0.34.2, the Vala compiler
* generated from Direct.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index b80ec06..b4c3f1c 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.34.1, the Vala compiler
+/* DirectPhoto.c generated by valac 0.34.2, the Vala compiler
* generated from DirectPhoto.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2791,7 +2791,7 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self->priv->prepared_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self->priv->file_map = _tmp1_;
#line 2798 "DirectPhoto.c"
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index 1eea167..dd66352 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -1,4 +1,4 @@
-/* DirectPhotoPage.c generated by valac 0.34.1, the Vala compiler
+/* DirectPhotoPage.c generated by valac 0.34.2, the Vala compiler
* generated from DirectPhotoPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index d829231..e4ec0ca 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.34.1, the Vala compiler
+/* DirectView.c generated by valac 0.34.2, the Vala compiler
* generated from DirectView.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index cafd55d..ddaa2e1 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.34.1, the Vala compiler
+/* DirectWindow.c generated by valac 0.34.2, the Vala compiler
* generated from DirectWindow.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.