Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

5 files changed, 48 insertions, 48 deletions

diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index 3f0abf5..1d5987d 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.34.4, the Vala compiler
+/* Direct.c generated by valac 0.34.7, 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 369ddae..5347674 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.34.4, the Vala compiler
+/* DirectPhoto.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1825,33 +1825,33 @@ static void direct_photo_class_init (DirectPhotoClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_type_class_add_private (klass, sizeof (DirectPhotoPrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->get_preview_pixbuf = direct_photo_real_get_preview_pixbuf;
+	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) direct_photo_real_get_preview_pixbuf;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->rotate = direct_photo_real_rotate;
+	((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) direct_photo_real_rotate;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoSourceClass *) klass)->get_pixbuf = direct_photo_real_get_pixbuf;
+	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) direct_photo_real_get_pixbuf;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((ThumbnailSourceClass *) klass)->get_thumbnail = direct_photo_real_get_thumbnail;
+	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) direct_photo_real_get_thumbnail;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataObjectClass *) klass)->notify_altered = direct_photo_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) direct_photo_real_notify_altered;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->has_user_generated_metadata = direct_photo_real_has_user_generated_metadata;
+	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) direct_photo_real_has_user_generated_metadata;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->set_user_metadata_for_export = direct_photo_real_set_user_metadata_for_export;
+	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_set_user_metadata_for_export;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((PhotoClass *) klass)->apply_user_metadata_for_reimport = direct_photo_real_apply_user_metadata_for_reimport;
+	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_apply_user_metadata_for_reimport;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->is_trashed = direct_photo_real_is_trashed;
+	((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) direct_photo_real_is_trashed;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->is_offline = direct_photo_real_is_offline;
+	((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) direct_photo_real_is_offline;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->trash = direct_photo_real_trash;
+	((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) direct_photo_real_trash;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->untrash = direct_photo_real_untrash;
+	((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) direct_photo_real_untrash;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->mark_offline = direct_photo_real_mark_offline;
+	((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) direct_photo_real_mark_offline;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((MediaSourceClass *) klass)->mark_online = direct_photo_real_mark_online;
+	((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) direct_photo_real_mark_online;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2772,11 +2772,11 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_type_class_add_private (klass, sizeof (DirectPhotoSourceCollectionPrivate));
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((SourceCollectionClass *) klass)->holds_type_of_source = direct_photo_source_collection_real_holds_type_of_source;
+	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) direct_photo_source_collection_real_holds_type_of_source;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataCollectionClass *) klass)->notify_items_added = direct_photo_source_collection_real_notify_items_added;
+	((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_added;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	((DataCollectionClass *) klass)->notify_items_removed = direct_photo_source_collection_real_notify_items_removed;
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed;
 #line 2781 "DirectPhoto.c"
 }
 
@@ -2787,11 +2787,11 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv = DIRECT_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #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_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);
+	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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 cc6e84e..6f15462 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -1,4 +1,4 @@
-/* DirectPhotoPage.c generated by valac 0.34.4, the Vala compiler
+/* DirectPhotoPage.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectPhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3785,35 +3785,35 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (DirectPhotoPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = direct_photo_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) direct_photo_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->add_actions = direct_photo_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) direct_photo_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->remove_actions = direct_photo_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) direct_photo_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->init_collect_injection_groups = direct_photo_page_real_init_collect_injection_groups;
+	((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) direct_photo_page_real_init_collect_injection_groups;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((GtkWidgetClass *) klass)->realize = direct_photo_page_real_realize;
+	((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) direct_photo_page_real_realize;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->photo_changing = direct_photo_page_real_photo_changing;
+	((EditingHostPageClass *) klass)->photo_changing = (void (*)(EditingHostPage*, Photo*)) direct_photo_page_real_photo_changing;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->on_context_buttonpress = direct_photo_page_real_on_context_buttonpress;
+	((PageClass *) klass)->on_context_buttonpress = (gboolean (*)(Page*, GdkEventButton*)) direct_photo_page_real_on_context_buttonpress;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_increase_size = direct_photo_page_real_on_increase_size;
+	((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) direct_photo_page_real_on_increase_size;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_decrease_size = direct_photo_page_real_on_decrease_size;
+	((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) direct_photo_page_real_on_decrease_size;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->on_double_click = direct_photo_page_real_on_double_click;
+	((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) direct_photo_page_real_on_double_click;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->update_ui = direct_photo_page_real_update_ui;
+	((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) direct_photo_page_real_update_ui;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->update_actions = direct_photo_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) direct_photo_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->confirm_replace_photo = direct_photo_page_real_confirm_replace_photo;
+	((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*)(EditingHostPage*, Photo*, Photo*)) direct_photo_page_real_confirm_replace_photo;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->on_app_key_pressed = direct_photo_page_real_on_app_key_pressed;
+	((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) direct_photo_page_real_on_app_key_pressed;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((EditingHostPageClass *) klass)->create_photo_view = direct_photo_page_real_create_photo_view;
+	((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*)(EditingHostPage*, DataSource*)) direct_photo_page_real_create_photo_view;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_page_finalize;
 #line 3820 "DirectPhotoPage.c"
@@ -3910,7 +3910,7 @@ static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageCl
 #line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
 #line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = direct_fullscreen_photo_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) direct_fullscreen_photo_page_real_init_collect_ui_filenames;
 #line 3915 "DirectPhotoPage.c"
 }
 
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index f2ef1b1..da18fc5 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.34.4, the Vala compiler
+/* DirectView.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -780,7 +780,7 @@ static void direct_view_collection_direct_view_manager_class_init (DirectViewCol
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	direct_view_collection_direct_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	((ViewManagerClass *) klass)->create_view = direct_view_collection_direct_view_manager_real_create_view;
+	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) direct_view_collection_direct_view_manager_real_create_view;
 #line 785 "DirectView.c"
 }
 
diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index 06465a8..265200a 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.34.4, the Vala compiler
+/* DirectWindow.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,10 +12,10 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <gee.h>
 #include <glib/gi18n-lib.h>
-#include <gdk/gdk.h>
 
 
 #define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -881,17 +881,17 @@ static void direct_window_class_init (DirectWindowClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_type_class_add_private (klass, sizeof (DirectWindowPrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->on_fullscreen = direct_window_real_on_fullscreen;
+	((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) direct_window_real_on_fullscreen;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->get_app_role = direct_window_real_get_app_role;
+	((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) direct_window_real_get_app_role;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->on_quit = direct_window_real_on_quit;
+	((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) direct_window_real_on_quit;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->delete_event = direct_window_real_delete_event;
+	((GtkWidgetClass *) klass)->delete_event = (gboolean (*)(GtkWidget*, GdkEventAny*)) direct_window_real_delete_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->button_press_event = direct_window_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) direct_window_real_button_press_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->key_press_event = direct_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) direct_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_window_finalize;
 #line 898 "DirectWindow.c"