Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 22 insertions, 22 deletions

diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index e304171..526b38f 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.34.4, the Vala compiler
+/* LibraryWindow.c generated by valac 0.34.7, the Vala compiler
  * generated from LibraryWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gee.h>
-#include <gio/gio.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <gphoto2/gphoto2-camera.h>
 #include <gphoto.h>
@@ -4395,7 +4395,7 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	to_remove = _tmp0_;
 #line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5596,7 +5596,7 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 #line 5596 "LibraryWindow.c"
 	}
 #line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
+	_tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	jobs = _tmp18_;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5687,7 +5687,7 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = jobs;
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = _tmp34_;
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9257,11 +9257,11 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_type_class_add_private (klass, sizeof (LibraryWindowFullscreenPhotoPagePrivate));
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->switched_to = library_window_fullscreen_photo_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*)(Page*)) library_window_fullscreen_photo_page_real_switched_to;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->switching_from = library_window_fullscreen_photo_page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*)(Page*)) library_window_fullscreen_photo_page_real_switching_from;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize;
 #line 9267 "LibraryWindow.c"
@@ -9310,35 +9310,35 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_type_class_add_private (klass, sizeof (LibraryWindowPrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->add_actions = library_window_real_add_actions;
+	((AppWindowClass *) klass)->add_actions = (void (*)(AppWindow*)) library_window_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageWindowClass *) klass)->switched_pages = library_window_real_switched_pages;
+	((PageWindowClass *) klass)->switched_pages = (void (*)(PageWindow*, Page*, Page*)) library_window_real_switched_pages;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->show_all = library_window_real_show_all;
+	((GtkWidgetClass *) klass)->show_all = (void (*)(GtkWidget*)) library_window_real_show_all;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->get_app_role = library_window_real_get_app_role;
+	((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) library_window_real_get_app_role;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->on_quit = library_window_real_on_quit;
+	((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) library_window_real_on_quit;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->on_fullscreen = library_window_real_on_fullscreen;
+	((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) library_window_real_on_fullscreen;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->update_common_action_availability = library_window_real_update_common_action_availability;
+	((AppWindowClass *) klass)->update_common_action_availability = (void (*)(AppWindow*, Page*, Page*)) library_window_real_update_common_action_availability;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->update_common_actions = library_window_real_update_common_actions;
+	((AppWindowClass *) klass)->update_common_actions = (void (*)(AppWindow*, Page*, gint, gint)) library_window_real_update_common_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->drag_motion = library_window_real_drag_motion;
+	((GtkWidgetClass *) klass)->drag_motion = (gboolean (*)(GtkWidget*, GdkDragContext*, gint, gint, guint)) library_window_real_drag_motion;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->drag_data_received = library_window_real_drag_data_received;
+	((GtkWidgetClass *) klass)->drag_data_received = (void (*)(GtkWidget*, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) library_window_real_drag_data_received;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageWindowClass *) klass)->set_current_page = library_window_real_set_current_page;
+	((PageWindowClass *) klass)->set_current_page = (void (*)(PageWindow*, Page*)) library_window_real_set_current_page;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->key_press_event = library_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) library_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_finalize;
 #line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
 #line 9344 "LibraryWindow.c"
@@ -9423,7 +9423,7 @@ static void library_window_instance_init (LibraryWindow * self) {
 #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = TRUE;
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_map = _tmp11_;
 #line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"