Merge branch 'feature/upstream' into develop

1 files changed, 169 insertions, 80 deletions

diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index 254fe54..ab4bbdb 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.36.6, the Vala compiler
+/* Entry.c generated by valac 0.40.4, the Vala compiler
  * generated from Entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -35,9 +36,9 @@ typedef struct _SidebarTreeClass SidebarTreeClass;
 enum  {
 	SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL,
 	SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL,
-	SIDEBAR_ENTRY_LAST_SIGNAL
+	SIDEBAR_ENTRY_NUM_SIGNALS
 };
-static guint sidebar_entry_signals[SIDEBAR_ENTRY_LAST_SIGNAL] = {0};
+static guint sidebar_entry_signals[SIDEBAR_ENTRY_NUM_SIGNALS] = {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))
@@ -75,9 +76,9 @@ typedef struct _PageClass PageClass;
 enum  {
 	SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL,
 	SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL,
-	SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL
+	SIDEBAR_PAGE_REPRESENTATIVE_NUM_SIGNALS
 };
-static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL] = {0};
+static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_NUM_SIGNALS] = {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))
@@ -88,9 +89,9 @@ typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
 typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
 enum  {
 	SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL,
-	SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL
+	SIDEBAR_RENAMEABLE_ENTRY_NUM_SIGNALS
 };
-static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL] = {0};
+static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_NUM_SIGNALS] = {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))
@@ -101,9 +102,9 @@ typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
 typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
 enum  {
 	SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL,
-	SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL
+	SIDEBAR_EMPHASIZABLE_ENTRY_NUM_SIGNALS
 };
-static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL] = {0};
+static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_NUM_SIGNALS] = {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))
@@ -229,10 +230,14 @@ gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self);
 gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self);
 gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self);
 gchar* sidebar_entry_to_string (SidebarEntry* self);
-void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree);
-static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree);
-void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree);
-static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree);
+void sidebar_entry_grafted (SidebarEntry* self,
+                            SidebarTree* tree);
+static void sidebar_entry_real_grafted (SidebarEntry* self,
+                                 SidebarTree* tree);
+void sidebar_entry_pruned (SidebarEntry* self,
+                           SidebarTree* tree);
+static void sidebar_entry_real_pruned (SidebarEntry* self,
+                                SidebarTree* tree);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
@@ -241,7 +246,8 @@ GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
 gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self);
 Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
-void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name);
+void sidebar_renameable_entry_rename (SidebarRenameableEntry* self,
+                                      const gchar* new_name);
 gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self);
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
 gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self);
@@ -252,81 +258,106 @@ GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST;
-gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, GeeList* sources);
-gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, GtkSelectionData* data);
+gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self,
+                                                                    GeeList* sources);
+gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self,
+                                                                              GtkSelectionData* data);
 GType sidebar_internal_drag_source_entry_get_type (void) G_GNUC_CONST;
-void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, GtkSelectionData* data);
+void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self,
+                                                                GtkSelectionData* data);
 
 
-gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self) {
+gchar*
+sidebar_entry_get_sidebar_name (SidebarEntry* self)
+{
 #line 12 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 267 "Entry.c"
+#line 278 "Entry.c"
 }
 
 
-gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self) {
+gchar*
+sidebar_entry_get_sidebar_tooltip (SidebarEntry* self)
+{
 #line 14 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 276 "Entry.c"
+#line 289 "Entry.c"
 }
 
 
-gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self) {
+gchar*
+sidebar_entry_get_sidebar_icon (SidebarEntry* self)
+{
 #line 16 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 285 "Entry.c"
+#line 300 "Entry.c"
 }
 
 
-gchar* sidebar_entry_to_string (SidebarEntry* self) {
+gchar*
+sidebar_entry_to_string (SidebarEntry* self)
+{
 #line 18 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 294 "Entry.c"
+#line 311 "Entry.c"
 }
 
 
-static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree) {
+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 301 "Entry.c"
+#line 321 "Entry.c"
 }
 
 
-void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree) {
+void
+sidebar_entry_grafted (SidebarEntry* self,
+                       SidebarTree* tree)
+{
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 310 "Entry.c"
+#line 333 "Entry.c"
 }
 
 
-static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree) {
+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 317 "Entry.c"
+#line 343 "Entry.c"
 }
 
 
-void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree) {
+void
+sidebar_entry_pruned (SidebarEntry* self,
+                      SidebarTree* tree)
+{
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 326 "Entry.c"
+#line 355 "Entry.c"
 }
 
 
-static void sidebar_entry_base_init (SidebarEntryIface * iface) {
+static void
+sidebar_entry_base_init (SidebarEntryIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
@@ -341,12 +372,14 @@ static void sidebar_entry_base_init (SidebarEntryIface * iface) {
 		iface->grafted = sidebar_entry_real_grafted;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		iface->pruned = sidebar_entry_real_pruned;
-#line 345 "Entry.c"
+#line 376 "Entry.c"
 	}
 }
 
 
-GType sidebar_entry_get_type (void) {
+GType
+sidebar_entry_get_type (void)
+{
 	static volatile gsize sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarEntryIface), (GBaseInitFunc) sidebar_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -359,28 +392,34 @@ GType sidebar_entry_get_type (void) {
 }
 
 
-gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self) {
+gboolean
+sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self)
+{
 #line 28 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 368 "Entry.c"
+#line 403 "Entry.c"
 }
 
 
-static void sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * iface) {
+static void
+sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * iface)
+{
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 379 "Entry.c"
+#line 416 "Entry.c"
 	}
 }
 
 
-GType sidebar_expandable_entry_get_type (void) {
+GType
+sidebar_expandable_entry_get_type (void)
+{
 	static volatile gsize sidebar_expandable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_expandable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarExpandableEntryIface), (GBaseInitFunc) sidebar_expandable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -393,19 +432,23 @@ GType sidebar_expandable_entry_get_type (void) {
 }
 
 
-static void sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * iface) {
+static void
+sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * iface)
+{
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 404 "Entry.c"
+#line 445 "Entry.c"
 	}
 }
 
 
-GType sidebar_selectable_entry_get_type (void) {
+GType
+sidebar_selectable_entry_get_type (void)
+{
 	static volatile gsize sidebar_selectable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_selectable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarSelectableEntryIface), (GBaseInitFunc) sidebar_selectable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -418,25 +461,31 @@ GType sidebar_selectable_entry_get_type (void) {
 }
 
 
-gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self) {
+gboolean
+sidebar_page_representative_has_page (SidebarPageRepresentative* self)
+{
 #line 41 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 427 "Entry.c"
+#line 472 "Entry.c"
 }
 
 
-Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self) {
+Page*
+sidebar_page_representative_get_page (SidebarPageRepresentative* self)
+{
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 436 "Entry.c"
+#line 483 "Entry.c"
 }
 
 
-static void sidebar_page_representative_base_init (SidebarPageRepresentativeIface * iface) {
+static void
+sidebar_page_representative_base_init (SidebarPageRepresentativeIface * iface)
+{
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
@@ -447,12 +496,14 @@ static void sidebar_page_representative_base_init (SidebarPageRepresentativeIfac
 		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"
 		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"
+#line 500 "Entry.c"
 	}
 }
 
 
-GType sidebar_page_representative_get_type (void) {
+GType
+sidebar_page_representative_get_type (void)
+{
 	static volatile gsize sidebar_page_representative_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_page_representative_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarPageRepresentativeIface), (GBaseInitFunc) sidebar_page_representative_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -466,25 +517,32 @@ GType sidebar_page_representative_get_type (void) {
 }
 
 
-void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name) {
+void
+sidebar_renameable_entry_rename (SidebarRenameableEntry* self,
+                                 const gchar* new_name)
+{
 #line 49 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 475 "Entry.c"
+#line 529 "Entry.c"
 }
 
 
-gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self) {
+gboolean
+sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self)
+{
 #line 52 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 484 "Entry.c"
+#line 540 "Entry.c"
 }
 
 
-static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * iface) {
+static void
+sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * iface)
+{
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
@@ -493,12 +551,14 @@ static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * if
 		initialized = TRUE;
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		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"
+#line 555 "Entry.c"
 	}
 }
 
 
-GType sidebar_renameable_entry_get_type (void) {
+GType
+sidebar_renameable_entry_get_type (void)
+{
 	static volatile gsize sidebar_renameable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_renameable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarRenameableEntryIface), (GBaseInitFunc) sidebar_renameable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -511,16 +571,20 @@ GType sidebar_renameable_entry_get_type (void) {
 }
 
 
-gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self) {
+gboolean
+sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self)
+{
 #line 58 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 520 "Entry.c"
+#line 582 "Entry.c"
 }
 
 
-static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface * iface) {
+static void
+sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface * iface)
+{
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
@@ -529,12 +593,14 @@ static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface
 		initialized = TRUE;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		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"
+#line 597 "Entry.c"
 	}
 }
 
 
-GType sidebar_emphasizable_entry_get_type (void) {
+GType
+sidebar_emphasizable_entry_get_type (void)
+{
 	static volatile gsize sidebar_emphasizable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_emphasizable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarEmphasizableEntryIface), (GBaseInitFunc) sidebar_emphasizable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -547,28 +613,34 @@ GType sidebar_emphasizable_entry_get_type (void) {
 }
 
 
-void sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self) {
+void
+sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self)
+{
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 556 "Entry.c"
+#line 624 "Entry.c"
 }
 
 
-static void sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface * iface) {
+static void
+sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface * iface)
+{
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 567 "Entry.c"
+#line 637 "Entry.c"
 	}
 }
 
 
-GType sidebar_destroyable_entry_get_type (void) {
+GType
+sidebar_destroyable_entry_get_type (void)
+{
 	static volatile gsize sidebar_destroyable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_destroyable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarDestroyableEntryIface), (GBaseInitFunc) sidebar_destroyable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -581,37 +653,47 @@ GType sidebar_destroyable_entry_get_type (void) {
 }
 
 
-gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, GeeList* sources) {
+gboolean
+sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self,
+                                                           GeeList* sources)
+{
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 590 "Entry.c"
+#line 665 "Entry.c"
 }
 
 
-gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, GtkSelectionData* data) {
+gboolean
+sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self,
+                                                                     GtkSelectionData* data)
+{
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 599 "Entry.c"
+#line 677 "Entry.c"
 }
 
 
-static void sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTargetEntryIface * iface) {
+static void
+sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTargetEntryIface * iface)
+{
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 610 "Entry.c"
+#line 690 "Entry.c"
 	}
 }
 
 
-GType sidebar_internal_drop_target_entry_get_type (void) {
+GType
+sidebar_internal_drop_target_entry_get_type (void)
+{
 	static volatile gsize sidebar_internal_drop_target_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_internal_drop_target_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarInternalDropTargetEntryIface), (GBaseInitFunc) sidebar_internal_drop_target_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -624,28 +706,35 @@ GType sidebar_internal_drop_target_entry_get_type (void) {
 }
 
 
-void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, GtkSelectionData* data) {
+void
+sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self,
+                                                           GtkSelectionData* data)
+{
 #line 72 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	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 633 "Entry.c"
+#line 718 "Entry.c"
 }
 
 
-static void sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSourceEntryIface * iface) {
+static void
+sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSourceEntryIface * iface)
+{
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 644 "Entry.c"
+#line 731 "Entry.c"
 	}
 }
 
 
-GType sidebar_internal_drag_source_entry_get_type (void) {
+GType
+sidebar_internal_drag_source_entry_get_type (void)
+{
 	static volatile gsize sidebar_internal_drag_source_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_internal_drag_source_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarInternalDragSourceEntryIface), (GBaseInitFunc) sidebar_internal_drag_source_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };