Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 17 insertions, 17 deletions

diff --git a/src/Properties.c b/src/Properties.c
index eee82c8..58b0cd2 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -1,4 +1,4 @@
-/* Properties.c generated by valac 0.34.4, the Vala compiler
+/* Properties.c generated by valac 0.34.7, the Vala compiler
  * generated from Properties.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1850,15 +1850,15 @@ static void properties_class_init (PropertiesClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (PropertiesPrivate));
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_single_properties = properties_real_get_single_properties;
+	((PropertiesClass *) klass)->get_single_properties = (void (*)(Properties*, DataView*)) properties_real_get_single_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_multiple_properties = properties_real_get_multiple_properties;
+	((PropertiesClass *) klass)->get_multiple_properties = (void (*)(Properties*, GeeIterable*)) properties_real_get_multiple_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_properties = properties_real_get_properties;
+	((PropertiesClass *) klass)->get_properties = (void (*)(Properties*, Page*)) properties_real_get_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->clear_properties = properties_real_clear_properties;
+	((PropertiesClass *) klass)->clear_properties = (void (*)(Properties*)) properties_real_clear_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->internal_update_properties = properties_real_internal_update_properties;
+	((PropertiesClass *) klass)->internal_update_properties = (void (*)(Properties*, Page*)) properties_real_internal_update_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = properties_finalize;
 #line 1865 "Properties.c"
@@ -3843,15 +3843,15 @@ static void basic_properties_class_init (BasicPropertiesClass * klass) {
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (BasicPropertiesPrivate));
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->clear_properties = basic_properties_real_clear_properties;
+	((PropertiesClass *) klass)->clear_properties = (void (*)(Properties*)) basic_properties_real_clear_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_single_properties = basic_properties_real_get_single_properties;
+	((PropertiesClass *) klass)->get_single_properties = (void (*)(Properties*, DataView*)) basic_properties_real_get_single_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_multiple_properties = basic_properties_real_get_multiple_properties;
+	((PropertiesClass *) klass)->get_multiple_properties = (void (*)(Properties*, GeeIterable*)) basic_properties_real_get_multiple_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_properties = basic_properties_real_get_properties;
+	((PropertiesClass *) klass)->get_properties = (void (*)(Properties*, Page*)) basic_properties_real_get_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->internal_update_properties = basic_properties_real_internal_update_properties;
+	((PropertiesClass *) klass)->internal_update_properties = (void (*)(Properties*, Page*)) basic_properties_real_internal_update_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = basic_properties_finalize;
 #line 3858 "Properties.c"
@@ -5692,11 +5692,11 @@ static void extended_properties_window_extended_properties_class_init (ExtendedP
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (ExtendedPropertiesWindowExtendedPropertiesPrivate));
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->clear_properties = extended_properties_window_extended_properties_real_clear_properties;
+	((PropertiesClass *) klass)->clear_properties = (void (*)(Properties*)) extended_properties_window_extended_properties_real_clear_properties;
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->get_single_properties = extended_properties_window_extended_properties_real_get_single_properties;
+	((PropertiesClass *) klass)->get_single_properties = (void (*)(Properties*, DataView*)) extended_properties_window_extended_properties_real_get_single_properties;
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
-	((PropertiesClass *) klass)->internal_update_properties = extended_properties_window_extended_properties_real_internal_update_properties;
+	((PropertiesClass *) klass)->internal_update_properties = (void (*)(Properties*, Page*)) extended_properties_window_extended_properties_real_internal_update_properties;
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = extended_properties_window_extended_properties_finalize;
 #line 5703 "Properties.c"
@@ -5770,11 +5770,11 @@ static void extended_properties_window_class_init (ExtendedPropertiesWindowClass
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (ExtendedPropertiesWindowPrivate));
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
-	((GtkWidgetClass *) klass)->button_press_event = extended_properties_window_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) extended_properties_window_real_button_press_event;
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
-	((GtkWidgetClass *) klass)->key_press_event = extended_properties_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) extended_properties_window_real_key_press_event;
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
-	((GtkWidgetClass *) klass)->show_all = extended_properties_window_real_show_all;
+	((GtkWidgetClass *) klass)->show_all = (void (*)(GtkWidget*)) extended_properties_window_real_show_all;
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = extended_properties_window_finalize;
 #line 5781 "Properties.c"