Merge tag 'upstream/0.25.2'

Upstream version 0.25.2

1 files changed, 252 insertions, 228 deletions

diff --git a/src/Application.c b/src/Application.c
index 7f33933..8d958cc 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -1,4 +1,4 @@
-/* Application.c generated by valac 0.34.2, the Vala compiler
+/* Application.c generated by valac 0.32.1, the Vala compiler
  * generated from Application.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -127,6 +127,7 @@ gboolean application_get_is_remote (void);
 gboolean application_get_is_direct (void);
 void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1);
 void application_set_menubar (GMenuModel* model);
+void application_set_appmenu (GMenuModel* model);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
@@ -156,7 +157,7 @@ void application_set_raw_thumbs_fix_required (Application* self, gboolean should
 	_tmp0_ = should_fixup;
 #line 25 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->fixup_raw_thumbs = _tmp0_;
-#line 160 "Application.c"
+#line 161 "Application.c"
 }
 
 
@@ -171,14 +172,14 @@ 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 176 "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 183 "Application.c"
 }
 
 
@@ -196,7 +197,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 201 "Application.c"
 }
 
 
@@ -205,21 +206,21 @@ 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 210 "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 217 "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 224 "Application.c"
 }
 
 
@@ -237,7 +238,7 @@ 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"
+#line 242 "Application.c"
 		GtkApplication* _tmp1_ = NULL;
 #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);
@@ -245,7 +246,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_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 250 "Application.c"
 	} else {
 		GtkApplication* _tmp2_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
@@ -254,7 +255,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_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 259 "Application.c"
 	}
 	{
 		GtkApplication* _tmp3_ = NULL;
@@ -264,12 +265,12 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		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 __catch557_g_error;
+#line 269 "Application.c"
+			goto __catch555_g_error;
 		}
 	}
-	goto __finally557;
-	__catch557_g_error:
+	goto __finally555;
+	__catch555_g_error:
 	{
 		GError* e = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -280,9 +281,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 285 "Application.c"
 	}
-	__finally557:
+	__finally555:
 #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 +292,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 296 "Application.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = is_direct;
@@ -301,13 +302,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"
+#line 306 "Application.c"
 		GtkApplication* _tmp6_ = NULL;
 #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 312 "Application.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = self->priv->system_app;
@@ -319,14 +320,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 324 "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 331 "Application.c"
 }
 
 
@@ -355,7 +356,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 360 "Application.c"
 }
 
 
@@ -378,7 +379,7 @@ 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 383 "Application.c"
 }
 
 
@@ -405,7 +406,7 @@ gboolean application_get_is_remote (void) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 409 "Application.c"
+#line 410 "Application.c"
 }
 
 
@@ -429,7 +430,7 @@ gboolean application_get_is_direct (void) {
 	result = _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 433 "Application.c"
+#line 434 "Application.c"
 }
 
 
@@ -458,7 +459,7 @@ 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 463 "Application.c"
 }
 
 
@@ -481,7 +482,30 @@ 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 486 "Application.c"
+}
+
+
+void application_set_appmenu (GMenuModel* model) {
+	Application* _tmp0_ = NULL;
+	Application* _tmp1_ = NULL;
+	GtkApplication* _tmp2_ = NULL;
+	GMenuModel* _tmp3_ = NULL;
+#line 106 "/home/jens/Source/shotwell/src/Application.vala"
+	g_return_if_fail ((model == NULL) || G_IS_MENU_MODEL (model));
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp0_ = application_get_instance ();
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp1_ = _tmp0_;
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp2_ = _tmp1_->priv->system_app;
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp3_ = model;
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	gtk_application_set_app_menu (_tmp2_, _tmp3_);
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_application_unref0 (_tmp1_);
+#line 509 "Application.c"
 }
 
 
@@ -501,58 +525,58 @@ void application_on_activated (void) {
 	LibraryWindow* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	LibraryWindow* _tmp5_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 115 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 115 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp2_) : NULL;
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ == NULL) {
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp2_);
-#line 519 "Application.c"
+#line 543 "Application.c"
 	}
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 	lw = _tmp3_;
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = lw;
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp5_ != NULL) {
-#line 527 "Application.c"
+#line 551 "Application.c"
 		gboolean _tmp6_ = FALSE;
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = application_get_is_direct ();
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = !_tmp6_;
-#line 533 "Application.c"
+#line 557 "Application.c"
 	} else {
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = FALSE;
-#line 537 "Application.c"
+#line 561 "Application.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp4_) {
-#line 541 "Application.c"
+#line 565 "Application.c"
 		LibraryWindow* _tmp7_ = NULL;
 		LibraryWindow* _tmp8_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 123 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp7_ = library_window_get_app ();
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 123 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp8_ = _tmp7_;
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 123 "/home/jens/Source/shotwell/src/Application.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 123 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp8_);
-#line 552 "Application.c"
+#line 576 "Application.c"
 	}
-#line 114 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (lw);
-#line 556 "Application.c"
+#line 580 "Application.c"
 }
 
 
@@ -574,101 +598,101 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 	gint _argv_size_ = 0;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 131 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/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"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = acl;
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = g_application_command_line_get_arguments (_tmp0_, &_tmp1_);
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	argv = _tmp2_;
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	argv_length1 = _tmp1_;
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	_argv_size_ = argv_length1;
-#line 134 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = argv;
-#line 134 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3__length1 = argv_length1;
-#line 134 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ != NULL) {
-#line 596 "Application.c"
+#line 620 "Application.c"
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = argv;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4__length1 = argv_length1;
-#line 603 "Application.c"
+#line 627 "Application.c"
 		{
 			gchar** s_collection = NULL;
 			gint s_collection_length1 = 0;
 			gint _s_collection_size_ = 0;
 			gint s_it = 0;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 			s_collection = _tmp4_;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 			s_collection_length1 = _tmp4__length1;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 			for (s_it = 0; s_it < _tmp4__length1; s_it = s_it + 1) {
-#line 615 "Application.c"
+#line 639 "Application.c"
 				gchar* _tmp5_ = NULL;
 				gchar* s = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 				_tmp5_ = g_strdup (s_collection[s_it]);
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 				s = _tmp5_;
-#line 622 "Application.c"
+#line 646 "Application.c"
 				{
 					LibraryWindow* lw = NULL;
 					AppWindow* _tmp6_ = NULL;
 					LibraryWindow* _tmp7_ = NULL;
 					LibraryWindow* _tmp8_ = NULL;
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp6_ = app_window_get_instance ();
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp6_) : NULL;
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp7_ == NULL) {
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 						_g_object_unref0 (_tmp6_);
-#line 636 "Application.c"
+#line 660 "Application.c"
 					}
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 					lw = _tmp7_;
-#line 137 "/home/jens/Source/shotwell/src/Application.vala"
+#line 141 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp8_ = lw;
-#line 137 "/home/jens/Source/shotwell/src/Application.vala"
+#line 141 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp8_ != NULL) {
-#line 644 "Application.c"
+#line 668 "Application.c"
 						LibraryWindow* _tmp9_ = NULL;
 						const gchar* _tmp10_ = NULL;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 142 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp9_ = lw;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 142 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp10_ = s;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 142 "/home/jens/Source/shotwell/src/Application.vala"
 						library_window_mounted_camera_shell_notification (_tmp9_, _tmp10_, FALSE);
-#line 653 "Application.c"
+#line 677 "Application.c"
 					}
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_object_unref0 (lw);
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_free0 (s);
-#line 659 "Application.c"
+#line 683 "Application.c"
 				}
 			}
 		}
 	}
-#line 142 "/home/jens/Source/shotwell/src/Application.vala"
+#line 146 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 143 "/home/jens/Source/shotwell/src/Application.vala"
+#line 147 "/home/jens/Source/shotwell/src/Application.vala"
 	result = 0;
-#line 143 "/home/jens/Source/shotwell/src/Application.vala"
+#line 147 "/home/jens/Source/shotwell/src/Application.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 143 "/home/jens/Source/shotwell/src/Application.vala"
+#line 147 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 672 "Application.c"
+#line 696 "Application.c"
 }
 
 
@@ -685,22 +709,22 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
      */
 void application_init (gboolean is_direct) {
 	Application* _tmp0_ = NULL;
-#line 158 "/home/jens/Source/shotwell/src/Application.vala"
+#line 162 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
-#line 158 "/home/jens/Source/shotwell/src/Application.vala"
+#line 162 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_ == NULL) {
-#line 693 "Application.c"
+#line 717 "Application.c"
 		gboolean _tmp1_ = FALSE;
 		Application* _tmp2_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = is_direct;
-#line 159 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = application_new (_tmp1_);
-#line 159 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 		_application_unref0 (application_instance);
-#line 159 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 		application_instance = _tmp2_;
-#line 704 "Application.c"
+#line 728 "Application.c"
 	}
 }
 
@@ -708,22 +732,22 @@ void application_init (gboolean is_direct) {
 void application_terminate (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	application_exit (_tmp1_);
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 720 "Application.c"
+#line 744 "Application.c"
 }
 
 
 static gpointer _application_ref0 (gpointer self) {
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? application_ref (self) : NULL;
-#line 727 "Application.c"
+#line 751 "Application.c"
 }
 
 
@@ -732,19 +756,19 @@ Application* application_get_instance (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
 	Application* _tmp2_ = NULL;
-#line 167 "/home/jens/Source/shotwell/src/Application.vala"
+#line 171 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
-#line 167 "/home/jens/Source/shotwell/src/Application.vala"
+#line 171 "/home/jens/Source/shotwell/src/Application.vala"
 	_vala_assert (_tmp0_ != NULL, "instance != null");
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = application_instance;
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _application_ref0 (_tmp1_);
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp2_;
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 748 "Application.c"
+#line 772 "Application.c"
 }
 
 
@@ -764,78 +788,78 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	guint _tmp13_ = 0U;
 	GtkApplication* _tmp14_ = NULL;
 	guint _tmp15_ = 0U;
-#line 172 "/home/jens/Source/shotwell/src/Application.vala"
+#line 176 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 177 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->running;
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 177 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 174 "/home/jens/Source/shotwell/src/Application.vala"
+#line 178 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 776 "Application.c"
+#line 800 "Application.c"
 	}
-#line 176 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = TRUE;
-#line 178 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_emit_by_name (self, "starting");
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_;
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_vala_assert (_tmp2_ != NULL, "AppWindow.get_instance() != null");
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp2_);
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = _tmp4_;
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_add_window (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp5_);
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp6_ = self->priv->system_app;
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = argv;
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7__length1 = argv_length1;
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp8_ = g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), _tmp7__length1, _tmp7_);
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->system_app_run_retval = _tmp8_;
-#line 184 "/home/jens/Source/shotwell/src/Application.vala"
+#line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp9_ = self->priv->direct;
-#line 184 "/home/jens/Source/shotwell/src/Application.vala"
+#line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp9_) {
-#line 814 "Application.c"
+#line 838 "Application.c"
 		GtkApplication* _tmp10_ = NULL;
 		guint _tmp11_ = 0U;
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp10_ = self->priv->system_app;
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/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"
+#line 189 "/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 847 "Application.c"
 	}
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 192 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp12_ = self->priv->system_app;
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 192 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_parse_name ("activate", g_application_get_type (), &_tmp13_, NULL, FALSE);
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 192 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _application_on_activated_g_application_activate, NULL);
-#line 189 "/home/jens/Source/shotwell/src/Application.vala"
+#line 193 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp14_ = self->priv->system_app;
-#line 189 "/home/jens/Source/shotwell/src/Application.vala"
+#line 193 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_parse_name ("startup", g_application_get_type (), &_tmp15_, NULL, FALSE);
-#line 189 "/home/jens/Source/shotwell/src/Application.vala"
+#line 193 "/home/jens/Source/shotwell/src/Application.vala"
 	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"
+#line 195 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = FALSE;
-#line 839 "Application.c"
+#line 863 "Application.c"
 }
 
 
@@ -843,58 +867,58 @@ void application_exit (Application* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GtkApplication* _tmp3_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/Application.vala"
+#line 198 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = self->priv->exiting_fired;
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp1_) {
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = TRUE;
-#line 855 "Application.c"
+#line 879 "Application.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = self->priv->running;
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = !_tmp2_;
-#line 862 "Application.c"
+#line 886 "Application.c"
 	}
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 198 "/home/jens/Source/shotwell/src/Application.vala"
+#line 202 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 868 "Application.c"
+#line 892 "Application.c"
 	}
-#line 200 "/home/jens/Source/shotwell/src/Application.vala"
+#line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->exiting_fired = TRUE;
-#line 202 "/home/jens/Source/shotwell/src/Application.vala"
+#line 206 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_emit_by_name (self, "exiting", FALSE);
-#line 204 "/home/jens/Source/shotwell/src/Application.vala"
+#line 208 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
-#line 204 "/home/jens/Source/shotwell/src/Application.vala"
+#line 208 "/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 902 "Application.c"
 }
 
 
 void application_panic (Application* self) {
 	gboolean _tmp0_ = FALSE;
-#line 209 "/home/jens/Source/shotwell/src/Application.vala"
+#line 213 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 210 "/home/jens/Source/shotwell/src/Application.vala"
+#line 214 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->exiting_fired;
-#line 210 "/home/jens/Source/shotwell/src/Application.vala"
+#line 214 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp0_) {
-#line 211 "/home/jens/Source/shotwell/src/Application.vala"
+#line 215 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->exiting_fired = TRUE;
-#line 212 "/home/jens/Source/shotwell/src/Application.vala"
+#line 216 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_emit_by_name (self, "exiting", TRUE);
-#line 894 "Application.c"
+#line 918 "Application.c"
 	}
-#line 214 "/home/jens/Source/shotwell/src/Application.vala"
+#line 218 "/home/jens/Source/shotwell/src/Application.vala"
 	exit (1);
-#line 898 "Application.c"
+#line 922 "Application.c"
 }
 
 
@@ -914,29 +938,29 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 	const gchar* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 224 "/home/jens/Source/shotwell/src/Application.vala"
+#line 228 "/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"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = what;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = reason;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = gtk_application_inhibit (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow), _tmp3_, _tmp4_);
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp6_ = _tmp5_;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp2_);
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp6_;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 940 "Application.c"
+#line 964 "Application.c"
 }
 
 
@@ -947,30 +971,30 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 void application_uninhibit (Application* self, guint cookie) {
 	GtkApplication* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 232 "/home/jens/Source/shotwell/src/Application.vala"
+#line 236 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 233 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app;
-#line 233 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = cookie;
-#line 233 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_uninhibit (_tmp0_, _tmp1_);
-#line 959 "Application.c"
+#line 983 "Application.c"
 }
 
 
 gint application_get_run_return_value (Application* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 236 "/home/jens/Source/shotwell/src/Application.vala"
+#line 240 "/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"
+#line 241 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app_run_retval;
-#line 237 "/home/jens/Source/shotwell/src/Application.vala"
+#line 241 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp0_;
-#line 237 "/home/jens/Source/shotwell/src/Application.vala"
+#line 241 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 974 "Application.c"
+#line 998 "Application.c"
 }
 
 
@@ -989,7 +1013,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 1017 "Application.c"
 }
 
 
@@ -998,7 +1022,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 1026 "Application.c"
 	}
 }
 
@@ -1008,11 +1032,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 1036 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1016 "Application.c"
+#line 1040 "Application.c"
 	}
 }
 
@@ -1020,37 +1044,37 @@ 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 1048 "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"
+#line 1055 "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 1062 "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 1066 "Application.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = application_ref (object);
-#line 1046 "Application.c"
+#line 1070 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1050 "Application.c"
+#line 1074 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1054 "Application.c"
+#line 1078 "Application.c"
 }
 
 
@@ -1061,25 +1085,25 @@ static gchar* value_application_lcopy_value (const GValue* value, guint n_collec
 	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 1089 "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 1095 "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 1099 "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 1103 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1083 "Application.c"
+#line 1107 "Application.c"
 }
 
 
@@ -1093,7 +1117,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 1121 "Application.c"
 }
 
 
@@ -1102,7 +1126,7 @@ 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 1130 "Application.c"
 }
 
 
@@ -1122,17 +1146,17 @@ 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 1150 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1130 "Application.c"
+#line 1154 "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 1160 "Application.c"
 	}
 }
 
@@ -1151,17 +1175,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 1179 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1159 "Application.c"
+#line 1183 "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 1189 "Application.c"
 	}
 }
 
@@ -1185,7 +1209,7 @@ static void application_class_init (ApplicationClass * klass) {
 	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"
+#line 1213 "Application.c"
 }
 
 
@@ -1204,7 +1228,7 @@ 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 1232 "Application.c"
 }
 
 
@@ -1216,7 +1240,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 1244 "Application.c"
 }
 
 
@@ -1241,7 +1265,7 @@ gpointer application_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return instance;
-#line 1245 "Application.c"
+#line 1269 "Application.c"
 }
 
 
@@ -1254,7 +1278,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 1282 "Application.c"
 	}
 }