New upstream version 0.26.4upstream/0.26.4

1 files changed, 117 insertions, 124 deletions

diff --git a/src/camera/Branch.c b/src/camera/Branch.c
index e41b06f..60ed699 100644
--- a/src/camera/Branch.c
+++ b/src/camera/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -426,7 +426,7 @@ CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, Discovere
 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);
-static void camera_branch_finalize (GObject* obj);
+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;
@@ -453,7 +453,7 @@ ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* disp
 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 void camera_sidebar_entry_finalize (GObject * obj);
 
 
 static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
@@ -481,12 +481,12 @@ static void _camera_branch_on_camera_removed_camera_table_camera_removed (Camera
 
 CameraBranch* camera_branch_construct (GType object_type) {
 	CameraBranch * self = NULL;
-	CameraHeader* _tmp0_ = NULL;
-	CameraHeader* _tmp1_ = NULL;
-	CameraTable* _tmp13_ = NULL;
-	CameraTable* _tmp14_ = NULL;
-	CameraTable* _tmp15_ = NULL;
-	CameraTable* _tmp16_ = NULL;
+	CameraHeader* _tmp0_;
+	CameraHeader* _tmp1_;
+	CameraTable* _tmp13_;
+	CameraTable* _tmp14_;
+	CameraTable* _tmp15_;
+	CameraTable* _tmp16_;
 #line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	_tmp0_ = camera_header_new ();
 #line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -498,12 +498,12 @@ CameraBranch* camera_branch_construct (GType object_type) {
 #line 499 "Branch.c"
 	{
 		GeeIterator* _camera_it = NULL;
-		CameraTable* _tmp2_ = NULL;
-		CameraTable* _tmp3_ = NULL;
-		GeeIterable* _tmp4_ = NULL;
-		GeeIterable* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		CameraTable* _tmp2_;
+		CameraTable* _tmp3_;
+		GeeIterable* _tmp4_;
+		GeeIterable* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		_tmp2_ = camera_table_get_instance ();
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -525,12 +525,12 @@ CameraBranch* camera_branch_construct (GType object_type) {
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		while (TRUE) {
 #line 528 "Branch.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			DiscoveredCamera* camera = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			DiscoveredCamera* _tmp12_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			DiscoveredCamera* _tmp12_;
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 			_tmp8_ = _camera_it;
 #line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -605,18 +605,18 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
 	gint ret = 0;
-	SidebarEntry* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	SidebarEntry* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	SidebarEntry* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -661,20 +661,20 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 	if (_tmp10_ == 0) {
 #line 663 "Branch.c"
 		CameraSidebarEntry* cam_a = NULL;
-		SidebarEntry* _tmp11_ = NULL;
-		CameraSidebarEntry* _tmp12_ = NULL;
+		SidebarEntry* _tmp11_;
+		CameraSidebarEntry* _tmp12_;
 		CameraSidebarEntry* cam_b = NULL;
-		SidebarEntry* _tmp13_ = NULL;
-		CameraSidebarEntry* _tmp14_ = NULL;
+		SidebarEntry* _tmp13_;
+		CameraSidebarEntry* _tmp14_;
 		gboolean _tmp15_ = FALSE;
-		CameraSidebarEntry* _tmp16_ = NULL;
-		CameraSidebarEntry* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		CameraSidebarEntry* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
+		CameraSidebarEntry* _tmp16_;
+		CameraSidebarEntry* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		CameraSidebarEntry* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gint _tmp24_;
 #line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		_tmp11_ = a;
 #line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -692,7 +692,7 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 #line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		if (_tmp16_ != NULL) {
 #line 695 "Branch.c"
-			CameraSidebarEntry* _tmp17_ = NULL;
+			CameraSidebarEntry* _tmp17_;
 #line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 			_tmp17_ = cam_b;
 #line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -741,9 +741,9 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 
 CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera) {
 	CameraSidebarEntry* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	gpointer _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_val_if_fail (CAMERA_IS_BRANCH (self), NULL);
 #line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -763,7 +763,7 @@ CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, Disc
 
 
 static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera) {
-	DiscoveredCamera* _tmp0_ = NULL;
+	DiscoveredCamera* _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -777,7 +777,7 @@ static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera*
 
 
 static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera) {
-	DiscoveredCamera* _tmp0_ = NULL;
+	DiscoveredCamera* _tmp0_;
 #line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -791,16 +791,16 @@ static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamer
 
 
 static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera) {
-	GeeHashMap* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	gboolean _tmp2_;
 	CameraSidebarEntry* entry = NULL;
-	DiscoveredCamera* _tmp3_ = NULL;
-	CameraSidebarEntry* _tmp4_ = NULL;
-	GeeHashMap* _tmp5_ = NULL;
-	DiscoveredCamera* _tmp6_ = NULL;
-	SidebarEntry* _tmp7_ = NULL;
-	SidebarEntry* _tmp8_ = NULL;
+	DiscoveredCamera* _tmp3_;
+	CameraSidebarEntry* _tmp4_;
+	GeeHashMap* _tmp5_;
+	DiscoveredCamera* _tmp6_;
+	SidebarEntry* _tmp7_;
+	SidebarEntry* _tmp8_;
 #line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -840,17 +840,17 @@ static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* came
 
 
 static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera) {
-	GeeHashMap* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	gboolean _tmp2_;
 	CameraSidebarEntry* entry = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	DiscoveredCamera* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
+	GeeHashMap* _tmp3_;
+	DiscoveredCamera* _tmp4_;
+	gpointer _tmp5_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp6_ = NULL;
-	DiscoveredCamera* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
+	GeeHashMap* _tmp6_;
+	DiscoveredCamera* _tmp7_;
+	gboolean _tmp8_;
 #line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
 #line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -892,7 +892,7 @@ static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* c
 
 
 static void camera_branch_class_init (CameraBranchClass * klass) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	camera_branch_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -908,7 +908,7 @@ static void camera_branch_class_init (CameraBranchClass * klass) {
 
 
 static void camera_branch_instance_init (CameraBranch * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self->priv = CAMERA_BRANCH_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -919,7 +919,7 @@ static void camera_branch_instance_init (CameraBranch * self) {
 }
 
 
-static void camera_branch_finalize (GObject* obj) {
+static void camera_branch_finalize (GObject * obj) {
 	CameraBranch * self;
 #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_BRANCH, CameraBranch);
@@ -945,28 +945,25 @@ GType camera_branch_get_type (void) {
 
 CameraHeader* camera_header_construct (GType object_type) {
 	CameraHeader * self = NULL;
-	const gchar* _tmp0_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	_tmp0_ = _ ("Cameras");
 #line 85 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	self = (CameraHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE);
+	self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), TRUE);
 #line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return self;
-#line 956 "Branch.c"
+#line 953 "Branch.c"
 }
 
 
 CameraHeader* camera_header_new (void) {
 #line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return camera_header_construct (CAMERA_TYPE_HEADER);
-#line 963 "Branch.c"
+#line 960 "Branch.c"
 }
 
 
 static void camera_header_class_init (CameraHeaderClass * klass) {
 #line 83 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	camera_header_parent_class = g_type_class_peek_parent (klass);
-#line 970 "Branch.c"
+#line 967 "Branch.c"
 }
 
 
@@ -989,17 +986,17 @@ GType camera_header_get_type (void) {
 static gpointer _discovered_camera_ref0 (gpointer self) {
 #line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return self ? discovered_camera_ref (self) : NULL;
-#line 993 "Branch.c"
+#line 990 "Branch.c"
 }
 
 
 CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera) {
 	CameraSidebarEntry * self = NULL;
-	DiscoveredCamera* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	DiscoveredCamera* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DiscoveredCamera* _tmp0_;
+	DiscoveredCamera* _tmp1_;
+	DiscoveredCamera* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
 #line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1024,14 +1021,14 @@ CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, Discovere
 	self->priv->uri = _tmp4_;
 #line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return self;
-#line 1028 "Branch.c"
+#line 1025 "Branch.c"
 }
 
 
 CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera) {
 #line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return camera_sidebar_entry_construct (CAMERA_TYPE_SIDEBAR_ENTRY, camera);
-#line 1035 "Branch.c"
+#line 1032 "Branch.c"
 }
 
 
@@ -1039,9 +1036,9 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	CameraSidebarEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DiscoveredCamera* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 98 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1052,21 +1049,17 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	_tmp0_ = _tmp2_;
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	if (_tmp0_ == NULL) {
-#line 1056 "Branch.c"
-		const gchar* _tmp3_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-		_tmp3_ = _ ("Camera");
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-		_tmp0_ = _tmp3_;
-#line 1062 "Branch.c"
+		_tmp0_ = _ ("Camera");
+#line 1055 "Branch.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	_tmp4_ = g_strdup (_tmp0_);
+	_tmp3_ = g_strdup (_tmp0_);
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return result;
-#line 1070 "Branch.c"
+#line 1063 "Branch.c"
 }
 
 
@@ -1074,9 +1067,9 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	CameraSidebarEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-	DiscoveredCamera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DiscoveredCamera* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp4_;
 #line 102 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1087,13 +1080,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	_tmp0_ = _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	if (_tmp0_ == NULL) {
-#line 1091 "Branch.c"
-		const gchar* _tmp3_ = NULL;
+#line 1084 "Branch.c"
+		const gchar* _tmp3_;
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		_tmp3_ = camera_branch_cameras_icon;
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 		_tmp0_ = _tmp3_;
-#line 1097 "Branch.c"
+#line 1090 "Branch.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	_tmp4_ = g_strdup (_tmp0_);
@@ -1101,22 +1094,22 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	result = _tmp4_;
 #line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return result;
-#line 1105 "Branch.c"
+#line 1098 "Branch.c"
 }
 
 
 static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	CameraSidebarEntry * self;
 	Page* result = NULL;
-	DiscoveredCamera* _tmp0_ = NULL;
-	Camera* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	ImportPage* _tmp7_ = NULL;
-	Page* _tmp8_ = NULL;
+	DiscoveredCamera* _tmp0_;
+	Camera* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	ImportPage* _tmp7_;
+	Page* _tmp8_;
 #line 106 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
 #line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1147,14 +1140,14 @@ static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base
 	result = _tmp8_;
 #line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return result;
-#line 1151 "Branch.c"
+#line 1144 "Branch.c"
 }
 
 
 gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_return_val_if_fail (CAMERA_IS_SIDEBAR_ENTRY (self), NULL);
 #line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1165,7 +1158,7 @@ gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
 	result = _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	return result;
-#line 1169 "Branch.c"
+#line 1162 "Branch.c"
 }
 
 
@@ -1175,25 +1168,25 @@ static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	g_type_class_add_private (klass, sizeof (CameraSidebarEntryPrivate));
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_get_sidebar_name;
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_get_sidebar_icon;
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_create_page;
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize;
-#line 1186 "Branch.c"
+#line 1179 "Branch.c"
 }
 
 
 static void camera_sidebar_entry_instance_init (CameraSidebarEntry * self) {
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self->priv = CAMERA_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1193 "Branch.c"
+#line 1186 "Branch.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/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
@@ -1203,7 +1196,7 @@ static void camera_sidebar_entry_finalize (GObject* obj) {
 	_g_free0 (self->priv->uri);
 #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	G_OBJECT_CLASS (camera_sidebar_entry_parent_class)->finalize (obj);
-#line 1207 "Branch.c"
+#line 1200 "Branch.c"
 }