Merge branch 'feature/upstream' into develop

1 files changed, 247 insertions, 212 deletions

diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index 16c0212..74d510c 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.36.6, the Vala compiler
+/* DirectWindow.c generated by valac 0.40.4, the Vala compiler
  * generated from DirectWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -93,6 +94,11 @@ typedef struct _EditingHostPageClass EditingHostPageClass;
 
 typedef struct _DirectPhotoPage DirectPhotoPage;
 typedef struct _DirectPhotoPageClass DirectPhotoPageClass;
+enum  {
+	DIRECT_WINDOW_0_PROPERTY,
+	DIRECT_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* direct_window_properties[DIRECT_WINDOW_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
@@ -291,19 +297,24 @@ GType single_photo_page_get_type (void) G_GNUC_CONST;
 GType editing_host_page_get_type (void) G_GNUC_CONST;
 GType direct_photo_page_get_type (void) G_GNUC_CONST;
 #define DIRECT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_WINDOW, DirectWindowPrivate))
-enum  {
-	DIRECT_WINDOW_DUMMY_PROPERTY
-};
 DirectWindow* direct_window_new (GFile* file);
-DirectWindow* direct_window_construct (GType object_type, GFile* file);
+DirectWindow* direct_window_construct (GType object_type,
+                                       GFile* file);
 AppWindow* app_window_construct (GType object_type);
 DirectPhotoPage* direct_photo_page_new (GFile* file);
-DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file);
+DirectPhotoPage* direct_photo_page_construct (GType object_type,
+                                              GFile* file);
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType view_collection_get_type (void) G_GNUC_CONST;
@@ -312,16 +323,29 @@ static void direct_window_on_photo_changed (DirectWindow* self);
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
-static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender,
+                                                                    GeeMap* items,
+                                                                    gpointer self);
 GType data_view_get_type (void) G_GNUC_CONST;
-static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self);
-void page_window_set_current_page (PageWindow* self, Page* page);
-void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified);
+static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender,
+                                                                          GeeIterable* changed,
+                                                                          gpointer self);
+void page_window_set_current_page (PageWindow* self,
+                                   Page* page);
+void direct_window_update_title (DirectWindow* self,
+                                 GFile* file,
+                                 gboolean modified);
 void page_switched_to (Page* self);
 GtkToolbar* page_get_toolbar (Page* self);
 void application_set_menubar (GMenuModel* model);
@@ -333,9 +357,11 @@ gchar* get_display_pathname (GFile* file);
 #define RESOURCES_APP_TITLE "Shotwell"
 static void direct_window_real_on_fullscreen (AppWindow* base);
 GFile* direct_photo_page_get_current_file (DirectPhotoPage* self);
-void app_window_go_fullscreen (AppWindow* self, Page* page);
+void app_window_go_fullscreen (AppWindow* self,
+                               Page* page);
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file);
-DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file);
+DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type,
+                                                                   GFile* file);
 GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST;
 static gchar* direct_window_real_get_app_role (AppWindow* base);
 #define RESOURCES_APP_DIRECT_ROLE _ ("Photo Viewer")
@@ -352,152 +378,168 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
-void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions);
+void configuration_facade_set_direct_window_state (ConfigurationFacade* self,
+                                                   gboolean maximize,
+                                                   Dimensions* dimensions);
 void app_window_on_quit (AppWindow* self);
-static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event);
-static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event);
+static gboolean direct_window_real_delete_event (GtkWidget* base,
+                                          GdkEventAny* event);
+static gboolean direct_window_real_button_press_event (GtkWidget* base,
+                                                GdkEventButton* event);
 void app_window_on_fullscreen (AppWindow* self);
-static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
+static gboolean direct_window_real_key_press_event (GtkWidget* base,
+                                             GdkEventKey* event);
 static void direct_window_finalize (GObject * obj);
 
 
-static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender,
+                                                               GeeMap* items,
+                                                               gpointer self)
+{
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	direct_window_on_photo_changed ((DirectWindow*) self);
-#line 368 "DirectWindow.c"
+#line 403 "DirectWindow.c"
 }
 
 
-static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
+static void
+_direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender,
+                                                                     GeeIterable* changed,
+                                                                     gpointer self)
+{
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	direct_window_on_photo_changed ((DirectWindow*) self);
-#line 375 "DirectWindow.c"
+#line 414 "DirectWindow.c"
 }
 
 
-DirectWindow* direct_window_construct (GType object_type, GFile* file) {
+DirectWindow*
+direct_window_construct (GType object_type,
+                         GFile* file)
+{
 	DirectWindow * self = NULL;
-	GFile* _tmp0_;
+	DirectPhotoPage* _tmp0_;
 	DirectPhotoPage* _tmp1_;
-	DirectPhotoPage* _tmp2_;
+	ViewCollection* _tmp2_;
 	ViewCollection* _tmp3_;
-	ViewCollection* _tmp4_;
-	DirectPhotoPage* _tmp5_;
+	DirectPhotoPage* _tmp4_;
+	ViewCollection* _tmp5_;
 	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
+	DirectPhotoPage* _tmp7_;
 	DirectPhotoPage* _tmp8_;
-	GFile* _tmp9_;
-	DirectPhotoPage* _tmp10_;
 	GtkBox* layout = NULL;
-	GtkBox* _tmp11_;
-	DirectPhotoPage* _tmp12_;
-	DirectPhotoPage* _tmp13_;
-	GtkToolbar* _tmp14_;
-	GtkToolbar* _tmp15_;
-	DirectPhotoPage* _tmp16_;
-	GMenuModel* _tmp17_;
-	GMenuModel* _tmp18_;
+	GtkBox* _tmp9_;
+	DirectPhotoPage* _tmp10_;
+	DirectPhotoPage* _tmp11_;
+	GtkToolbar* _tmp12_;
+	GtkToolbar* _tmp13_;
+	DirectPhotoPage* _tmp14_;
+	GMenuModel* _tmp15_;
+	GMenuModel* _tmp16_;
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = (DirectWindow*) app_window_construct (object_type);
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp0_ = file;
-#line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp1_ = direct_photo_page_new (_tmp0_);
+	_tmp0_ = direct_photo_page_new (file);
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (self->priv->direct_photo_page);
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	self->priv->direct_photo_page = _tmp1_;
+	self->priv->direct_photo_page = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp2_ = self->priv->direct_photo_page;
+	_tmp1_ = self->priv->direct_photo_page;
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE, Page));
+	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page));
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_window_on_photo_changed_data_collection_items_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_window_on_photo_changed_data_collection_items_altered, self, 0);
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_data_collection_unref0 (_tmp4_);
+	_data_collection_unref0 (_tmp3_);
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp5_ = self->priv->direct_photo_page;
+	_tmp4_ = self->priv->direct_photo_page;
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE, Page));
+	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_signal_connect_object (_tmp7_, "items-state-changed", (GCallback) _direct_window_on_photo_changed_view_collection_items_state_changed, self, 0);
+	g_signal_connect_object (_tmp6_, "items-state-changed", (GCallback) _direct_window_on_photo_changed_view_collection_items_state_changed, self, 0);
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_data_collection_unref0 (_tmp7_);
+	_data_collection_unref0 (_tmp6_);
 #line 15 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp8_ = self->priv->direct_photo_page;
+	_tmp7_ = self->priv->direct_photo_page;
 #line 15 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
+	page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page));
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp9_ = file;
-#line 17 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	direct_window_update_title (self, _tmp9_, FALSE);
+	direct_window_update_title (self, file, FALSE);
 #line 19 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp10_ = self->priv->direct_photo_page;
+	_tmp8_ = self->priv->direct_photo_page;
 #line 19 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	page_switched_to (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE, Page));
+	page_switched_to (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
 #line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp11_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_object_ref_sink (_tmp11_);
+	g_object_ref_sink (_tmp9_);
 #line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	layout = _tmp11_;
+	layout = _tmp9_;
 #line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp12_ = self->priv->direct_photo_page;
+	_tmp10_ = self->priv->direct_photo_page;
 #line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp13_ = self->priv->direct_photo_page;
+	_tmp11_ = self->priv->direct_photo_page;
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp14_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE, Page));
+	_tmp12_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE, Page));
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp15_ = _tmp14_;
+	_tmp13_ = _tmp12_;
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	gtk_box_pack_end (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_end (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_object_unref0 (_tmp15_);
+	_g_object_unref0 (_tmp13_);
 #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp16_ = self->priv->direct_photo_page;
+	_tmp14_ = self->priv->direct_photo_page;
 #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp17_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page));
+	_tmp15_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE, Page));
 #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp18_ = _tmp17_;
+	_tmp16_ = _tmp15_;
 #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	application_set_menubar (_tmp18_);
+	application_set_menubar (_tmp16_);
 #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_object_unref0 (_tmp18_);
+	_g_object_unref0 (_tmp16_);
 #line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (layout);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return self;
-#line 483 "DirectWindow.c"
+#line 519 "DirectWindow.c"
 }
 
 
-DirectWindow* direct_window_new (GFile* file) {
+DirectWindow*
+direct_window_new (GFile* file)
+{
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return direct_window_construct (TYPE_DIRECT_WINDOW, file);
-#line 490 "DirectWindow.c"
+#line 528 "DirectWindow.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 497 "DirectWindow.c"
+#line 537 "DirectWindow.c"
 }
 
 
-DirectWindow* direct_window_get_app (void) {
+DirectWindow*
+direct_window_get_app (void)
+{
 	DirectWindow* result = NULL;
 	AppWindow* _tmp0_;
 	DirectWindow* _tmp1_;
@@ -509,11 +551,13 @@ DirectWindow* direct_window_get_app (void) {
 	result = _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 513 "DirectWindow.c"
+#line 555 "DirectWindow.c"
 }
 
 
-DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
+DirectPhotoPage*
+direct_window_get_direct_page (DirectWindow* self)
+{
 	DirectPhotoPage* result = NULL;
 	Page* _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -524,74 +568,71 @@ DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 528 "DirectWindow.c"
+#line 572 "DirectWindow.c"
 }
 
 
-void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified) {
+void
+direct_window_update_title (DirectWindow* self,
+                            GFile* file,
+                            gboolean modified)
+{
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_;
-	GFile* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	GFile* _tmp5_;
-	GFile* _tmp6_;
-	GFile* _tmp7_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 	gchar* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp1_ = modified;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (_tmp1_) {
+	if (modified) {
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp0_ = "*";
-#line 555 "DirectWindow.c"
+#line 598 "DirectWindow.c"
 	} else {
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp0_ = "";
-#line 559 "DirectWindow.c"
+#line 602 "DirectWindow.c"
 	}
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp2_ = file;
+	_tmp1_ = g_file_get_basename (file);
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp3_ = g_file_get_basename (_tmp2_);
+	_tmp2_ = _tmp1_;
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = g_file_get_parent (file);
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp5_ = file;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp6_ = g_file_get_parent (_tmp5_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = _tmp3_;
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp8_ = get_display_pathname (_tmp7_);
+	_tmp5_ = get_display_pathname (_tmp4_);
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp9_ = _tmp8_;
+	_tmp6_ = _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp10_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp4_, _tmp9_, RESOURCES_APP_TITLE);
+	_tmp7_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp2_, _tmp6_, RESOURCES_APP_TITLE);
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp11_ = _tmp10_;
+	_tmp8_ = _tmp7_;
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp8_);
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_free0 (_tmp11_);
+	_g_free0 (_tmp8_);
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp6_);
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp4_);
 #line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_free0 (_tmp4_);
-#line 591 "DirectWindow.c"
+	_g_free0 (_tmp2_);
+#line 630 "DirectWindow.c"
 }
 
 
-static void direct_window_real_on_fullscreen (AppWindow* base) {
+static void
+direct_window_real_on_fullscreen (AppWindow* base)
+{
 	DirectWindow * self;
 	GFile* file = NULL;
 	DirectPhotoPage* _tmp0_;
@@ -626,11 +667,13 @@ static void direct_window_real_on_fullscreen (AppWindow* base) {
 	_g_object_unref0 (_tmp5_);
 #line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (file);
-#line 630 "DirectWindow.c"
+#line 671 "DirectWindow.c"
 }
 
 
-static gchar* direct_window_real_get_app_role (AppWindow* base) {
+static gchar*
+direct_window_real_get_app_role (AppWindow* base)
+{
 	DirectWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -642,11 +685,13 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) {
 	result = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 646 "DirectWindow.c"
+#line 689 "DirectWindow.c"
 }
 
 
-static void direct_window_on_photo_changed (DirectWindow* self) {
+static void
+direct_window_on_photo_changed (DirectWindow* self)
+{
 	Photo* photo = NULL;
 	DirectPhotoPage* _tmp0_;
 	Photo* _tmp1_;
@@ -663,12 +708,11 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 	_tmp2_ = photo;
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 667 "DirectWindow.c"
+#line 712 "DirectWindow.c"
 		Photo* _tmp3_;
 		GFile* _tmp4_;
 		GFile* _tmp5_;
 		Photo* _tmp6_;
-		gboolean _tmp7_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = photo;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -678,29 +722,28 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp6_ = photo;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp7_ = photo_has_alterations (_tmp6_);
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		direct_window_update_title (self, _tmp5_, _tmp7_);
+		direct_window_update_title (self, _tmp5_, photo_has_alterations (_tmp6_));
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 687 "DirectWindow.c"
+#line 729 "DirectWindow.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (photo);
-#line 691 "DirectWindow.c"
+#line 733 "DirectWindow.c"
 }
 
 
-static void direct_window_real_on_quit (AppWindow* base) {
+static void
+direct_window_real_on_quit (AppWindow* base)
+{
 	DirectWindow * self;
 	DirectPhotoPage* _tmp0_;
 	DirectPhotoPage* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
+	ConfigFacade* _tmp3_;
 	ConfigFacade* _tmp4_;
-	ConfigFacade* _tmp5_;
-	gboolean _tmp6_;
-	Dimensions _tmp7_;
+	gboolean _tmp5_;
+	Dimensions _tmp6_;
 #line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -708,43 +751,43 @@ static void direct_window_real_on_quit (AppWindow* base) {
 #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp2_ = direct_photo_page_check_quit (_tmp1_);
-#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp3_ = !_tmp2_;
+	_tmp2_ = !direct_photo_page_check_quit (_tmp1_);
 #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
 #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return;
-#line 721 "DirectWindow.c"
+#line 762 "DirectWindow.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp4_ = config_facade_get_instance ();
+	_tmp3_ = config_facade_get_instance ();
 #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
+	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
 #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
 #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_, &_tmp7_);
+	configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_, &_tmp6_);
 #line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp4_);
 #line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	APP_WINDOW_CLASS (direct_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 737 "DirectWindow.c"
+#line 778 "DirectWindow.c"
 }
 
 
-static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event) {
+static gboolean
+direct_window_real_delete_event (GtkWidget* base,
+                                 GdkEventAny* event)
+{
 	DirectWindow * self;
 	gboolean result = FALSE;
 	DirectPhotoPage* _tmp0_;
 	DirectPhotoPage* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp3_ = FALSE;
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -754,128 +797,114 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
 #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp2_ = direct_photo_page_check_quit (_tmp1_);
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp3_ = !_tmp2_;
+	_tmp2_ = !direct_photo_page_check_quit (_tmp1_);
 #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
 #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
 #line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 769 "DirectWindow.c"
+#line 810 "DirectWindow.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) {
-#line 773 "DirectWindow.c"
-		GdkEventAny* _tmp5_;
-		gboolean _tmp6_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp5_ = event;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp6_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp4_ = _tmp6_;
-#line 782 "DirectWindow.c"
+		_tmp3_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event);
+#line 816 "DirectWindow.c"
 	} else {
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp4_ = FALSE;
-#line 786 "DirectWindow.c"
+		_tmp3_ = FALSE;
+#line 820 "DirectWindow.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 792 "DirectWindow.c"
+#line 826 "DirectWindow.c"
 }
 
 
-static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
+static gboolean
+direct_window_real_button_press_event (GtkWidget* base,
+                                       GdkEventButton* event)
+{
 	DirectWindow * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_;
-	GdkEventType _tmp1_;
+	GdkEventType _tmp0_;
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp0_ = event;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp1_ = _tmp0_->type;
+	_tmp0_ = event->type;
 #line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (_tmp1_ == GDK_2BUTTON_PRESS) {
+	if (_tmp0_ == GDK_2BUTTON_PRESS) {
 #line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		app_window_on_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
 #line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
 #line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 817 "DirectWindow.c"
+#line 851 "DirectWindow.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = FALSE;
 #line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 823 "DirectWindow.c"
+#line 857 "DirectWindow.c"
 }
 
 
-static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+direct_window_real_key_press_event (GtkWidget* base,
+                                    GdkEventKey* event)
+{
 	DirectWindow * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	guint _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_ = FALSE;
+	guint _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_ = FALSE;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp0_ = event;
+	_tmp0_ = event->keyval;
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp1_ = _tmp0_->keyval;
+	_tmp1_ = gdk_keyval_name (_tmp0_);
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
+	if (g_strcmp0 (_tmp1_, "Escape") == 0) {
 #line 90 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		app_window_on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 852 "DirectWindow.c"
+#line 886 "DirectWindow.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) {
-#line 856 "DirectWindow.c"
-		GdkEventKey* _tmp4_;
-		gboolean _tmp5_;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp4_ = event;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp5_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp3_ = _tmp5_;
-#line 865 "DirectWindow.c"
+		_tmp2_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event);
+#line 892 "DirectWindow.c"
 	} else {
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		_tmp3_ = FALSE;
-#line 869 "DirectWindow.c"
+		_tmp2_ = FALSE;
+#line 896 "DirectWindow.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 875 "DirectWindow.c"
+#line 902 "DirectWindow.c"
 }
 
 
-static void direct_window_class_init (DirectWindowClass * klass) {
+static void
+direct_window_class_init (DirectWindowClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	direct_window_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -894,18 +923,22 @@ static void direct_window_class_init (DirectWindowClass * klass) {
 	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) direct_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_window_finalize;
-#line 898 "DirectWindow.c"
+#line 927 "DirectWindow.c"
 }
 
 
-static void direct_window_instance_init (DirectWindow * self) {
+static void
+direct_window_instance_init (DirectWindow * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self->priv = DIRECT_WINDOW_GET_PRIVATE (self);
-#line 905 "DirectWindow.c"
+#line 936 "DirectWindow.c"
 }
 
 
-static void direct_window_finalize (GObject * obj) {
+static void
+direct_window_finalize (GObject * obj)
+{
 	DirectWindow * self;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_WINDOW, DirectWindow);
@@ -913,11 +946,13 @@ static void direct_window_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->direct_photo_page);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	G_OBJECT_CLASS (direct_window_parent_class)->finalize (obj);
-#line 917 "DirectWindow.c"
+#line 950 "DirectWindow.c"
 }
 
 
-GType direct_window_get_type (void) {
+GType
+direct_window_get_type (void)
+{
 	static volatile gsize direct_window_type_id__volatile = 0;
 	if (g_once_init_enter (&direct_window_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DirectWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectWindow), 0, (GInstanceInitFunc) direct_window_instance_init, NULL };