Merge branch 'feature/upstream' into develop

1 files changed, 343 insertions, 275 deletions

diff --git a/src/camera/CameraBranch.c b/src/camera/CameraBranch.c
index 9ac4b11..17c9f52 100644
--- a/src/camera/CameraBranch.c
+++ b/src/camera/CameraBranch.c
@@ -1,4 +1,4 @@
-/* CameraBranch.c generated by valac 0.36.6, the Vala compiler
+/* CameraBranch.c generated by valac 0.40.4, the Vala compiler
  * generated from CameraBranch.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 <gee.h>
@@ -70,6 +71,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass;
 
 typedef struct _CameraSidebarEntry CameraSidebarEntry;
 typedef struct _CameraSidebarEntryClass CameraSidebarEntryClass;
+enum  {
+	CAMERA_BRANCH_0_PROPERTY,
+	CAMERA_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* camera_branch_properties[CAMERA_BRANCH_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define SIDEBAR_TYPE_GROUPING (sidebar_grouping_get_type ())
@@ -161,6 +167,11 @@ typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
 typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
 typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate;
 typedef struct _CameraHeaderPrivate CameraHeaderPrivate;
+enum  {
+	CAMERA_HEADER_0_PROPERTY,
+	CAMERA_HEADER_NUM_PROPERTIES
+};
+static GParamSpec* camera_header_properties[CAMERA_HEADER_NUM_PROPERTIES];
 
 #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
 #define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
@@ -197,6 +208,11 @@ typedef struct _SidebarContextable SidebarContextable;
 typedef struct _SidebarContextableIface SidebarContextableIface;
 typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
 typedef struct _CameraSidebarEntryPrivate CameraSidebarEntryPrivate;
+enum  {
+	CAMERA_SIDEBAR_ENTRY_0_PROPERTY,
+	CAMERA_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* camera_sidebar_entry_properties[CAMERA_SIDEBAR_ENTRY_NUM_PROPERTIES];
 typedef struct _DiscoveredCameraPrivate DiscoveredCameraPrivate;
 
 #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
@@ -375,17 +391,20 @@ GType sidebar_branch_get_type (void) G_GNUC_CONST;
 GType camera_branch_get_type (void) G_GNUC_CONST;
 gpointer discovered_camera_ref (gpointer instance);
 void discovered_camera_unref (gpointer instance);
-GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_discovered_camera (GValue* value, gpointer v_object);
-void value_take_discovered_camera (GValue* value, gpointer v_object);
+GParamSpec* param_spec_discovered_camera (const gchar* name,
+                                          const gchar* nick,
+                                          const gchar* blurb,
+                                          GType object_type,
+                                          GParamFlags flags);
+void value_set_discovered_camera (GValue* value,
+                                  gpointer v_object);
+void value_take_discovered_camera (GValue* value,
+                                   gpointer v_object);
 gpointer value_get_discovered_camera (const GValue* value);
 GType discovered_camera_get_type (void) G_GNUC_CONST;
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 GType camera_sidebar_entry_get_type (void) G_GNUC_CONST;
 #define CAMERA_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAMERA_TYPE_BRANCH, CameraBranchPrivate))
-enum  {
-	CAMERA_BRANCH_DUMMY_PROPERTY
-};
 #define RESOURCES_ICON_CAMERAS "camera-photo"
 CameraBranch* camera_branch_new (void);
 CameraBranch* camera_branch_construct (GType object_type);
@@ -397,96 +416,144 @@ GType camera_header_get_type (void) G_GNUC_CONST;
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
 GType sidebar_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
-static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
+static gint camera_branch_camera_comparator (SidebarEntry* a,
+                                      SidebarEntry* b);
+static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a,
+                                                     gconstpointer b);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root,
+                                   SidebarBranchOptions options,
+                                   GCompareFunc default_comparator,
+                                   GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type,
+                                         SidebarEntry* root,
+                                         SidebarBranchOptions options,
+                                         GCompareFunc default_comparator,
+                                         GCompareFunc root_comparator);
 gpointer camera_table_ref (gpointer instance);
 void camera_table_unref (gpointer instance);
-GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_camera_table (GValue* value, gpointer v_object);
-void value_take_camera_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_camera_table (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void value_set_camera_table (GValue* value,
+                             gpointer v_object);
+void value_take_camera_table (GValue* value,
+                              gpointer v_object);
 gpointer value_get_camera_table (const GValue* value);
 GType camera_table_get_type (void) G_GNUC_CONST;
 CameraTable* camera_table_get_instance (void);
 GeeIterable* camera_table_get_cameras (CameraTable* self);
-static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera);
-static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera);
-static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self);
-static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera);
-static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, DiscoveredCamera* camera, gpointer self);
+static void camera_branch_add_camera (CameraBranch* self,
+                               DiscoveredCamera* camera);
+static void camera_branch_on_camera_added (CameraBranch* self,
+                                    DiscoveredCamera* camera);
+static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender,
+                                                               DiscoveredCamera* camera,
+                                                               gpointer self);
+static void camera_branch_on_camera_removed (CameraBranch* self,
+                                      DiscoveredCamera* camera);
+static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender,
+                                                                   DiscoveredCamera* camera,
+                                                                   gpointer self);
 void camera_branch_init (void);
 void camera_branch_terminate (void);
 gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self);
 gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self);
-CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera);
-static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera);
+CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self,
+                                                        DiscoveredCamera* camera);
+static void camera_branch_remove_camera (CameraBranch* self,
+                                  DiscoveredCamera* camera);
 CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera);
-CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
+CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type,
+                                                    DiscoveredCamera* camera);
+void sidebar_branch_graft (SidebarBranch* self,
+                           SidebarEntry* parent,
+                           SidebarEntry* entry,
+                           GCompareFunc comparator);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
+void sidebar_branch_prune (SidebarBranch* self,
+                           SidebarEntry* entry);
 static void camera_branch_finalize (GObject * obj);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	CAMERA_HEADER_DUMMY_PROPERTY
-};
-SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name,
+                                   const gchar* tooltip,
+                                   gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type,
+                                         const gchar* name,
+                                         const gchar* tooltip,
+                                         gboolean emphasized);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
 GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 #define CAMERA_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntryPrivate))
-enum  {
-	CAMERA_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
 static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
 static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
 gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self);
 gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self);
-ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
-ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
+ImportPage* import_page_new (Camera* camera,
+                             const gchar* uri,
+                             const gchar* display_name,
+                             const gchar* icon);
+ImportPage* import_page_construct (GType object_type,
+                                   Camera* camera,
+                                   const gchar* uri,
+                                   const gchar* display_name,
+                                   const gchar* icon);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType import_page_get_type (void) G_GNUC_CONST;
 static void camera_sidebar_entry_finalize (GObject * obj);
 
 
-static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_camera_branch_camera_comparator_gcompare_func (gconstpointer a,
+                                                gconstpointer b)
+{
 	gint result;
 	result = camera_branch_camera_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 465 "CameraBranch.c"
+#line 522 "CameraBranch.c"
 }
 
 
-static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
+static void
+_camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender,
+                                                          DiscoveredCamera* camera,
+                                                          gpointer self)
+{
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_on_camera_added ((CameraBranch*) self, camera);
-#line 472 "CameraBranch.c"
+#line 533 "CameraBranch.c"
 }
 
 
-static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
+static void
+_camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender,
+                                                              DiscoveredCamera* camera,
+                                                              gpointer self)
+{
 #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_on_camera_removed ((CameraBranch*) self, camera);
-#line 479 "CameraBranch.c"
+#line 544 "CameraBranch.c"
 }
 
 
-CameraBranch* camera_branch_construct (GType object_type) {
+CameraBranch*
+camera_branch_construct (GType object_type)
+{
 	CameraBranch * self = NULL;
 	CameraHeader* _tmp0_;
 	CameraHeader* _tmp1_;
+	CameraTable* _tmp12_;
 	CameraTable* _tmp13_;
 	CameraTable* _tmp14_;
 	CameraTable* _tmp15_;
-	CameraTable* _tmp16_;
 #line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = camera_header_new ();
 #line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -495,7 +562,7 @@ CameraBranch* camera_branch_construct (GType object_type) {
 	self = (CameraBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD, _camera_branch_camera_comparator_gcompare_func, NULL);
 #line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 499 "CameraBranch.c"
+#line 566 "CameraBranch.c"
 	{
 		GeeIterator* _camera_it = NULL;
 		CameraTable* _tmp2_;
@@ -524,226 +591,212 @@ CameraBranch* camera_branch_construct (GType object_type) {
 		_camera_it = _tmp7_;
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		while (TRUE) {
-#line 528 "CameraBranch.c"
+#line 595 "CameraBranch.c"
 			GeeIterator* _tmp8_;
-			gboolean _tmp9_;
 			DiscoveredCamera* camera = NULL;
-			GeeIterator* _tmp10_;
-			gpointer _tmp11_;
-			DiscoveredCamera* _tmp12_;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			DiscoveredCamera* _tmp11_;
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp8_ = _camera_it;
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			if (!_tmp9_) {
+			if (!gee_iterator_next (_tmp8_)) {
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 				break;
-#line 543 "CameraBranch.c"
+#line 607 "CameraBranch.c"
 			}
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			_tmp10_ = _camera_it;
+			_tmp9_ = _camera_it;
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			_tmp11_ = gee_iterator_get (_tmp10_);
+			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			camera = (DiscoveredCamera*) _tmp11_;
+			camera = (DiscoveredCamera*) _tmp10_;
 #line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			_tmp12_ = camera;
+			_tmp11_ = camera;
 #line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			camera_branch_add_camera (self, _tmp12_);
+			camera_branch_add_camera (self, _tmp11_);
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_discovered_camera_unref0 (camera);
-#line 557 "CameraBranch.c"
+#line 621 "CameraBranch.c"
 		}
 #line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_object_unref0 (_camera_it);
-#line 561 "CameraBranch.c"
+#line 625 "CameraBranch.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp13_ = camera_table_get_instance ();
+	_tmp12_ = camera_table_get_instance ();
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	g_signal_connect_object (_tmp14_, "camera-added", (GCallback) _camera_branch_on_camera_added_camera_table_camera_added, self, 0);
+	g_signal_connect_object (_tmp13_, "camera-added", (GCallback) _camera_branch_on_camera_added_camera_table_camera_added, self, 0);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_camera_table_unref0 (_tmp14_);
+	_camera_table_unref0 (_tmp13_);
 #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp15_ = camera_table_get_instance ();
+	_tmp14_ = camera_table_get_instance ();
 #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	g_signal_connect_object (_tmp16_, "camera-removed", (GCallback) _camera_branch_on_camera_removed_camera_table_camera_removed, self, 0);
+	g_signal_connect_object (_tmp15_, "camera-removed", (GCallback) _camera_branch_on_camera_removed_camera_table_camera_removed, self, 0);
 #line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_camera_table_unref0 (_tmp16_);
+	_camera_table_unref0 (_tmp15_);
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self;
-#line 581 "CameraBranch.c"
+#line 645 "CameraBranch.c"
 }
 
 
-CameraBranch* camera_branch_new (void) {
+CameraBranch*
+camera_branch_new (void)
+{
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return camera_branch_construct (CAMERA_TYPE_BRANCH);
-#line 588 "CameraBranch.c"
+#line 654 "CameraBranch.c"
 }
 
 
-void camera_branch_init (void) {
+void
+camera_branch_init (void)
+{
 }
 
 
-void camera_branch_terminate (void) {
+void
+camera_branch_terminate (void)
+{
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 603 "CameraBranch.c"
+#line 675 "CameraBranch.c"
 }
 
 
-static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+camera_branch_camera_comparator (SidebarEntry* a,
+                                 SidebarEntry* b)
+{
 	gint result = 0;
-	SidebarEntry* _tmp0_;
-	SidebarEntry* _tmp1_;
 	gint ret = 0;
-	SidebarEntry* _tmp2_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* _tmp3_;
-	gchar* _tmp4_;
-	SidebarEntry* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-	gint _tmp10_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
 #line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp0_ = a;
-#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp1_ = b;
-#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (a == b) {
 #line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		result = 0;
 #line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		return result;
-#line 635 "CameraBranch.c"
+#line 701 "CameraBranch.c"
 	}
 #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp2_ = a;
-#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp3_ = sidebar_entry_get_sidebar_name (_tmp2_);
-#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp4_ = _tmp3_;
+	_tmp0_ = sidebar_entry_get_sidebar_name (a);
 #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp5_ = b;
-#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp6_ = sidebar_entry_get_sidebar_name (_tmp5_);
+	_tmp1_ = _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp7_ = _tmp6_;
+	_tmp2_ = sidebar_entry_get_sidebar_name (b);
 #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp8_ = g_utf8_collate (_tmp4_, _tmp7_);
+	_tmp3_ = _tmp2_;
 #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = g_utf8_collate (_tmp1_, _tmp3_);
 #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_g_free0 (_tmp7_);
+	_g_free0 (_tmp3_);
 #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp1_);
 #line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	ret = _tmp9_;
+	ret = _tmp4_;
 #line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp10_ = ret;
+	_tmp5_ = ret;
 #line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	if (_tmp10_ == 0) {
-#line 663 "CameraBranch.c"
+	if (_tmp5_ == 0) {
+#line 723 "CameraBranch.c"
 		CameraSidebarEntry* cam_a = NULL;
-		SidebarEntry* _tmp11_;
-		CameraSidebarEntry* _tmp12_;
+		CameraSidebarEntry* _tmp6_;
 		CameraSidebarEntry* cam_b = NULL;
-		SidebarEntry* _tmp13_;
+		CameraSidebarEntry* _tmp7_;
+		gboolean _tmp8_ = FALSE;
+		CameraSidebarEntry* _tmp9_;
+		CameraSidebarEntry* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 		CameraSidebarEntry* _tmp14_;
-		gboolean _tmp15_ = FALSE;
-		CameraSidebarEntry* _tmp16_;
-		CameraSidebarEntry* _tmp18_;
-		gchar* _tmp19_;
-		gchar* _tmp20_;
-		CameraSidebarEntry* _tmp21_;
-		gchar* _tmp22_;
-		gchar* _tmp23_;
-		gint _tmp24_;
-#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp11_ = a;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
 #line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp11_) : NULL);
+		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (a, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) a) : NULL);
 #line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		cam_a = _tmp12_;
+		cam_a = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp13_ = b;
+		_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (b, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) b) : NULL);
 #line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp13_) : NULL);
-#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		cam_b = _tmp14_;
+		cam_b = _tmp7_;
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp16_ = cam_a;
+		_tmp9_ = cam_a;
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		if (_tmp16_ != NULL) {
-#line 695 "CameraBranch.c"
-			CameraSidebarEntry* _tmp17_;
+		if (_tmp9_ != NULL) {
+#line 748 "CameraBranch.c"
+			CameraSidebarEntry* _tmp10_;
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			_tmp17_ = cam_b;
+			_tmp10_ = cam_b;
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			_tmp15_ = _tmp17_ != NULL;
-#line 701 "CameraBranch.c"
+			_tmp8_ = _tmp10_ != NULL;
+#line 754 "CameraBranch.c"
 		} else {
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-			_tmp15_ = FALSE;
-#line 705 "CameraBranch.c"
+			_tmp8_ = FALSE;
+#line 758 "CameraBranch.c"
 		}
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_vala_assert (_tmp15_, "cam_a != null && cam_b != null");
-#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp18_ = cam_a;
+		_vala_assert (_tmp8_, "cam_a != null && cam_b != null");
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp19_ = camera_sidebar_entry_get_uri (_tmp18_);
+		_tmp11_ = cam_a;
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp20_ = _tmp19_;
+		_tmp12_ = camera_sidebar_entry_get_uri (_tmp11_);
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp21_ = cam_b;
+		_tmp13_ = _tmp12_;
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp22_ = camera_sidebar_entry_get_uri (_tmp21_);
+		_tmp14_ = cam_b;
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp23_ = _tmp22_;
+		_tmp15_ = camera_sidebar_entry_get_uri (_tmp14_);
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_tmp24_ = g_utf8_collate (_tmp20_, _tmp23_);
+		_tmp16_ = _tmp15_;
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		ret = _tmp24_;
+		ret = g_utf8_collate (_tmp13_, _tmp16_);
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_g_free0 (_tmp23_);
+		_g_free0 (_tmp16_);
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-		_g_free0 (_tmp20_);
+		_g_free0 (_tmp13_);
 #line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_object_unref0 (cam_b);
 #line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_object_unref0 (cam_a);
-#line 733 "CameraBranch.c"
+#line 784 "CameraBranch.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	result = ret;
 #line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 739 "CameraBranch.c"
+#line 790 "CameraBranch.c"
 }
 
 
-CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera) {
+CameraSidebarEntry*
+camera_branch_get_entry_for_camera (CameraBranch* self,
+                                    DiscoveredCamera* camera)
+{
 	CameraSidebarEntry* result = NULL;
 	GeeHashMap* _tmp0_;
-	DiscoveredCamera* _tmp1_;
-	gpointer _tmp2_;
+	gpointer _tmp1_;
 #line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (CAMERA_IS_BRANCH (self), NULL);
 #line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -751,56 +804,53 @@ CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, Disc
 #line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = self->priv->camera_map;
 #line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp1_ = camera;
-#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera);
 #line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	result = (CameraSidebarEntry*) _tmp2_;
+	result = (CameraSidebarEntry*) _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 762 "CameraBranch.c"
+#line 813 "CameraBranch.c"
 }
 
 
-static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera) {
-	DiscoveredCamera* _tmp0_;
+static void
+camera_branch_on_camera_added (CameraBranch* self,
+                               DiscoveredCamera* camera)
+{
 #line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
 #line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp0_ = camera;
-#line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	camera_branch_add_camera (self, _tmp0_);
-#line 776 "CameraBranch.c"
+	camera_branch_add_camera (self, camera);
+#line 827 "CameraBranch.c"
 }
 
 
-static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera) {
-	DiscoveredCamera* _tmp0_;
+static void
+camera_branch_on_camera_removed (CameraBranch* self,
+                                 DiscoveredCamera* camera)
+{
 #line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
 #line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp0_ = camera;
-#line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	camera_branch_remove_camera (self, _tmp0_);
-#line 790 "CameraBranch.c"
+	camera_branch_remove_camera (self, camera);
+#line 841 "CameraBranch.c"
 }
 
 
-static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera) {
+static void
+camera_branch_add_camera (CameraBranch* self,
+                          DiscoveredCamera* camera)
+{
 	GeeHashMap* _tmp0_;
-	DiscoveredCamera* _tmp1_;
-	gboolean _tmp2_;
 	CameraSidebarEntry* entry = NULL;
-	DiscoveredCamera* _tmp3_;
-	CameraSidebarEntry* _tmp4_;
-	GeeHashMap* _tmp5_;
-	DiscoveredCamera* _tmp6_;
-	SidebarEntry* _tmp7_;
-	SidebarEntry* _tmp8_;
+	CameraSidebarEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
+	SidebarEntry* _tmp3_;
+	SidebarEntry* _tmp4_;
 #line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -808,49 +858,40 @@ static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* came
 #line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = self->priv->camera_map;
 #line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp1_ = camera;
-#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_vala_assert (!_tmp2_, "!camera_map.has_key(camera)");
+	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera), "!camera_map.has_key(camera)");
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp3_ = camera;
+	_tmp1_ = camera_sidebar_entry_new (camera);
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp4_ = camera_sidebar_entry_new (_tmp3_);
-#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	entry = _tmp4_;
-#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp5_ = self->priv->camera_map;
+	entry = _tmp1_;
 #line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp6_ = camera;
+	_tmp2_ = self->priv->camera_map;
 #line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, entry);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera, entry);
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp7_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+	_tmp3_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp8_ = _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp4_);
 #line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_object_unref0 (entry);
-#line 839 "CameraBranch.c"
+#line 881 "CameraBranch.c"
 }
 
 
-static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera) {
+static void
+camera_branch_remove_camera (CameraBranch* self,
+                             DiscoveredCamera* camera)
+{
 	GeeHashMap* _tmp0_;
-	DiscoveredCamera* _tmp1_;
-	gboolean _tmp2_;
 	CameraSidebarEntry* entry = NULL;
-	GeeHashMap* _tmp3_;
-	DiscoveredCamera* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp1_;
+	gpointer _tmp2_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp6_;
-	DiscoveredCamera* _tmp7_;
-	gboolean _tmp8_;
+	GeeHashMap* _tmp3_;
+	gboolean _tmp4_;
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -858,40 +899,34 @@ static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* c
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = self->priv->camera_map;
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp1_ = camera;
-#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_vala_assert (_tmp2_, "camera_map.has_key(camera)");
-#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp3_ = self->priv->camera_map;
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera), "camera_map.has_key(camera)");
 #line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp4_ = camera;
+	_tmp1_ = self->priv->camera_map;
 #line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera);
 #line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	entry = (CameraSidebarEntry*) _tmp5_;
+	entry = (CameraSidebarEntry*) _tmp2_;
 #line 74 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_vala_assert (entry != NULL, "entry != null");
 #line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp6_ = self->priv->camera_map;
-#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp7_ = camera;
+	_tmp3_ = self->priv->camera_map;
 #line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp8_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, NULL);
+	_tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera, NULL);
 #line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	removed = _tmp8_;
+	removed = _tmp4_;
 #line 77 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_vala_assert (removed, "removed");
 #line 79 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_object_unref0 (entry);
-#line 891 "CameraBranch.c"
+#line 924 "CameraBranch.c"
 }
 
 
-static void camera_branch_class_init (CameraBranchClass * klass) {
+static void
+camera_branch_class_init (CameraBranchClass * klass)
+{
 	gchar* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_parent_class = g_type_class_peek_parent (klass);
@@ -903,11 +938,13 @@ static void camera_branch_class_init (CameraBranchClass * klass) {
 	_tmp0_ = g_strdup (RESOURCES_ICON_CAMERAS);
 #line 8 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_cameras_icon = _tmp0_;
-#line 907 "CameraBranch.c"
+#line 942 "CameraBranch.c"
 }
 
 
-static void camera_branch_instance_init (CameraBranch * self) {
+static void
+camera_branch_instance_init (CameraBranch * self)
+{
 	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self->priv = CAMERA_BRANCH_GET_PRIVATE (self);
@@ -915,11 +952,13 @@ static void camera_branch_instance_init (CameraBranch * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self->priv->camera_map = _tmp0_;
-#line 919 "CameraBranch.c"
+#line 956 "CameraBranch.c"
 }
 
 
-static void camera_branch_finalize (GObject * obj) {
+static void
+camera_branch_finalize (GObject * obj)
+{
 	CameraBranch * self;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_BRANCH, CameraBranch);
@@ -927,11 +966,13 @@ static void camera_branch_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->camera_map);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	G_OBJECT_CLASS (camera_branch_parent_class)->finalize (obj);
-#line 931 "CameraBranch.c"
+#line 970 "CameraBranch.c"
 }
 
 
-GType camera_branch_get_type (void) {
+GType
+camera_branch_get_type (void)
+{
 	static volatile gsize camera_branch_type_id__volatile = 0;
 	if (g_once_init_enter (&camera_branch_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (CameraBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraBranch), 0, (GInstanceInitFunc) camera_branch_instance_init, NULL };
@@ -943,35 +984,45 @@ GType camera_branch_get_type (void) {
 }
 
 
-CameraHeader* camera_header_construct (GType object_type) {
+CameraHeader*
+camera_header_construct (GType object_type)
+{
 	CameraHeader * self = NULL;
 #line 85 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), _ ("List of all discovered camera devices"), TRUE);
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self;
-#line 953 "CameraBranch.c"
+#line 996 "CameraBranch.c"
 }
 
 
-CameraHeader* camera_header_new (void) {
+CameraHeader*
+camera_header_new (void)
+{
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return camera_header_construct (CAMERA_TYPE_HEADER);
-#line 960 "CameraBranch.c"
+#line 1005 "CameraBranch.c"
 }
 
 
-static void camera_header_class_init (CameraHeaderClass * klass) {
+static void
+camera_header_class_init (CameraHeaderClass * klass)
+{
 #line 83 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_header_parent_class = g_type_class_peek_parent (klass);
-#line 967 "CameraBranch.c"
+#line 1014 "CameraBranch.c"
 }
 
 
-static void camera_header_instance_init (CameraHeader * self) {
+static void
+camera_header_instance_init (CameraHeader * self)
+{
 }
 
 
-GType camera_header_get_type (void) {
+GType
+camera_header_get_type (void)
+{
 	static volatile gsize camera_header_type_id__volatile = 0;
 	if (g_once_init_enter (&camera_header_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (CameraHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraHeader), 0, (GInstanceInitFunc) camera_header_instance_init, NULL };
@@ -983,56 +1034,59 @@ GType camera_header_get_type (void) {
 }
 
 
-static gpointer _discovered_camera_ref0 (gpointer self) {
+static gpointer
+_discovered_camera_ref0 (gpointer self)
+{
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self ? discovered_camera_ref (self) : NULL;
-#line 990 "CameraBranch.c"
+#line 1043 "CameraBranch.c"
 }
 
 
-CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera) {
+CameraSidebarEntry*
+camera_sidebar_entry_construct (GType object_type,
+                                DiscoveredCamera* camera)
+{
 	CameraSidebarEntry * self = NULL;
 	DiscoveredCamera* _tmp0_;
-	DiscoveredCamera* _tmp1_;
-	DiscoveredCamera* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
 #line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = (CameraSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp0_ = camera;
-#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp1_ = _discovered_camera_ref0 (_tmp0_);
+	_tmp0_ = _discovered_camera_ref0 (camera);
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_discovered_camera_unref0 (self->priv->camera);
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	self->priv->camera = _tmp1_;
+	self->priv->camera = _tmp0_;
 #line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp2_ = camera;
+	_tmp1_ = camera->uri;
 #line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp3_ = _tmp2_->uri;
-#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	_tmp4_ = g_strdup (_tmp3_);
+	_tmp2_ = g_strdup (_tmp1_);
 #line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_free0 (self->priv->uri);
 #line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
-	self->priv->uri = _tmp4_;
+	self->priv->uri = _tmp2_;
 #line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self;
-#line 1025 "CameraBranch.c"
+#line 1075 "CameraBranch.c"
 }
 
 
-CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera) {
+CameraSidebarEntry*
+camera_sidebar_entry_new (DiscoveredCamera* camera)
+{
 #line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return camera_sidebar_entry_construct (CAMERA_TYPE_SIDEBAR_ENTRY, camera);
-#line 1032 "CameraBranch.c"
+#line 1084 "CameraBranch.c"
 }
 
 
-static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	CameraSidebarEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
@@ -1051,7 +1105,7 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	if (_tmp0_ == NULL) {
 #line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp0_ = _ ("Camera");
-#line 1055 "CameraBranch.c"
+#line 1109 "CameraBranch.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp3_ = g_strdup (_tmp0_);
@@ -1059,11 +1113,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	result = _tmp3_;
 #line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 1063 "CameraBranch.c"
+#line 1117 "CameraBranch.c"
 }
 
 
-static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	CameraSidebarEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
@@ -1080,13 +1136,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	_tmp0_ = _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	if (_tmp0_ == NULL) {
-#line 1084 "CameraBranch.c"
+#line 1140 "CameraBranch.c"
 		const gchar* _tmp3_;
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp3_ = camera_branch_cameras_icon;
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp0_ = _tmp3_;
-#line 1090 "CameraBranch.c"
+#line 1146 "CameraBranch.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp4_ = g_strdup (_tmp0_);
@@ -1094,11 +1150,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	result = _tmp4_;
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 1098 "CameraBranch.c"
+#line 1154 "CameraBranch.c"
 }
 
 
-static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	CameraSidebarEntry * self;
 	Page* result = NULL;
 	DiscoveredCamera* _tmp0_;
@@ -1140,11 +1198,13 @@ static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base
 	result = _tmp8_;
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 1144 "CameraBranch.c"
+#line 1202 "CameraBranch.c"
 }
 
 
-gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
+gchar*
+camera_sidebar_entry_get_uri (CameraSidebarEntry* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -1158,11 +1218,13 @@ gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
 	result = _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 1162 "CameraBranch.c"
+#line 1222 "CameraBranch.c"
 }
 
 
-static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
+static void
+camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass)
+{
 #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -1175,18 +1237,22 @@ static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_create_page;
 #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize;
-#line 1179 "CameraBranch.c"
+#line 1241 "CameraBranch.c"
 }
 
 
-static void camera_sidebar_entry_instance_init (CameraSidebarEntry * self) {
+static void
+camera_sidebar_entry_instance_init (CameraSidebarEntry * self)
+{
 #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self->priv = CAMERA_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1186 "CameraBranch.c"
+#line 1250 "CameraBranch.c"
 }
 
 
-static void camera_sidebar_entry_finalize (GObject * obj) {
+static void
+camera_sidebar_entry_finalize (GObject * obj)
+{
 	CameraSidebarEntry * self;
 #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
@@ -1196,11 +1262,13 @@ static void camera_sidebar_entry_finalize (GObject * obj) {
 	_g_free0 (self->priv->uri);
 #line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	G_OBJECT_CLASS (camera_sidebar_entry_parent_class)->finalize (obj);
-#line 1200 "CameraBranch.c"
+#line 1266 "CameraBranch.c"
 }
 
 
-GType camera_sidebar_entry_get_type (void) {
+GType
+camera_sidebar_entry_get_type (void)
+{
 	static volatile gsize camera_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&camera_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (CameraSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraSidebarEntry), 0, (GInstanceInitFunc) camera_sidebar_entry_instance_init, NULL };