Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 214 insertions, 207 deletions

diff --git a/src/Application.c b/src/Application.c
index 7405100..3d0d2d9 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -1,4 +1,4 @@
-/* Application.c generated by valac 0.34.7, the Vala compiler
+/* Application.c generated by valac 0.36.6, the Vala compiler
  * generated from Application.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -61,6 +61,13 @@ typedef struct _LibraryWindow LibraryWindow;
 typedef struct _LibraryWindowClass LibraryWindowClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 typedef struct _ParamSpecApplication ParamSpecApplication;
+enum  {
+	APPLICATION_STARTING_SIGNAL,
+	APPLICATION_EXITING_SIGNAL,
+	APPLICATION_INIT_DONE_SIGNAL,
+	APPLICATION_LAST_SIGNAL
+};
+static guint application_signals[APPLICATION_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -143,26 +150,26 @@ gint application_get_run_return_value (Application* self);
 static void application_real_starting (Application* self);
 static void application_real_exiting (Application* self, gboolean panicked);
 static void application_real_init_done (Application* self);
-static void application_finalize (Application* obj);
+static void application_finalize (Application * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 void application_set_raw_thumbs_fix_required (Application* self, gboolean should_fixup) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 25 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = should_fixup;
 #line 25 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->fixup_raw_thumbs = _tmp0_;
-#line 160 "Application.c"
+#line 167 "Application.c"
 }
 
 
 gboolean application_get_raw_thumbs_fix_required (Application* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), FALSE);
 #line 29 "/home/jens/Source/shotwell/src/Application.vala"
@@ -171,21 +178,21 @@ gboolean application_get_raw_thumbs_fix_required (Application* self) {
 	result = _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 175 "Application.c"
+#line 182 "Application.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 182 "Application.c"
+#line 189 "Application.c"
 }
 
 
 GtkApplication* application_get_system_app (Application* self) {
 	GtkApplication* result = NULL;
-	GtkApplication* _tmp0_ = NULL;
-	GtkApplication* _tmp1_ = NULL;
+	GtkApplication* _tmp0_;
+	GtkApplication* _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), NULL);
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
@@ -196,7 +203,7 @@ GtkApplication* application_get_system_app (Application* self) {
 	result = _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 200 "Application.c"
+#line 207 "Application.c"
 }
 
 
@@ -205,31 +212,31 @@ static gint _application_on_command_line_g_application_command_line (GApplicatio
 	result = application_on_command_line (command_line);
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 209 "Application.c"
+#line 216 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_activate (GApplication* _sender, gpointer self) {
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 216 "Application.c"
+#line 223 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_startup (GApplication* _sender, gpointer self) {
 #line 69 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 223 "Application.c"
+#line 230 "Application.c"
 }
 
 
 static Application* application_construct (GType object_type, gboolean is_direct) {
 	Application* self = NULL;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	GtkApplication* _tmp7_ = NULL;
-	GtkApplication* _tmp8_ = NULL;
+	gboolean _tmp0_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	GtkApplication* _tmp7_;
+	GtkApplication* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	self = (Application*) g_type_create_instance (object_type);
@@ -237,39 +244,39 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	_tmp0_ = is_direct;
 #line 40 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 241 "Application.c"
-		GtkApplication* _tmp1_ = NULL;
+#line 248 "Application.c"
+		GtkApplication* _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = gtk_application_new ("org.yorba.shotwell-direct", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE);
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (self->priv->system_app);
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp1_;
-#line 249 "Application.c"
+#line 256 "Application.c"
 	} else {
-		GtkApplication* _tmp2_ = NULL;
+		GtkApplication* _tmp2_;
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = gtk_application_new ("org.yorba.shotwell", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_HANDLES_COMMAND_LINE);
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (self->priv->system_app);
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp2_;
-#line 258 "Application.c"
+#line 265 "Application.c"
 	}
 	{
-		GtkApplication* _tmp3_ = NULL;
+		GtkApplication* _tmp3_;
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp3_ = self->priv->system_app;
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		g_application_register (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication), NULL, &_inner_error_);
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 268 "Application.c"
-			goto __catch559_g_error;
+#line 275 "Application.c"
+			goto __catch560_g_error;
 		}
 	}
-	goto __finally559;
-	__catch559_g_error:
+	goto __finally560;
+	__catch560_g_error:
 	{
 		GError* e = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -280,9 +287,9 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		application_panic (self);
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_error_free0 (e);
-#line 284 "Application.c"
+#line 291 "Application.c"
 	}
-	__finally559:
+	__finally560:
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -291,7 +298,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		g_clear_error (&_inner_error_);
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		return NULL;
-#line 295 "Application.c"
+#line 302 "Application.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = is_direct;
@@ -301,13 +308,13 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	_tmp5_ = self->priv->direct;
 #line 64 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp5_) {
-#line 305 "Application.c"
-		GtkApplication* _tmp6_ = NULL;
+#line 312 "Application.c"
+		GtkApplication* _tmp6_;
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = self->priv->system_app;
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), "command-line", (GCallback) _application_on_command_line_g_application_command_line, NULL);
-#line 311 "Application.c"
+#line 318 "Application.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = self->priv->system_app;
@@ -319,14 +326,14 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_application_get_type (), GApplication), "startup", (GCallback) _application_on_activated_g_application_startup, NULL);
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return self;
-#line 323 "Application.c"
+#line 330 "Application.c"
 }
 
 
 static Application* application_new (gboolean is_direct) {
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return application_construct (TYPE_APPLICATION, is_direct);
-#line 330 "Application.c"
+#line 337 "Application.c"
 }
 
 
@@ -336,11 +343,11 @@ static Application* application_new (gboolean is_direct) {
      * instance.
      */
 void application_send_to_primary_instance (gchar** argv, int argv_length1) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 78 "/home/jens/Source/shotwell/src/Application.vala"
@@ -355,7 +362,7 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) {
 	g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication), _tmp3__length1, _tmp3_);
 #line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 359 "Application.c"
+#line 366 "Application.c"
 }
 
 
@@ -365,9 +372,9 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) {
      * should only be called if we are _not_ the primary instance.
      */
 void application_present_primary_instance (void) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
 #line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 87 "/home/jens/Source/shotwell/src/Application.vala"
@@ -378,17 +385,17 @@ void application_present_primary_instance (void) {
 	g_application_activate (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication));
 #line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 382 "Application.c"
+#line 389 "Application.c"
 }
 
 
 gboolean application_get_is_remote (void) {
 	gboolean result = FALSE;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
@@ -405,16 +412,16 @@ gboolean application_get_is_remote (void) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 409 "Application.c"
+#line 416 "Application.c"
 }
 
 
 gboolean application_get_is_direct (void) {
 	gboolean result = FALSE;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
@@ -429,17 +436,17 @@ gboolean application_get_is_direct (void) {
 	result = _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 433 "Application.c"
+#line 440 "Application.c"
 }
 
 
 void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
 #line 98 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (action != NULL);
 #line 99 "/home/jens/Source/shotwell/src/Application.vala"
@@ -458,15 +465,15 @@ void application_set_accels_for_action (const gchar* action, gchar** accel, int
 	gtk_application_set_accels_for_action (_tmp2_, _tmp3_, _tmp4_);
 #line 99 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 462 "Application.c"
+#line 469 "Application.c"
 }
 
 
 void application_set_menubar (GMenuModel* model) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	GMenuModel* _tmp3_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	GtkApplication* _tmp2_;
+	GMenuModel* _tmp3_;
 #line 102 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail ((model == NULL) || G_IS_MENU_MODEL (model));
 #line 103 "/home/jens/Source/shotwell/src/Application.vala"
@@ -481,7 +488,7 @@ void application_set_menubar (GMenuModel* model) {
 	gtk_application_set_menubar (_tmp2_, _tmp3_);
 #line 103 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 485 "Application.c"
+#line 492 "Application.c"
 }
 
 
@@ -494,13 +501,13 @@ void application_set_menubar (GMenuModel* model) {
      * will trigger this and exit, and we'll need to bring the window back up...
      */
 void application_on_activated (void) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
 	LibraryWindow* lw = NULL;
-	AppWindow* _tmp2_ = NULL;
-	LibraryWindow* _tmp3_ = NULL;
+	AppWindow* _tmp2_;
+	LibraryWindow* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	LibraryWindow* _tmp5_ = NULL;
+	LibraryWindow* _tmp5_;
 #line 115 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 115 "/home/jens/Source/shotwell/src/Application.vala"
@@ -515,7 +522,7 @@ void application_on_activated (void) {
 	if (_tmp3_ == NULL) {
 #line 117 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp2_);
-#line 519 "Application.c"
+#line 526 "Application.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	lw = _tmp3_;
@@ -523,23 +530,23 @@ void application_on_activated (void) {
 	_tmp5_ = lw;
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp5_ != NULL) {
-#line 527 "Application.c"
-		gboolean _tmp6_ = FALSE;
+#line 534 "Application.c"
+		gboolean _tmp6_;
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = application_get_is_direct ();
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = !_tmp6_;
-#line 533 "Application.c"
+#line 540 "Application.c"
 	} else {
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = FALSE;
-#line 537 "Application.c"
+#line 544 "Application.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp4_) {
-#line 541 "Application.c"
-		LibraryWindow* _tmp7_ = NULL;
-		LibraryWindow* _tmp8_ = NULL;
+#line 548 "Application.c"
+		LibraryWindow* _tmp7_;
+		LibraryWindow* _tmp8_;
 #line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp7_ = library_window_get_app ();
 #line 119 "/home/jens/Source/shotwell/src/Application.vala"
@@ -548,11 +555,11 @@ void application_on_activated (void) {
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
 #line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp8_);
-#line 552 "Application.c"
+#line 559 "Application.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (lw);
-#line 556 "Application.c"
+#line 563 "Application.c"
 }
 
 
@@ -567,13 +574,13 @@ void application_on_activated (void) {
 gint application_on_command_line (GApplicationCommandLine* acl) {
 	gint result = 0;
 	gchar** argv = NULL;
-	GApplicationCommandLine* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint argv_length1 = 0;
-	gint _argv_size_ = 0;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	GApplicationCommandLine* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint argv_length1;
+	gint _argv_size_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 131 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (G_IS_APPLICATION_COMMAND_LINE (acl), 0);
 #line 132 "/home/jens/Source/shotwell/src/Application.vala"
@@ -592,14 +599,14 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 	_tmp3__length1 = argv_length1;
 #line 134 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ != NULL) {
-#line 596 "Application.c"
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+#line 603 "Application.c"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = argv;
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4__length1 = argv_length1;
-#line 603 "Application.c"
+#line 610 "Application.c"
 		{
 			gchar** s_collection = NULL;
 			gint s_collection_length1 = 0;
@@ -611,19 +618,19 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 			s_collection_length1 = _tmp4__length1;
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 			for (s_it = 0; s_it < _tmp4__length1; s_it = s_it + 1) {
-#line 615 "Application.c"
-				gchar* _tmp5_ = NULL;
+#line 622 "Application.c"
+				gchar* _tmp5_;
 				gchar* s = NULL;
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 				_tmp5_ = g_strdup (s_collection[s_it]);
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 				s = _tmp5_;
-#line 622 "Application.c"
+#line 629 "Application.c"
 				{
 					LibraryWindow* lw = NULL;
-					AppWindow* _tmp6_ = NULL;
-					LibraryWindow* _tmp7_ = NULL;
-					LibraryWindow* _tmp8_ = NULL;
+					AppWindow* _tmp6_;
+					LibraryWindow* _tmp7_;
+					LibraryWindow* _tmp8_;
 #line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp6_ = app_window_get_instance ();
 #line 136 "/home/jens/Source/shotwell/src/Application.vala"
@@ -632,7 +639,7 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 					if (_tmp7_ == NULL) {
 #line 136 "/home/jens/Source/shotwell/src/Application.vala"
 						_g_object_unref0 (_tmp6_);
-#line 636 "Application.c"
+#line 643 "Application.c"
 					}
 #line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					lw = _tmp7_;
@@ -640,22 +647,22 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 					_tmp8_ = lw;
 #line 137 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp8_ != NULL) {
-#line 644 "Application.c"
-						LibraryWindow* _tmp9_ = NULL;
-						const gchar* _tmp10_ = NULL;
+#line 651 "Application.c"
+						LibraryWindow* _tmp9_;
+						const gchar* _tmp10_;
 #line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp9_ = lw;
 #line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp10_ = s;
 #line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						library_window_mounted_camera_shell_notification (_tmp9_, _tmp10_, FALSE);
-#line 653 "Application.c"
+#line 660 "Application.c"
 					}
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_object_unref0 (lw);
 #line 135 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_free0 (s);
-#line 659 "Application.c"
+#line 666 "Application.c"
 				}
 			}
 		}
@@ -668,7 +675,7 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 143 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 672 "Application.c"
+#line 679 "Application.c"
 }
 
 
@@ -684,14 +691,14 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
      * call this first will lead to an assertion.
      */
 void application_init (gboolean is_direct) {
-	Application* _tmp0_ = NULL;
+	Application* _tmp0_;
 #line 158 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
 #line 158 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_ == NULL) {
-#line 693 "Application.c"
-		gboolean _tmp1_ = FALSE;
-		Application* _tmp2_ = NULL;
+#line 700 "Application.c"
+		gboolean _tmp1_;
+		Application* _tmp2_;
 #line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = is_direct;
 #line 159 "/home/jens/Source/shotwell/src/Application.vala"
@@ -700,14 +707,14 @@ void application_init (gboolean is_direct) {
 		_application_unref0 (application_instance);
 #line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		application_instance = _tmp2_;
-#line 704 "Application.c"
+#line 711 "Application.c"
 	}
 }
 
 
 void application_terminate (void) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
 #line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
 #line 163 "/home/jens/Source/shotwell/src/Application.vala"
@@ -716,22 +723,22 @@ void application_terminate (void) {
 	application_exit (_tmp1_);
 #line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 720 "Application.c"
+#line 727 "Application.c"
 }
 
 
 static gpointer _application_ref0 (gpointer self) {
 #line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? application_ref (self) : NULL;
-#line 727 "Application.c"
+#line 734 "Application.c"
 }
 
 
 Application* application_get_instance (void) {
 	Application* result = NULL;
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
+	Application* _tmp0_;
+	Application* _tmp1_;
+	Application* _tmp2_;
 #line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
 #line 167 "/home/jens/Source/shotwell/src/Application.vala"
@@ -744,26 +751,26 @@ Application* application_get_instance (void) {
 	result = _tmp2_;
 #line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 748 "Application.c"
+#line 755 "Application.c"
 }
 
 
 void application_start (Application* self, gchar** argv, int argv_length1) {
-	gboolean _tmp0_ = FALSE;
-	AppWindow* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	GtkApplication* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	GtkApplication* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gint _tmp8_ = 0;
-	gboolean _tmp9_ = FALSE;
-	GtkApplication* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	GtkApplication* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
+	gboolean _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GtkApplication* _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	GtkApplication* _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	gint _tmp8_;
+	gboolean _tmp9_;
+	GtkApplication* _tmp12_;
+	guint _tmp13_;
+	GtkApplication* _tmp14_;
+	guint _tmp15_;
 #line 172 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 173 "/home/jens/Source/shotwell/src/Application.vala"
@@ -772,12 +779,12 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	if (_tmp0_) {
 #line 174 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 776 "Application.c"
+#line 783 "Application.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = TRUE;
 #line 178 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_emit_by_name (self, "starting");
+	g_signal_emit (self, application_signals[APPLICATION_STARTING_SIGNAL], 0);
 #line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
 #line 180 "/home/jens/Source/shotwell/src/Application.vala"
@@ -810,16 +817,16 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	_tmp9_ = self->priv->direct;
 #line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp9_) {
-#line 814 "Application.c"
-		GtkApplication* _tmp10_ = NULL;
-		guint _tmp11_ = 0U;
+#line 821 "Application.c"
+		GtkApplication* _tmp10_;
+		guint _tmp11_;
 #line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp10_ = self->priv->system_app;
 #line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_parse_name ("command-line", g_application_get_type (), &_tmp11_, NULL, FALSE);
 #line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _application_on_command_line_g_application_command_line, NULL);
-#line 823 "Application.c"
+#line 830 "Application.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp12_ = self->priv->system_app;
@@ -835,14 +842,14 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _application_on_activated_g_application_startup, NULL);
 #line 191 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = FALSE;
-#line 839 "Application.c"
+#line 846 "Application.c"
 }
 
 
 void application_exit (Application* self) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GtkApplication* _tmp3_ = NULL;
+	gboolean _tmp1_;
+	GtkApplication* _tmp3_;
 #line 194 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
@@ -851,35 +858,35 @@ void application_exit (Application* self) {
 	if (_tmp1_) {
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = TRUE;
-#line 855 "Application.c"
+#line 862 "Application.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = self->priv->running;
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = !_tmp2_;
-#line 862 "Application.c"
+#line 869 "Application.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
 #line 198 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 868 "Application.c"
+#line 875 "Application.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->exiting_fired = TRUE;
 #line 202 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_emit_by_name (self, "exiting", FALSE);
+	g_signal_emit (self, application_signals[APPLICATION_EXITING_SIGNAL], 0, FALSE);
 #line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
 #line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	g_application_release (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication));
-#line 878 "Application.c"
+#line 885 "Application.c"
 }
 
 
 void application_panic (Application* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 209 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 210 "/home/jens/Source/shotwell/src/Application.vala"
@@ -889,12 +896,12 @@ void application_panic (Application* self) {
 #line 211 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->exiting_fired = TRUE;
 #line 212 "/home/jens/Source/shotwell/src/Application.vala"
-		g_signal_emit_by_name (self, "exiting", TRUE);
-#line 894 "Application.c"
+		g_signal_emit (self, application_signals[APPLICATION_EXITING_SIGNAL], 0, TRUE);
+#line 901 "Application.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/Application.vala"
 	exit (1);
-#line 898 "Application.c"
+#line 905 "Application.c"
 }
 
 
@@ -907,13 +914,13 @@ void application_panic (Application* self) {
      */
 guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, const gchar* reason) {
 	guint result = 0U;
-	GtkApplication* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	AppWindow* _tmp2_ = NULL;
-	GtkApplicationInhibitFlags _tmp3_ = 0;
-	const gchar* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	guint _tmp6_ = 0U;
+	GtkApplication* _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GtkApplicationInhibitFlags _tmp3_;
+	const gchar* _tmp4_;
+	guint _tmp5_;
+	guint _tmp6_;
 #line 224 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), 0U);
 #line 225 "/home/jens/Source/shotwell/src/Application.vala"
@@ -936,7 +943,7 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 	result = _tmp6_;
 #line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 940 "Application.c"
+#line 947 "Application.c"
 }
 
 
@@ -945,8 +952,8 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
      * Gtk.Application.uninhibit().
      */
 void application_uninhibit (Application* self, guint cookie) {
-	GtkApplication* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	GtkApplication* _tmp0_;
+	guint _tmp1_;
 #line 232 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
 #line 233 "/home/jens/Source/shotwell/src/Application.vala"
@@ -955,13 +962,13 @@ void application_uninhibit (Application* self, guint cookie) {
 	_tmp1_ = cookie;
 #line 233 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_uninhibit (_tmp0_, _tmp1_);
-#line 959 "Application.c"
+#line 966 "Application.c"
 }
 
 
 gint application_get_run_return_value (Application* self) {
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 236 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), 0);
 #line 237 "/home/jens/Source/shotwell/src/Application.vala"
@@ -970,7 +977,7 @@ gint application_get_run_return_value (Application* self) {
 	result = _tmp0_;
 #line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 974 "Application.c"
+#line 981 "Application.c"
 }
 
 
@@ -989,7 +996,7 @@ static void application_real_init_done (Application* self) {
 static void value_application_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	value->data[0].v_pointer = NULL;
-#line 993 "Application.c"
+#line 1000 "Application.c"
 }
 
 
@@ -998,7 +1005,7 @@ static void value_application_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (value->data[0].v_pointer);
-#line 1002 "Application.c"
+#line 1009 "Application.c"
 	}
 }
 
@@ -1008,11 +1015,11 @@ static void value_application_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = application_ref (src_value->data[0].v_pointer);
-#line 1012 "Application.c"
+#line 1019 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1016 "Application.c"
+#line 1023 "Application.c"
 	}
 }
 
@@ -1020,66 +1027,66 @@ static void value_application_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_application_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return value->data[0].v_pointer;
-#line 1024 "Application.c"
+#line 1031 "Application.c"
 }
 
 
 static gchar* value_application_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (collect_values[0].v_pointer) {
-#line 1031 "Application.c"
-		Application* object;
+#line 1038 "Application.c"
+		Application * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1038 "Application.c"
+#line 1045 "Application.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1042 "Application.c"
+#line 1049 "Application.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = application_ref (object);
-#line 1046 "Application.c"
+#line 1053 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1050 "Application.c"
+#line 1057 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1054 "Application.c"
+#line 1061 "Application.c"
 }
 
 
 static gchar* value_application_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Application** object_p;
+	Application ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1065 "Application.c"
+#line 1072 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = NULL;
-#line 1071 "Application.c"
+#line 1078 "Application.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1075 "Application.c"
+#line 1082 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = application_ref (value->data[0].v_pointer);
-#line 1079 "Application.c"
+#line 1086 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1083 "Application.c"
+#line 1090 "Application.c"
 }
 
 
@@ -1093,7 +1100,7 @@ GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return G_PARAM_SPEC (spec);
-#line 1097 "Application.c"
+#line 1104 "Application.c"
 }
 
 
@@ -1102,12 +1109,12 @@ gpointer value_get_application (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION), NULL);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return value->data[0].v_pointer;
-#line 1106 "Application.c"
+#line 1113 "Application.c"
 }
 
 
 void value_set_application (GValue* value, gpointer v_object) {
-	Application* old;
+	Application * old;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION));
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
@@ -1122,23 +1129,23 @@ void value_set_application (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_ref (value->data[0].v_pointer);
-#line 1126 "Application.c"
+#line 1133 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1130 "Application.c"
+#line 1137 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (old);
-#line 1136 "Application.c"
+#line 1143 "Application.c"
 	}
 }
 
 
 void value_take_application (GValue* value, gpointer v_object) {
-	Application* old;
+	Application * old;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION));
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
@@ -1151,17 +1158,17 @@ void value_take_application (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = v_object;
-#line 1155 "Application.c"
+#line 1162 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1159 "Application.c"
+#line 1166 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (old);
-#line 1165 "Application.c"
+#line 1172 "Application.c"
 	}
 }
 
@@ -1180,12 +1187,12 @@ static void application_class_init (ApplicationClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	((ApplicationClass *) klass)->init_done = application_real_init_done;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_new ("starting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, starting), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	application_signals[APPLICATION_STARTING_SIGNAL] = g_signal_new ("starting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, starting), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_new ("exiting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, exiting), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+	application_signals[APPLICATION_EXITING_SIGNAL] = g_signal_new ("exiting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, exiting), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
-	g_signal_new ("init_done", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, init_done), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1189 "Application.c"
+	application_signals[APPLICATION_INIT_DONE_SIGNAL] = g_signal_new ("init-done", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, init_done), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 1196 "Application.c"
 }
 
 
@@ -1204,11 +1211,11 @@ static void application_instance_init (Application * self) {
 	self->priv->exiting_fired = FALSE;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	self->ref_count = 1;
-#line 1208 "Application.c"
+#line 1215 "Application.c"
 }
 
 
-static void application_finalize (Application* obj) {
+static void application_finalize (Application * obj) {
 	Application * self;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APPLICATION, Application);
@@ -1216,7 +1223,7 @@ static void application_finalize (Application* obj) {
 	g_signal_handlers_destroy (self);
 #line 9 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (self->priv->system_app);
-#line 1220 "Application.c"
+#line 1227 "Application.c"
 }
 
 
@@ -1235,18 +1242,18 @@ GType application_get_type (void) {
 
 
 gpointer application_ref (gpointer instance) {
-	Application* self;
+	Application * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return instance;
-#line 1245 "Application.c"
+#line 1252 "Application.c"
 }
 
 
 void application_unref (gpointer instance) {
-	Application* self;
+	Application * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1254,7 +1261,7 @@ void application_unref (gpointer instance) {
 		APPLICATION_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1258 "Application.c"
+#line 1265 "Application.c"
 	}
 }