New upstream version 0.26.1upstream/0.26.1

1 files changed, 19 insertions, 19 deletions

diff --git a/src/events/Branch.c b/src/events/Branch.c
index ac8b255..2320a00 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3312,7 +3312,7 @@ static void events_branch_instance_init (EventsBranch * self) {
 #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self->priv = EVENTS_BRANCH_GET_PRIVATE (self);
 #line 18 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, EVENTS_TYPE_EVENT_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, EVENTS_TYPE_EVENT_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 18 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self->priv->entry_map = _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3444,7 +3444,7 @@ static void events_directory_entry_class_init (EventsDirectoryEntryClass * klass
 #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_directory_entry_parent_class = g_type_class_peek_parent (klass);
 #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = events_directory_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_directory_entry_real_get_sidebar_icon;
 #line 3449 "Branch.c"
 }
 
@@ -3550,11 +3550,11 @@ static void events_master_directory_entry_class_init (EventsMasterDirectoryEntry
 #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_master_directory_entry_parent_class = g_type_class_peek_parent (klass);
 #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = events_master_directory_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_get_sidebar_name;
 #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = events_master_directory_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_get_sidebar_icon;
 #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = events_master_directory_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_create_page;
 #line 3559 "Branch.c"
 }
 
@@ -3675,9 +3675,9 @@ static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClas
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_type_class_add_private (klass, sizeof (EventsYearDirectoryEntryPrivate));
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = events_year_directory_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_year_directory_entry_real_get_sidebar_name;
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = events_year_directory_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_year_directory_entry_real_create_page;
 #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_year_directory_entry_finalize;
 #line 3684 "Branch.c"
@@ -3833,9 +3833,9 @@ static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryCl
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_type_class_add_private (klass, sizeof (EventsMonthDirectoryEntryPrivate));
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = events_month_directory_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_month_directory_entry_real_get_sidebar_name;
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = events_month_directory_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_month_directory_entry_real_create_page;
 #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_month_directory_entry_finalize;
 #line 3842 "Branch.c"
@@ -3931,9 +3931,9 @@ static void events_undated_directory_entry_class_init (EventsUndatedDirectoryEnt
 #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_undated_directory_entry_parent_class = g_type_class_peek_parent (klass);
 #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = events_undated_directory_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_get_sidebar_name;
 #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = events_undated_directory_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_create_page;
 #line 3938 "Branch.c"
 }
 
@@ -4142,7 +4142,7 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 #line 499 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
 #line 502 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 502 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	views = _tmp0_;
 #line 4149 "Branch.c"
@@ -4276,11 +4276,11 @@ static void events_event_entry_class_init (EventsEventEntryClass * klass) {
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_type_class_add_private (klass, sizeof (EventsEventEntryPrivate));
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = events_event_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_event_entry_real_get_sidebar_name;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = events_event_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_event_entry_real_get_sidebar_icon;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = events_event_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_event_entry_real_create_page;
 #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_event_entry_finalize;
 #line 4287 "Branch.c"
@@ -4418,11 +4418,11 @@ static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) {
 #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	events_no_event_entry_parent_class = g_type_class_peek_parent (klass);
 #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = events_no_event_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_get_sidebar_name;
 #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = events_no_event_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_get_sidebar_icon;
 #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = events_no_event_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_create_page;
 #line 4427 "Branch.c"
 }