Merge branch 'feature/upstream' into develop

1 files changed, 56 insertions, 34 deletions

diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index 1456a05..254fe54 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.34.7, the Vala compiler
+/* Entry.c generated by valac 0.36.6, the Vala compiler
  * generated from Entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -32,6 +32,12 @@ typedef struct _SidebarEntryIface SidebarEntryIface;
 
 typedef struct _SidebarTree SidebarTree;
 typedef struct _SidebarTreeClass SidebarTreeClass;
+enum  {
+	SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL,
+	SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL,
+	SIDEBAR_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_entry_signals[SIDEBAR_ENTRY_LAST_SIGNAL] = {0};
 
 #define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ())
 #define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry))
@@ -66,6 +72,12 @@ typedef struct _SidebarPageRepresentativeIface SidebarPageRepresentativeIface;
 
 typedef struct _Page Page;
 typedef struct _PageClass PageClass;
+enum  {
+	SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL,
+	SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL,
+	SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL
+};
+static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL] = {0};
 
 #define SIDEBAR_TYPE_RENAMEABLE_ENTRY (sidebar_renameable_entry_get_type ())
 #define SIDEBAR_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry))
@@ -74,6 +86,11 @@ typedef struct _PageClass PageClass;
 
 typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
 typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
+enum  {
+	SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL,
+	SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL] = {0};
 
 #define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ())
 #define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry))
@@ -82,6 +99,11 @@ typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
 
 typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
 typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
+enum  {
+	SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL,
+	SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL] = {0};
 
 #define SIDEBAR_TYPE_DESTROYABLE_ENTRY (sidebar_destroyable_entry_get_type ())
 #define SIDEBAR_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntry))
@@ -241,7 +263,7 @@ gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self) {
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 12 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_name (self);
-#line 245 "Entry.c"
+#line 267 "Entry.c"
 }
 
 
@@ -250,7 +272,7 @@ gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self) {
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 14 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_tooltip (self);
-#line 254 "Entry.c"
+#line 276 "Entry.c"
 }
 
 
@@ -259,7 +281,7 @@ gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self) {
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 16 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_icon (self);
-#line 263 "Entry.c"
+#line 285 "Entry.c"
 }
 
 
@@ -268,14 +290,14 @@ gchar* sidebar_entry_to_string (SidebarEntry* self) {
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 18 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->to_string (self);
-#line 272 "Entry.c"
+#line 294 "Entry.c"
 }
 
 
 static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree) {
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (tree));
-#line 279 "Entry.c"
+#line 301 "Entry.c"
 }
 
 
@@ -284,14 +306,14 @@ void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree) {
 	g_return_if_fail (SIDEBAR_IS_ENTRY (self));
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_ENTRY_GET_INTERFACE (self)->grafted (self, tree);
-#line 288 "Entry.c"
+#line 310 "Entry.c"
 }
 
 
 static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree) {
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (tree));
-#line 295 "Entry.c"
+#line 317 "Entry.c"
 }
 
 
@@ -300,7 +322,7 @@ void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree) {
 	g_return_if_fail (SIDEBAR_IS_ENTRY (self));
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_ENTRY_GET_INTERFACE (self)->pruned (self, tree);
-#line 304 "Entry.c"
+#line 326 "Entry.c"
 }
 
 
@@ -312,14 +334,14 @@ static void sidebar_entry_base_init (SidebarEntryIface * iface) {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("sidebar_tooltip_changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+		sidebar_entry_signals[SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL] = g_signal_new ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("sidebar_icon_changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+		sidebar_entry_signals[SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL] = g_signal_new ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		iface->grafted = sidebar_entry_real_grafted;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		iface->pruned = sidebar_entry_real_pruned;
-#line 323 "Entry.c"
+#line 345 "Entry.c"
 	}
 }
 
@@ -342,7 +364,7 @@ gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self
 	g_return_val_if_fail (SIDEBAR_IS_EXPANDABLE_ENTRY (self), FALSE);
 #line 28 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_EXPANDABLE_ENTRY_GET_INTERFACE (self)->expand_on_select (self);
-#line 346 "Entry.c"
+#line 368 "Entry.c"
 }
 
 
@@ -353,7 +375,7 @@ static void sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * if
 	if (!initialized) {
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 357 "Entry.c"
+#line 379 "Entry.c"
 	}
 }
 
@@ -378,7 +400,7 @@ static void sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * if
 	if (!initialized) {
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 382 "Entry.c"
+#line 404 "Entry.c"
 	}
 }
 
@@ -401,7 +423,7 @@ gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self)
 	g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), FALSE);
 #line 41 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->has_page (self);
-#line 405 "Entry.c"
+#line 427 "Entry.c"
 }
 
 
@@ -410,7 +432,7 @@ Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self) {
 	g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), NULL);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->get_page (self);
-#line 414 "Entry.c"
+#line 436 "Entry.c"
 }
 
 
@@ -422,10 +444,10 @@ static void sidebar_page_representative_base_init (SidebarPageRepresentativeIfac
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("page_created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
+		sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("destroying_page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
-#line 429 "Entry.c"
+		sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
+#line 451 "Entry.c"
 	}
 }
 
@@ -449,7 +471,7 @@ void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar*
 	g_return_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self));
 #line 49 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->rename (self, new_name);
-#line 453 "Entry.c"
+#line 475 "Entry.c"
 }
 
 
@@ -458,7 +480,7 @@ gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* se
 	g_return_val_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self), FALSE);
 #line 52 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->is_user_renameable (self);
-#line 462 "Entry.c"
+#line 484 "Entry.c"
 }
 
 
@@ -470,8 +492,8 @@ static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * if
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("sidebar_name_changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 475 "Entry.c"
+		sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL] = g_signal_new ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 497 "Entry.c"
 	}
 }
 
@@ -494,7 +516,7 @@ gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* sel
 	g_return_val_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (self), FALSE);
 #line 58 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_EMPHASIZABLE_ENTRY_GET_INTERFACE (self)->is_emphasized (self);
-#line 498 "Entry.c"
+#line 520 "Entry.c"
 }
 
 
@@ -506,8 +528,8 @@ static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
-		g_signal_new ("is_emphasized_changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 511 "Entry.c"
+		sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL] = g_signal_new ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 533 "Entry.c"
 	}
 }
 
@@ -530,7 +552,7 @@ void sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self) {
 	g_return_if_fail (SIDEBAR_IS_DESTROYABLE_ENTRY (self));
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_DESTROYABLE_ENTRY_GET_INTERFACE (self)->destroy_source (self);
-#line 534 "Entry.c"
+#line 556 "Entry.c"
 }
 
 
@@ -541,7 +563,7 @@ static void sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface *
 	if (!initialized) {
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 545 "Entry.c"
+#line 567 "Entry.c"
 	}
 }
 
@@ -564,7 +586,7 @@ gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInter
 	g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE);
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received (self, sources);
-#line 568 "Entry.c"
+#line 590 "Entry.c"
 }
 
 
@@ -573,7 +595,7 @@ gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (Si
 	g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received_arbitrary (self, data);
-#line 577 "Entry.c"
+#line 599 "Entry.c"
 }
 
 
@@ -584,7 +606,7 @@ static void sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTar
 	if (!initialized) {
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 588 "Entry.c"
+#line 610 "Entry.c"
 	}
 }
 
@@ -607,7 +629,7 @@ void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalD
 	g_return_if_fail (SIDEBAR_IS_INTERNAL_DRAG_SOURCE_ENTRY (self));
 #line 72 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_INTERNAL_DRAG_SOURCE_ENTRY_GET_INTERFACE (self)->prepare_selection_data (self, data);
-#line 611 "Entry.c"
+#line 633 "Entry.c"
 }
 
 
@@ -618,7 +640,7 @@ static void sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSou
 	if (!initialized) {
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 622 "Entry.c"
+#line 644 "Entry.c"
 	}
 }