diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
commit | f39ea21098340bd99c48669f152c9068046c2c99 (patch) | |
tree | d1166fce1a4a8c470dfaf364816f767678c4729e /src/AppWindow.c | |
parent | bc48a4cff815ed156b603c92e684779c317417ba (diff) | |
parent | a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff) |
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/AppWindow.c')
-rw-r--r-- | src/AppWindow.c | 1026 |
1 files changed, 509 insertions, 517 deletions
diff --git a/src/AppWindow.c b/src/AppWindow.c index e49d245..b36bbbe 100644 --- a/src/AppWindow.c +++ b/src/AppWindow.c @@ -1,4 +1,4 @@ -/* AppWindow.c generated by valac 0.32.1, the Vala compiler +/* AppWindow.c generated by valac 0.34.4, the Vala compiler * generated from AppWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -353,9 +353,9 @@ FullscreenWindow* fullscreen_window_new (Page* page); FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page); PageWindow* page_window_construct (GType object_type); void page_window_set_current_page (PageWindow* self, Page* page); +void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); -void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1); static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkRectangle* result); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; @@ -622,57 +622,55 @@ static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (Slidesh FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) { FullscreenWindow * self = NULL; Page* _tmp0_ = NULL; +#line 32 "/home/jens/Source/shotwell/src/AppWindow.vala" + static const gchar* accels[] = {"F11", NULL}; +#line 600 "AppWindow.c" AppWindow* _tmp1_ = NULL; AppWindow* _tmp2_ = NULL; -#line 32 "/home/jens/Source/shotwell/src/AppWindow.vala" - static const gchar* accels[] = {"F11"}; -#line 602 "AppWindow.c" - AppWindow* _tmp3_ = NULL; - AppWindow* _tmp4_ = NULL; - GdkScreen* _tmp5_ = NULL; + GdkScreen* _tmp3_ = NULL; GdkRectangle monitor = {0}; - GdkRectangle _tmp6_ = {0}; + GdkRectangle _tmp4_ = {0}; + GdkRectangle _tmp5_ = {0}; + gint _tmp6_ = 0; GdkRectangle _tmp7_ = {0}; gint _tmp8_ = 0; - GdkRectangle _tmp9_ = {0}; - gint _tmp10_ = 0; - ConfigFacade* _tmp11_ = NULL; - ConfigFacade* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - GtkToggleToolButton* _tmp14_ = NULL; + ConfigFacade* _tmp9_ = NULL; + ConfigFacade* _tmp10_ = NULL; + gboolean _tmp11_ = FALSE; + GtkToggleToolButton* _tmp12_ = NULL; + GtkToggleToolButton* _tmp13_ = NULL; + const gchar* _tmp14_ = NULL; GtkToggleToolButton* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; GtkToggleToolButton* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; + gboolean _tmp18_ = FALSE; GtkToggleToolButton* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - GtkToggleToolButton* _tmp21_ = NULL; - GtkToolButton* _tmp22_ = NULL; + GtkToolButton* _tmp20_ = NULL; + GtkToolButton* _tmp21_ = NULL; + const gchar* _tmp22_ = NULL; GtkToolButton* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - GtkToolButton* _tmp25_ = NULL; - Page* _tmp26_ = NULL; + Page* _tmp24_ = NULL; + GtkToolbar* _tmp25_ = NULL; + GtkToolbar* _tmp26_ = NULL; GtkToolbar* _tmp27_ = NULL; GtkToolbar* _tmp28_ = NULL; GtkToolbar* _tmp29_ = NULL; GtkToolbar* _tmp30_ = NULL; - GtkToolbar* _tmp31_ = NULL; - GtkToolbar* _tmp32_ = NULL; - Page* _tmp33_ = NULL; - Page* _tmp37_ = NULL; - Page* _tmp38_ = NULL; - GtkToolbar* _tmp39_ = NULL; - GtkToolButton* _tmp40_ = NULL; - GtkOverlay* _tmp41_ = NULL; + Page* _tmp31_ = NULL; + Page* _tmp35_ = NULL; + Page* _tmp36_ = NULL; + GtkToolbar* _tmp37_ = NULL; + GtkToolButton* _tmp38_ = NULL; + GtkOverlay* _tmp39_ = NULL; + GtkOverlay* _tmp40_ = NULL; + Page* _tmp41_ = NULL; GtkOverlay* _tmp42_ = NULL; - Page* _tmp43_ = NULL; - GtkOverlay* _tmp44_ = NULL; - GtkToolbar* _tmp45_ = NULL; + GtkToolbar* _tmp43_ = NULL; + GdkRectangle _tmp44_ = {0}; + gint _tmp45_ = 0; GdkRectangle _tmp46_ = {0}; gint _tmp47_ = 0; - GdkRectangle _tmp48_ = {0}; - gint _tmp49_ = 0; - Page* _tmp50_ = NULL; + Page* _tmp48_ = NULL; #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_val_if_fail (IS_PAGE (page), NULL); #line 27 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -682,181 +680,175 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) { #line 29 "/home/jens/Source/shotwell/src/AppWindow.vala" page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), _tmp0_); #line 31 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp1_ = app_window_get_instance (); -#line 31 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp2_ = _tmp1_; -#line 31 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_map_get_type (), GActionMap), FULLSCREEN_WINDOW_entries, G_N_ELEMENTS (FULLSCREEN_WINDOW_entries), self); -#line 31 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp2_); + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), FULLSCREEN_WINDOW_entries, G_N_ELEMENTS (FULLSCREEN_WINDOW_entries), self); #line 33 "/home/jens/Source/shotwell/src/AppWindow.vala" application_set_accels_for_action ("win.LeaveFullscreen", accels, G_N_ELEMENTS (accels)); #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp3_ = app_window_get_instance (); + _tmp1_ = app_window_get_instance (); #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp5_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow)); + _tmp3_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow)); #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_set_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_); + gtk_window_set_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_); #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp2_); #line 38 "/home/jens/Source/shotwell/src/AppWindow.vala" - fullscreen_window_get_monitor_geometry (self, &_tmp6_); + fullscreen_window_get_monitor_geometry (self, &_tmp4_); #line 38 "/home/jens/Source/shotwell/src/AppWindow.vala" - monitor = _tmp6_; + monitor = _tmp4_; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp7_ = monitor; + _tmp5_ = monitor; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp8_ = _tmp7_.x; + _tmp6_ = _tmp5_.x; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp9_ = monitor; + _tmp7_ = monitor; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp10_ = _tmp9_.y; + _tmp8_ = _tmp7_.y; #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp8_, _tmp10_); + gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp6_, _tmp8_); #line 41 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0); #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp11_ = config_facade_get_instance (); + _tmp9_ = config_facade_get_instance (); #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp13_ = configuration_facade_get_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp11_ = configuration_facade_get_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->priv->is_toolbar_dismissal_enabled = _tmp13_; + self->priv->is_toolbar_dismissal_enabled = _tmp11_; #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp10_); #line 46 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp14_ = self->priv->pin_button; + _tmp12_ = self->priv->pin_button; #line 46 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_button_get_type (), GtkToolButton), "pin-toolbar"); + gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_button_get_type (), GtkToolButton), "pin-toolbar"); #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp15_ = self->priv->pin_button; + _tmp13_ = self->priv->pin_button; #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp16_ = _ ("Pin Toolbar"); + _tmp14_ = _ ("Pin Toolbar"); #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_button_get_type (), GtkToolButton), _tmp16_); + gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_tool_button_get_type (), GtkToolButton), _tmp14_); #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp17_ = self->priv->pin_button; + _tmp15_ = self->priv->pin_button; #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp18_ = _ ("Pin the toolbar open"); + _tmp16_ = _ ("Pin the toolbar open"); #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_item_get_type (), GtkToolItem), _tmp18_); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), _tmp16_); #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp19_ = self->priv->pin_button; + _tmp17_ = self->priv->pin_button; #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp20_ = self->priv->is_toolbar_dismissal_enabled; + _tmp18_ = self->priv->is_toolbar_dismissal_enabled; #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_toggle_tool_button_set_active (_tmp19_, !_tmp20_); + gtk_toggle_tool_button_set_active (_tmp17_, !_tmp18_); #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp21_ = self->priv->pin_button; + _tmp19_ = self->priv->pin_button; #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_button_get_type (), GtkToolButton), "clicked", (GCallback) _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_button_get_type (), GtkToolButton), "clicked", (GCallback) _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked, self, 0); #line 52 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp22_ = self->priv->close_button; + _tmp20_ = self->priv->close_button; #line 52 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_button_set_icon_name (_tmp22_, "view-restore"); + gtk_tool_button_set_icon_name (_tmp20_, "view-restore"); #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp23_ = self->priv->close_button; + _tmp21_ = self->priv->close_button; #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp24_ = _ ("Leave fullscreen"); + _tmp22_ = _ ("Leave fullscreen"); #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_tool_item_get_type (), GtkToolItem), _tmp24_); + gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), _tmp22_); #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp25_ = self->priv->close_button; + _tmp23_ = self->priv->close_button; #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen"); #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp26_ = page; + _tmp24_ = page; #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp27_ = page_get_toolbar (_tmp26_); + _tmp25_ = page_get_toolbar (_tmp24_); #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (self->priv->toolbar); #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala" - self->priv->toolbar = _tmp27_; + self->priv->toolbar = _tmp25_; #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp28_ = self->priv->toolbar; + _tmp26_ = self->priv->toolbar; #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_toolbar_set_show_arrow (_tmp28_, FALSE); + gtk_toolbar_set_show_arrow (_tmp26_, FALSE); #line 58 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp29_ = self->priv->toolbar; + _tmp27_ = self->priv->toolbar; #line 58 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END); #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp30_ = self->priv->toolbar; + _tmp28_ = self->priv->toolbar; #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp31_ = self->priv->toolbar; + _tmp29_ = self->priv->toolbar; #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL); + g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL); #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp32_ = self->priv->toolbar; + _tmp30_ = self->priv->toolbar; #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY); + gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY); #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp33_ = page; + _tmp31_ = page; #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, TYPE_SLIDESHOW_PAGE)) { -#line 775 "AppWindow.c" - Page* _tmp34_ = NULL; + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, TYPE_SLIDESHOW_PAGE)) { +#line 767 "AppWindow.c" + Page* _tmp32_ = NULL; #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp34_ = page; + _tmp32_ = page; #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0); -#line 781 "AppWindow.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0); +#line 773 "AppWindow.c" } else { - GtkToolbar* _tmp35_ = NULL; - GtkToggleToolButton* _tmp36_ = NULL; + GtkToolbar* _tmp33_ = NULL; + GtkToggleToolButton* _tmp34_ = NULL; #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp35_ = self->priv->toolbar; + _tmp33_ = self->priv->toolbar; #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp36_ = self->priv->pin_button; + _tmp34_ = self->priv->pin_button; #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1); -#line 791 "AppWindow.c" + gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1); +#line 783 "AppWindow.c" } #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp37_ = page; + _tmp35_ = page; #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_set_cursor_hide_time (_tmp37_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000); + page_set_cursor_hide_time (_tmp35_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000); #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp38_ = page; + _tmp36_ = page; #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala" - page_start_cursor_hiding (_tmp38_); + page_start_cursor_hiding (_tmp36_); #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp39_ = self->priv->toolbar; + _tmp37_ = self->priv->toolbar; #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp40_ = self->priv->close_button; + _tmp38_ = self->priv->close_button; #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_toolbar_insert (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1); + gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1); #line 76 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp41_ = self->priv->overlay; + _tmp39_ = self->priv->overlay; #line 76 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp42_ = self->priv->overlay; + _tmp40_ = self->priv->overlay; #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp43_ = page; + _tmp41_ = page; #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget)); #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp44_ = self->priv->overlay; + _tmp42_ = self->priv->overlay; #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp45_ = self->priv->toolbar; + _tmp43_ = self->priv->toolbar; #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_overlay_add_overlay (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget)); + gtk_overlay_add_overlay (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget)); #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp46_ = monitor; + _tmp44_ = monitor; #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp47_ = _tmp46_.width; + _tmp45_ = _tmp44_.width; #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp48_ = monitor; + _tmp46_ = monitor; #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp49_ = _tmp48_.height; + _tmp47_ = _tmp46_.height; #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp47_, _tmp49_); + gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp45_, _tmp47_); #line 86 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 87 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -866,21 +858,21 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) { #line 93 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_invoke_toolbar (self); #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala" - _tmp50_ = page; + _tmp48_ = page; #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget)); #line 99 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE); #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala" return self; -#line 849 "AppWindow.c" +#line 841 "AppWindow.c" } FullscreenWindow* fullscreen_window_new (Page* page) { #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala" return fullscreen_window_construct (TYPE_FULLSCREEN_WINDOW, page); -#line 856 "AppWindow.c" +#line 848 "AppWindow.c" } @@ -889,7 +881,7 @@ void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) { g_return_if_fail (IS_FULLSCREEN_WINDOW (self)); #line 103 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->is_toolbar_dismissal_enabled = FALSE; -#line 865 "AppWindow.c" +#line 857 "AppWindow.c" } @@ -904,7 +896,7 @@ void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) { _tmp1_ = gtk_toggle_tool_button_get_active (_tmp0_); #line 107 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->is_toolbar_dismissal_enabled = !_tmp1_; -#line 880 "AppWindow.c" +#line 872 "AppWindow.c" } @@ -941,7 +933,7 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR *result = monitor; #line 116 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 917 "AppWindow.c" +#line 909 "AppWindow.c" } @@ -966,7 +958,7 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven _tmp2_ = self->priv->switched_to; #line 122 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp2_) { -#line 942 "AppWindow.c" +#line 934 "AppWindow.c" Page* _tmp3_ = NULL; Page* _tmp4_ = NULL; #line 123 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -979,13 +971,13 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven _g_object_unref0 (_tmp4_); #line 124 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->switched_to = TRUE; -#line 955 "AppWindow.c" +#line 947 "AppWindow.c" } #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala" result = _result_; #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 961 "AppWindow.c" +#line 953 "AppWindow.c" } @@ -1019,11 +1011,11 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 135 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 995 "AppWindow.c" +#line 987 "AppWindow.c" } #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) { -#line 999 "AppWindow.c" +#line 991 "AppWindow.c" GdkEventKey* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1032,11 +1024,11 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven _tmp5_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp4_); #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp3_ = _tmp5_; -#line 1008 "AppWindow.c" +#line 1000 "AppWindow.c" } else { #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp3_ = FALSE; -#line 1012 "AppWindow.c" +#line 1004 "AppWindow.c" } #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp3_) { @@ -1044,7 +1036,7 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven result = TRUE; #line 140 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1020 "AppWindow.c" +#line 1012 "AppWindow.c" } #line 143 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp6_ = app_window_get_instance (); @@ -1062,7 +1054,7 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven result = _tmp10_; #line 143 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1038 "AppWindow.c" +#line 1030 "AppWindow.c" } @@ -1094,7 +1086,7 @@ static void fullscreen_window_on_close (FullscreenWindow* self) { app_window_end_fullscreen (_tmp4_); #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp4_); -#line 1070 "AppWindow.c" +#line 1062 "AppWindow.c" } @@ -1103,7 +1095,7 @@ void fullscreen_window_close (FullscreenWindow* self) { g_return_if_fail (IS_FULLSCREEN_WINDOW (self)); #line 154 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_on_close (self); -#line 1079 "AppWindow.c" +#line 1071 "AppWindow.c" } @@ -1124,7 +1116,7 @@ static void fullscreen_window_real_destroy (GtkWidget* base) { _tmp1_ = page; #line 161 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 1100 "AppWindow.c" +#line 1092 "AppWindow.c" Page* _tmp2_ = NULL; Page* _tmp3_ = NULL; #line 162 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1135,13 +1127,13 @@ static void fullscreen_window_real_destroy (GtkWidget* base) { _tmp3_ = page; #line 163 "/home/jens/Source/shotwell/src/AppWindow.vala" page_switching_from (_tmp3_); -#line 1111 "AppWindow.c" +#line 1103 "AppWindow.c" } #line 166 "/home/jens/Source/shotwell/src/AppWindow.vala" GTK_WIDGET_CLASS (fullscreen_window_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget)); #line 157 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (page); -#line 1117 "AppWindow.c" +#line 1109 "AppWindow.c" } @@ -1168,7 +1160,7 @@ static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAn result = TRUE; #line 173 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1144 "AppWindow.c" +#line 1136 "AppWindow.c" } @@ -1177,7 +1169,7 @@ static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpo result = fullscreen_window_on_check_toolbar_invocation ((FullscreenWindow*) self); #line 182 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1153 "AppWindow.c" +#line 1145 "AppWindow.c" } @@ -1194,24 +1186,24 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk _tmp0_ = self->priv->is_toolbar_shown; #line 177 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp0_) { -#line 1170 "AppWindow.c" +#line 1162 "AppWindow.c" gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = self->priv->waiting_for_invoke; #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp2_) { -#line 1177 "AppWindow.c" +#line 1169 "AppWindow.c" gboolean _tmp3_ = FALSE; #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp3_ = fullscreen_window_is_pointer_in_toolbar (self); #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = _tmp3_; -#line 1183 "AppWindow.c" +#line 1175 "AppWindow.c" } else { #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = FALSE; -#line 1187 "AppWindow.c" +#line 1179 "AppWindow.c" } #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_) { @@ -1219,12 +1211,12 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC, _fullscreen_window_on_check_toolbar_invocation_gsource_func, g_object_ref (self), g_object_unref); #line 183 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->waiting_for_invoke = TRUE; -#line 1195 "AppWindow.c" +#line 1187 "AppWindow.c" } } #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) { -#line 1200 "AppWindow.c" +#line 1192 "AppWindow.c" GdkEventMotion* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1233,24 +1225,24 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk _tmp6_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_); #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = _tmp6_; -#line 1209 "AppWindow.c" +#line 1201 "AppWindow.c" } else { #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = FALSE; -#line 1213 "AppWindow.c" +#line 1205 "AppWindow.c" } #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala" result = _tmp4_; #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1219 "AppWindow.c" +#line 1211 "AppWindow.c" } static gpointer _g_object_ref0 (gpointer self) { #line 191 "/home/jens/Source/shotwell/src/AppWindow.vala" return self ? g_object_ref (self) : NULL; -#line 1226 "AppWindow.c" +#line 1218 "AppWindow.c" } @@ -1293,7 +1285,7 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self) _g_object_unref0 (devmgr); #line 195 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1269 "AppWindow.c" +#line 1261 "AppWindow.c" } #line 199 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = devmgr; @@ -1321,7 +1313,7 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self) _g_object_unref0 (devmgr); #line 204 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1297 "AppWindow.c" +#line 1289 "AppWindow.c" } @@ -1341,7 +1333,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* result = FALSE; #line 211 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1317 "AppWindow.c" +#line 1309 "AppWindow.c" } #line 213 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = fullscreen_window_is_pointer_in_toolbar (self); @@ -1351,7 +1343,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* result = FALSE; #line 214 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1327 "AppWindow.c" +#line 1319 "AppWindow.c" } #line 216 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_invoke_toolbar (self); @@ -1359,7 +1351,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* result = FALSE; #line 218 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1335 "AppWindow.c" +#line 1327 "AppWindow.c" } @@ -1368,7 +1360,7 @@ static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpoi result = fullscreen_window_on_check_toolbar_dismissal ((FullscreenWindow*) self); #line 226 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1344 "AppWindow.c" +#line 1336 "AppWindow.c" } @@ -1384,7 +1376,7 @@ static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) { self->priv->is_toolbar_shown = TRUE; #line 226 "/home/jens/Source/shotwell/src/AppWindow.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_CHECK_DISMISSAL_MSEC, _fullscreen_window_on_check_toolbar_dismissal_gsource_func, g_object_ref (self), g_object_unref); -#line 1360 "AppWindow.c" +#line 1352 "AppWindow.c" } @@ -1410,7 +1402,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = FALSE; #line 231 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1386 "AppWindow.c" +#line 1378 "AppWindow.c" } #line 234 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->priv->is_toolbar_dismissal_enabled; @@ -1420,7 +1412,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = TRUE; #line 235 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1396 "AppWindow.c" +#line 1388 "AppWindow.c" } #line 238 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = fullscreen_window_is_pointer_in_toolbar (self); @@ -1432,13 +1424,13 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = TRUE; #line 241 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1408 "AppWindow.c" +#line 1400 "AppWindow.c" } #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp3_ = self->priv->left_toolbar_time; #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp3_ == ((time_t) 0)) { -#line 1414 "AppWindow.c" +#line 1406 "AppWindow.c" time_t _tmp4_ = 0; #line 246 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = time (NULL); @@ -1448,7 +1440,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = TRUE; #line 248 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1424 "AppWindow.c" +#line 1416 "AppWindow.c" } #line 252 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = time (NULL); @@ -1470,7 +1462,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = TRUE; #line 256 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1446 "AppWindow.c" +#line 1438 "AppWindow.c" } #line 258 "/home/jens/Source/shotwell/src/AppWindow.vala" fullscreen_window_hide_toolbar (self); @@ -1478,7 +1470,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* result = FALSE; #line 260 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1454 "AppWindow.c" +#line 1446 "AppWindow.c" } @@ -1492,7 +1484,7 @@ static void fullscreen_window_hide_toolbar (FullscreenWindow* self) { gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); #line 265 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->is_toolbar_shown = FALSE; -#line 1468 "AppWindow.c" +#line 1460 "AppWindow.c" } @@ -1513,7 +1505,7 @@ static void fullscreen_window_class_init (FullscreenWindowClass * klass) { ((GtkWidgetClass *) klass)->motion_notify_event = fullscreen_window_real_motion_notify_event; #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (klass)->finalize = fullscreen_window_finalize; -#line 1489 "AppWindow.c" +#line 1481 "AppWindow.c" } @@ -1551,7 +1543,7 @@ static void fullscreen_window_instance_init (FullscreenWindow * self) { self->priv->left_toolbar_time = (time_t) 0; #line 19 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->switched_to = FALSE; -#line 1527 "AppWindow.c" +#line 1519 "AppWindow.c" } @@ -1569,7 +1561,7 @@ static void fullscreen_window_finalize (GObject* obj) { _g_object_unref0 (self->priv->pin_button); #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (fullscreen_window_parent_class)->finalize (obj); -#line 1545 "AppWindow.c" +#line 1537 "AppWindow.c" } @@ -1590,7 +1582,7 @@ static void page_window_real_switched_pages (PageWindow* self, Page* old_page, P g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page)); #line 280 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); -#line 1566 "AppWindow.c" +#line 1558 "AppWindow.c" } @@ -1599,7 +1591,7 @@ void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_pag g_return_if_fail (IS_PAGE_WINDOW (self)); #line 280 "/home/jens/Source/shotwell/src/AppWindow.vala" PAGE_WINDOW_GET_CLASS (self)->switched_pages (self, old_page, new_page); -#line 1575 "AppWindow.c" +#line 1567 "AppWindow.c" } @@ -1629,7 +1621,7 @@ PageWindow* page_window_construct (GType object_type) { gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE); #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala" return self; -#line 1605 "AppWindow.c" +#line 1597 "AppWindow.c" } @@ -1647,7 +1639,7 @@ Page* page_window_get_current_page (PageWindow* self) { result = _tmp1_; #line 293 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1623 "AppWindow.c" +#line 1615 "AppWindow.c" } @@ -1666,13 +1658,13 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) { _tmp0_ = self->priv->current_page; #line 297 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_ != NULL) { -#line 1642 "AppWindow.c" +#line 1634 "AppWindow.c" Page* _tmp1_ = NULL; #line 298 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->priv->current_page; #line 298 "/home/jens/Source/shotwell/src/AppWindow.vala" page_clear_container (_tmp1_); -#line 1648 "AppWindow.c" +#line 1640 "AppWindow.c" } #line 300 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = self->priv->current_page; @@ -1698,7 +1690,7 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) { page_window_switched_pages (self, old_page, _tmp7_); #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (old_page); -#line 1674 "AppWindow.c" +#line 1666 "AppWindow.c" } @@ -1707,7 +1699,7 @@ void page_window_set_current_page (PageWindow* self, Page* page) { g_return_if_fail (IS_PAGE_WINDOW (self)); #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala" PAGE_WINDOW_GET_CLASS (self)->set_current_page (self, page); -#line 1683 "AppWindow.c" +#line 1675 "AppWindow.c" } @@ -1720,13 +1712,13 @@ static void page_window_real_clear_current_page (PageWindow* self) { _tmp0_ = self->priv->current_page; #line 308 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_ != NULL) { -#line 1696 "AppWindow.c" +#line 1688 "AppWindow.c" Page* _tmp1_ = NULL; #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->priv->current_page; #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala" page_clear_container (_tmp1_); -#line 1702 "AppWindow.c" +#line 1694 "AppWindow.c" } #line 311 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = self->priv->current_page; @@ -1742,7 +1734,7 @@ static void page_window_real_clear_current_page (PageWindow* self) { page_window_switched_pages (self, old_page, NULL); #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (old_page); -#line 1718 "AppWindow.c" +#line 1710 "AppWindow.c" } @@ -1751,7 +1743,7 @@ void page_window_clear_current_page (PageWindow* self) { g_return_if_fail (IS_PAGE_WINDOW (self)); #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala" PAGE_WINDOW_GET_CLASS (self)->clear_current_page (self); -#line 1727 "AppWindow.c" +#line 1719 "AppWindow.c" } @@ -1771,7 +1763,7 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* _tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) { -#line 1747 "AppWindow.c" +#line 1739 "AppWindow.c" GtkWidget* _tmp2_ = NULL; GdkEventKey* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -1783,11 +1775,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* g_signal_emit_by_name (_tmp2_, "key-press-event", _tmp3_, &_tmp4_); #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp4_; -#line 1759 "AppWindow.c" +#line 1751 "AppWindow.c" } else { #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = FALSE; -#line 1763 "AppWindow.c" +#line 1755 "AppWindow.c" } #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_) { @@ -1795,13 +1787,13 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* result = TRUE; #line 319 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1771 "AppWindow.c" +#line 1763 "AppWindow.c" } #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp6_ = self->priv->current_page; #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp6_ != NULL) { -#line 1777 "AppWindow.c" +#line 1769 "AppWindow.c" Page* _tmp7_ = NULL; GdkEventKey* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; @@ -1813,11 +1805,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* _tmp9_ = page_notify_app_key_pressed (_tmp7_, _tmp8_); #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = _tmp9_; -#line 1789 "AppWindow.c" +#line 1781 "AppWindow.c" } else { #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = FALSE; -#line 1793 "AppWindow.c" +#line 1785 "AppWindow.c" } #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp5_) { @@ -1825,11 +1817,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* result = TRUE; #line 322 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1801 "AppWindow.c" +#line 1793 "AppWindow.c" } #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) { -#line 1805 "AppWindow.c" +#line 1797 "AppWindow.c" GdkEventKey* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1838,17 +1830,17 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey* _tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_); #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = _tmp12_; -#line 1814 "AppWindow.c" +#line 1806 "AppWindow.c" } else { #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = FALSE; -#line 1818 "AppWindow.c" +#line 1810 "AppWindow.c" } #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala" result = _tmp10_; #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1824 "AppWindow.c" +#line 1816 "AppWindow.c" } @@ -1868,7 +1860,7 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey _tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) { -#line 1844 "AppWindow.c" +#line 1836 "AppWindow.c" GtkWidget* _tmp2_ = NULL; GdkEventKey* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -1880,11 +1872,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey g_signal_emit_by_name (_tmp2_, "key-release-event", _tmp3_, &_tmp4_); #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp4_; -#line 1856 "AppWindow.c" +#line 1848 "AppWindow.c" } else { #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = FALSE; -#line 1860 "AppWindow.c" +#line 1852 "AppWindow.c" } #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_) { @@ -1892,13 +1884,13 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey result = TRUE; #line 329 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1868 "AppWindow.c" +#line 1860 "AppWindow.c" } #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp6_ = self->priv->current_page; #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp6_ != NULL) { -#line 1874 "AppWindow.c" +#line 1866 "AppWindow.c" Page* _tmp7_ = NULL; GdkEventKey* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; @@ -1910,11 +1902,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey _tmp9_ = page_notify_app_key_released (_tmp7_, _tmp8_); #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = _tmp9_; -#line 1886 "AppWindow.c" +#line 1878 "AppWindow.c" } else { #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = FALSE; -#line 1890 "AppWindow.c" +#line 1882 "AppWindow.c" } #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp5_) { @@ -1922,11 +1914,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey result = TRUE; #line 332 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1898 "AppWindow.c" +#line 1890 "AppWindow.c" } #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) { -#line 1902 "AppWindow.c" +#line 1894 "AppWindow.c" GdkEventKey* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -1935,17 +1927,17 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey _tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_); #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = _tmp12_; -#line 1911 "AppWindow.c" +#line 1903 "AppWindow.c" } else { #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = FALSE; -#line 1915 "AppWindow.c" +#line 1907 "AppWindow.c" } #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala" result = _tmp10_; #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1921 "AppWindow.c" +#line 1913 "AppWindow.c" } @@ -1963,7 +1955,7 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus* _tmp1_ = self->priv->current_page; #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 1939 "AppWindow.c" +#line 1931 "AppWindow.c" Page* _tmp2_ = NULL; GdkEventFocus* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -1975,11 +1967,11 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus* _tmp4_ = page_notify_app_focus_in (_tmp2_, _tmp3_); #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp4_; -#line 1951 "AppWindow.c" +#line 1943 "AppWindow.c" } else { #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = FALSE; -#line 1955 "AppWindow.c" +#line 1947 "AppWindow.c" } #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_) { @@ -1987,11 +1979,11 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus* result = TRUE; #line 339 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1963 "AppWindow.c" +#line 1955 "AppWindow.c" } #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) { -#line 1967 "AppWindow.c" +#line 1959 "AppWindow.c" GdkEventFocus* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2000,17 +1992,17 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus* _tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_); #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = _tmp7_; -#line 1976 "AppWindow.c" +#line 1968 "AppWindow.c" } else { #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = FALSE; -#line 1980 "AppWindow.c" +#line 1972 "AppWindow.c" } #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" result = _tmp5_; #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 1986 "AppWindow.c" +#line 1978 "AppWindow.c" } @@ -2028,7 +2020,7 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus _tmp1_ = self->priv->current_page; #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 2004 "AppWindow.c" +#line 1996 "AppWindow.c" Page* _tmp2_ = NULL; GdkEventFocus* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -2040,11 +2032,11 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus _tmp4_ = page_notify_app_focus_out (_tmp2_, _tmp3_); #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp4_; -#line 2016 "AppWindow.c" +#line 2008 "AppWindow.c" } else { #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = FALSE; -#line 2020 "AppWindow.c" +#line 2012 "AppWindow.c" } #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_) { @@ -2052,11 +2044,11 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus result = TRUE; #line 346 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2028 "AppWindow.c" +#line 2020 "AppWindow.c" } #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) { -#line 2032 "AppWindow.c" +#line 2024 "AppWindow.c" GdkEventFocus* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2065,17 +2057,17 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus _tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_); #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = _tmp7_; -#line 2041 "AppWindow.c" +#line 2033 "AppWindow.c" } else { #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = FALSE; -#line 2045 "AppWindow.c" +#line 2037 "AppWindow.c" } #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" result = _tmp5_; #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2051 "AppWindow.c" +#line 2043 "AppWindow.c" } @@ -2092,7 +2084,7 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi _tmp0_ = self->priv->current_page; #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_ != NULL) { -#line 2068 "AppWindow.c" +#line 2060 "AppWindow.c" Page* _tmp1_ = NULL; GdkEventConfigure* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; @@ -2108,12 +2100,12 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi result = TRUE; #line 354 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2084 "AppWindow.c" +#line 2076 "AppWindow.c" } } #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala" if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) { -#line 2089 "AppWindow.c" +#line 2081 "AppWindow.c" GdkEventConfigure* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2122,17 +2114,17 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi _tmp6_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp5_); #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = _tmp6_; -#line 2098 "AppWindow.c" +#line 2090 "AppWindow.c" } else { #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = FALSE; -#line 2102 "AppWindow.c" +#line 2094 "AppWindow.c" } #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala" result = _tmp4_; #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2108 "AppWindow.c" +#line 2100 "AppWindow.c" } @@ -2157,7 +2149,7 @@ void page_window_set_busy_cursor (PageWindow* self) { if (_tmp0_ > 0) { #line 362 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 2133 "AppWindow.c" +#line 2125 "AppWindow.c" } #line 364 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); @@ -2185,7 +2177,7 @@ void page_window_set_busy_cursor (PageWindow* self) { _g_object_unref0 (cursor); #line 360 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (display); -#line 2161 "AppWindow.c" +#line 2153 "AppWindow.c" } @@ -2210,7 +2202,7 @@ void page_window_set_normal_cursor (PageWindow* self) { self->priv->busy_counter = 0; #line 373 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 2186 "AppWindow.c" +#line 2178 "AppWindow.c" } else { gint _tmp1_ = 0; gint _tmp2_ = 0; @@ -2224,7 +2216,7 @@ void page_window_set_normal_cursor (PageWindow* self) { if (_tmp2_ > 0) { #line 375 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 2200 "AppWindow.c" +#line 2192 "AppWindow.c" } } #line 378 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2253,7 +2245,7 @@ void page_window_set_normal_cursor (PageWindow* self) { _g_object_unref0 (cursor); #line 370 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (display); -#line 2229 "AppWindow.c" +#line 2221 "AppWindow.c" } @@ -2280,7 +2272,7 @@ static void page_window_class_init (PageWindowClass * klass) { ((GtkWidgetClass *) klass)->configure_event = page_window_real_configure_event; #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (klass)->finalize = page_window_finalize; -#line 2256 "AppWindow.c" +#line 2248 "AppWindow.c" } @@ -2291,7 +2283,7 @@ static void page_window_instance_init (PageWindow * self) { self->priv->current_page = NULL; #line 278 "/home/jens/Source/shotwell/src/AppWindow.vala" self->priv->busy_counter = 0; -#line 2267 "AppWindow.c" +#line 2259 "AppWindow.c" } @@ -2303,7 +2295,7 @@ static void page_window_finalize (GObject* obj) { _g_object_unref0 (self->priv->current_page); #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (page_window_parent_class)->finalize (obj); -#line 2279 "AppWindow.c" +#line 2271 "AppWindow.c" } @@ -2322,84 +2314,84 @@ GType page_window_get_type (void) { static void _app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_about ((AppWindow*) self); -#line 2298 "AppWindow.c" +#line 2290 "AppWindow.c" } static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_quit ((AppWindow*) self); -#line 2305 "AppWindow.c" +#line 2297 "AppWindow.c" } static void _app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_fullscreen ((AppWindow*) self); -#line 2312 "AppWindow.c" +#line 2304 "AppWindow.c" } static void _app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_help_contents ((AppWindow*) self); -#line 2319 "AppWindow.c" +#line 2311 "AppWindow.c" } static void _app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_help_faq ((AppWindow*) self); -#line 2326 "AppWindow.c" +#line 2318 "AppWindow.c" } static void _app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_help_report_problem ((AppWindow*) self); -#line 2333 "AppWindow.c" +#line 2325 "AppWindow.c" } static void _app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_undo ((AppWindow*) self); -#line 2340 "AppWindow.c" +#line 2332 "AppWindow.c" } static void _app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_redo ((AppWindow*) self); -#line 2347 "AppWindow.c" +#line 2339 "AppWindow.c" } static void _app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_jump_to_file ((AppWindow*) self); -#line 2354 "AppWindow.c" +#line 2346 "AppWindow.c" } static void _app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_select_all ((AppWindow*) self); -#line 2361 "AppWindow.c" +#line 2353 "AppWindow.c" } static void _app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_select_none ((AppWindow*) self); -#line 2368 "AppWindow.c" +#line 2360 "AppWindow.c" } static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self) { #line 430 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_command_manager_altered ((AppWindow*) self); -#line 2375 "AppWindow.c" +#line 2367 "AppWindow.c" } @@ -2436,7 +2428,7 @@ AppWindow* app_window_construct (GType object_type) { gtk_window_set_default_icon_name ("shotwell"); #line 416 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_LIBRARY_WINDOW)) { -#line 2412 "AppWindow.c" +#line 2404 "AppWindow.c" ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -2453,7 +2445,7 @@ AppWindow* app_window_construct (GType object_type) { self->dimensions = _tmp5_; #line 417 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp3_); -#line 2429 "AppWindow.c" +#line 2421 "AppWindow.c" } else { ConfigFacade* _tmp6_ = NULL; ConfigFacade* _tmp7_ = NULL; @@ -2473,7 +2465,7 @@ AppWindow* app_window_construct (GType object_type) { self->dimensions = _tmp9_; #line 420 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp7_); -#line 2449 "AppWindow.c" +#line 2441 "AppWindow.c" } #line 423 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = self->dimensions; @@ -2491,7 +2483,7 @@ AppWindow* app_window_construct (GType object_type) { if (_tmp14_) { #line 426 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_maximize (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); -#line 2467 "AppWindow.c" +#line 2459 "AppWindow.c" } #line 428 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp15_ = app_window_command_manager; @@ -2513,24 +2505,24 @@ AppWindow* app_window_construct (GType object_type) { _tmp18_ = gtk_css_provider_new (); #line 440 "/home/jens/Source/shotwell/src/AppWindow.vala" provider = _tmp18_; -#line 2489 "AppWindow.c" +#line 2481 "AppWindow.c" { GdkScreen* _tmp19_ = NULL; #line 442 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_css_provider_load_from_data (provider, RESOURCES_CUSTOM_CSS, (gssize) -1, &_inner_error_); #line 442 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2496 "AppWindow.c" - goto __catch223_g_error; +#line 2488 "AppWindow.c" + goto __catch225_g_error; } #line 443 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp19_ = gdk_screen_get_default (); #line 443 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_style_context_add_provider_for_screen (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -#line 2503 "AppWindow.c" +#line 2495 "AppWindow.c" } - goto __finally223; - __catch223_g_error: + goto __finally225; + __catch225_g_error: { GError* err = NULL; GError* _tmp20_ = NULL; @@ -2547,9 +2539,9 @@ AppWindow* app_window_construct (GType object_type) { g_debug ("AppWindow.vala:445: Unable to load custom CSS: %s", _tmp21_); #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 2523 "AppWindow.c" +#line 2515 "AppWindow.c" } - __finally223: + __finally225: #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2560,13 +2552,13 @@ AppWindow* app_window_construct (GType object_type) { g_clear_error (&_inner_error_); #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala" return NULL; -#line 2536 "AppWindow.c" +#line 2528 "AppWindow.c" } #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (provider); #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala" return self; -#line 2542 "AppWindow.c" +#line 2534 "AppWindow.c" } @@ -2575,7 +2567,7 @@ static void app_window_real_on_fullscreen (AppWindow* self) { g_critical ("Type `%s' does not implement abstract method `app_window_on_fullscreen'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 463 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 2551 "AppWindow.c" +#line 2543 "AppWindow.c" } @@ -2584,7 +2576,7 @@ void app_window_on_fullscreen (AppWindow* self) { g_return_if_fail (IS_APP_WINDOW (self)); #line 463 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->on_fullscreen (self); -#line 2560 "AppWindow.c" +#line 2552 "AppWindow.c" } @@ -2597,7 +2589,7 @@ gboolean app_window_has_instance (void) { result = _tmp0_ != NULL; #line 466 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2573 "AppWindow.c" +#line 2565 "AppWindow.c" } @@ -2613,7 +2605,7 @@ AppWindow* app_window_get_instance (void) { result = _tmp1_; #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2589 "AppWindow.c" +#line 2581 "AppWindow.c" } @@ -2629,7 +2621,7 @@ FullscreenWindow* app_window_get_fullscreen (void) { result = _tmp1_; #line 474 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2605 "AppWindow.c" +#line 2597 "AppWindow.c" } @@ -2645,7 +2637,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) _tmp0_ = gtk_builder_new (); #line 478 "/home/jens/Source/shotwell/src/AppWindow.vala" builder = _tmp0_; -#line 2621 "AppWindow.c" +#line 2613 "AppWindow.c" { GFile* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -2686,12 +2678,12 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) _g_object_unref0 (_tmp2_); #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2662 "AppWindow.c" - goto __catch224_g_error; +#line 2654 "AppWindow.c" + goto __catch226_g_error; } } - goto __finally224; - __catch224_g_error: + goto __finally226; + __catch226_g_error: { GError* _error_ = NULL; GError* _tmp10_ = NULL; @@ -2708,9 +2700,9 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) g_warning ("AppWindow.vala:483: Unable to create Gtk.Builder: %s\n", _tmp11_); #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (_error_); -#line 2684 "AppWindow.c" +#line 2676 "AppWindow.c" } - __finally224: + __finally226: #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2721,7 +2713,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) g_clear_error (&_inner_error_); #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala" return NULL; -#line 2697 "AppWindow.c" +#line 2689 "AppWindow.c" } #line 486 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp12_ = user; @@ -2731,7 +2723,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) result = builder; #line 488 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2707 "AppWindow.c" +#line 2699 "AppWindow.c" } @@ -2748,7 +2740,7 @@ void app_window_error_message (const gchar* message, GtkWindow* parent) { _tmp1_ = parent; #line 492 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE); -#line 2724 "AppWindow.c" +#line 2716 "AppWindow.c" } @@ -2778,7 +2770,7 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa _tmp1_ = parent; #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 2754 "AppWindow.c" +#line 2746 "AppWindow.c" GtkWindow* _tmp2_ = NULL; GtkWindow* _tmp3_ = NULL; #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2789,7 +2781,7 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa _g_object_unref0 (_tmp0_); #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp3_; -#line 2765 "AppWindow.c" +#line 2757 "AppWindow.c" } else { AppWindow* _tmp4_ = NULL; #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2798,7 +2790,7 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa _g_object_unref0 (_tmp0_); #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 2774 "AppWindow.c" +#line 2766 "AppWindow.c" } #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = title; @@ -2844,7 +2836,7 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa _g_object_unref0 (dialog); #line 495 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); -#line 2820 "AppWindow.c" +#line 2812 "AppWindow.c" } @@ -2879,7 +2871,7 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n _tmp1_ = parent; #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 2855 "AppWindow.c" +#line 2847 "AppWindow.c" GtkWindow* _tmp2_ = NULL; GtkWindow* _tmp3_ = NULL; #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2890,7 +2882,7 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n _g_object_unref0 (_tmp0_); #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp3_; -#line 2866 "AppWindow.c" +#line 2858 "AppWindow.c" } else { AppWindow* _tmp4_ = NULL; #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -2899,7 +2891,7 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n _g_object_unref0 (_tmp0_); #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 2875 "AppWindow.c" +#line 2867 "AppWindow.c" } #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = title; @@ -2953,7 +2945,7 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n _g_object_unref0 (_tmp0_); #line 523 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 2929 "AppWindow.c" +#line 2921 "AppWindow.c" } @@ -2989,7 +2981,7 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, _tmp1_ = parent; #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 2965 "AppWindow.c" +#line 2957 "AppWindow.c" GtkWindow* _tmp2_ = NULL; GtkWindow* _tmp3_ = NULL; #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3000,7 +2992,7 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, _g_object_unref0 (_tmp0_); #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp3_; -#line 2976 "AppWindow.c" +#line 2968 "AppWindow.c" } else { AppWindow* _tmp4_ = NULL; #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3009,7 +3001,7 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, _g_object_unref0 (_tmp0_); #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 2985 "AppWindow.c" +#line 2977 "AppWindow.c" } #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = title; @@ -3065,7 +3057,7 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, _g_object_unref0 (_tmp0_); #line 542 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 3041 "AppWindow.c" +#line 3033 "AppWindow.c" } @@ -3099,7 +3091,7 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g _tmp1_ = parent; #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 3075 "AppWindow.c" +#line 3067 "AppWindow.c" GtkWindow* _tmp2_ = NULL; GtkWindow* _tmp3_ = NULL; #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3110,7 +3102,7 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g _g_object_unref0 (_tmp0_); #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp3_; -#line 3086 "AppWindow.c" +#line 3078 "AppWindow.c" } else { AppWindow* _tmp4_ = NULL; #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3119,7 +3111,7 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g _g_object_unref0 (_tmp0_); #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 3095 "AppWindow.c" +#line 3087 "AppWindow.c" } #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = message; @@ -3143,17 +3135,17 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g _tmp11_ = title; #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp11_ != NULL) { -#line 3119 "AppWindow.c" +#line 3111 "AppWindow.c" const gchar* _tmp12_ = NULL; #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp12_ = title; #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = _tmp12_; -#line 3125 "AppWindow.c" +#line 3117 "AppWindow.c" } else { #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = RESOURCES_APP_TITLE; -#line 3129 "AppWindow.c" +#line 3121 "AppWindow.c" } #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp13_ = dialog; @@ -3185,7 +3177,7 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g _g_object_unref0 (_tmp0_); #line 560 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 3161 "AppWindow.c" +#line 3153 "AppWindow.c" } @@ -3222,7 +3214,7 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa _tmp1_ = parent; #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 3198 "AppWindow.c" +#line 3190 "AppWindow.c" GtkWindow* _tmp2_ = NULL; GtkWindow* _tmp3_ = NULL; #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3233,7 +3225,7 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa _g_object_unref0 (_tmp0_); #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = _tmp3_; -#line 3209 "AppWindow.c" +#line 3201 "AppWindow.c" } else { AppWindow* _tmp4_ = NULL; #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3242,7 +3234,7 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa _g_object_unref0 (_tmp0_); #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow); -#line 3218 "AppWindow.c" +#line 3210 "AppWindow.c" } #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = message; @@ -3256,17 +3248,17 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa _tmp8_ = title; #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp8_ != NULL) { -#line 3232 "AppWindow.c" +#line 3224 "AppWindow.c" const gchar* _tmp9_ = NULL; #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp9_ = title; #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp7_ = _tmp9_; -#line 3238 "AppWindow.c" +#line 3230 "AppWindow.c" } else { #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp7_ = RESOURCES_APP_TITLE; -#line 3242 "AppWindow.c" +#line 3234 "AppWindow.c" } #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp10_ = dialog; @@ -3302,7 +3294,7 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa _g_object_unref0 (_tmp0_); #line 576 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 3278 "AppWindow.c" +#line 3270 "AppWindow.c" } @@ -3329,7 +3321,7 @@ void app_window_database_error (GError* err) { app_window_panic (_tmp4_); #line 580 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (_tmp4_); -#line 3302 "AppWindow.c" +#line 3294 "AppWindow.c" } @@ -3356,7 +3348,7 @@ void app_window_panic (const gchar* msg) { application_panic (_tmp3_); #line 588 "/home/jens/Source/shotwell/src/AppWindow.vala" _application_unref0 (_tmp3_); -#line 3329 "AppWindow.c" +#line 3321 "AppWindow.c" } @@ -3365,7 +3357,7 @@ static gchar* app_window_real_get_app_role (AppWindow* self) { g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 591 "/home/jens/Source/shotwell/src/AppWindow.vala" return NULL; -#line 3338 "AppWindow.c" +#line 3330 "AppWindow.c" } @@ -3374,7 +3366,7 @@ gchar* app_window_get_app_role (AppWindow* self) { g_return_val_if_fail (IS_APP_WINDOW (self), NULL); #line 591 "/home/jens/Source/shotwell/src/AppWindow.vala" return APP_WINDOW_GET_CLASS (self)->get_app_role (self); -#line 3347 "AppWindow.c" +#line 3339 "AppWindow.c" } @@ -3405,7 +3397,7 @@ void app_window_on_about (AppWindow* self) { _g_object_unref0 (_tmp4_); #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (_tmp1_); -#line 3378 "AppWindow.c" +#line 3370 "AppWindow.c" } @@ -3413,7 +3405,7 @@ static void app_window_on_help_contents (AppWindow* self) { GError * _inner_error_ = NULL; #line 608 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); -#line 3386 "AppWindow.c" +#line 3378 "AppWindow.c" { GdkScreen* _tmp0_ = NULL; #line 610 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3422,12 +3414,12 @@ static void app_window_on_help_contents (AppWindow* self) { resources_launch_help (_tmp0_, NULL, &_inner_error_); #line 610 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3395 "AppWindow.c" - goto __catch225_g_error; +#line 3387 "AppWindow.c" + goto __catch227_g_error; } } - goto __finally225; - __catch225_g_error: + goto __finally227; + __catch227_g_error: { GError* err = NULL; const gchar* _tmp1_ = NULL; @@ -3455,9 +3447,9 @@ static void app_window_on_help_contents (AppWindow* self) { _g_free0 (_tmp5_); #line 609 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 3428 "AppWindow.c" +#line 3420 "AppWindow.c" } - __finally225: + __finally227: #line 609 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 609 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3466,7 +3458,7 @@ static void app_window_on_help_contents (AppWindow* self) { g_clear_error (&_inner_error_); #line 609 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3439 "AppWindow.c" +#line 3431 "AppWindow.c" } } @@ -3475,18 +3467,18 @@ static void app_window_on_help_report_problem (AppWindow* self) { GError * _inner_error_ = NULL; #line 616 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); -#line 3448 "AppWindow.c" +#line 3440 "AppWindow.c" { #line 618 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_); #line 618 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3454 "AppWindow.c" - goto __catch226_g_error; +#line 3446 "AppWindow.c" + goto __catch228_g_error; } } - goto __finally226; - __catch226_g_error: + goto __finally228; + __catch228_g_error: { GError* err = NULL; const gchar* _tmp0_ = NULL; @@ -3514,9 +3506,9 @@ static void app_window_on_help_report_problem (AppWindow* self) { _g_free0 (_tmp4_); #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 3487 "AppWindow.c" +#line 3479 "AppWindow.c" } - __finally226: + __finally228: #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3525,7 +3517,7 @@ static void app_window_on_help_report_problem (AppWindow* self) { g_clear_error (&_inner_error_); #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3498 "AppWindow.c" +#line 3490 "AppWindow.c" } } @@ -3534,18 +3526,18 @@ static void app_window_on_help_faq (AppWindow* self) { GError * _inner_error_ = NULL; #line 624 "/home/jens/Source/shotwell/src/AppWindow.vala" g_return_if_fail (IS_APP_WINDOW (self)); -#line 3507 "AppWindow.c" +#line 3499 "AppWindow.c" { #line 626 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_); #line 626 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3513 "AppWindow.c" - goto __catch227_g_error; +#line 3505 "AppWindow.c" + goto __catch229_g_error; } } - goto __finally227; - __catch227_g_error: + goto __finally229; + __catch229_g_error: { GError* err = NULL; const gchar* _tmp0_ = NULL; @@ -3573,9 +3565,9 @@ static void app_window_on_help_faq (AppWindow* self) { _g_free0 (_tmp4_); #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 3546 "AppWindow.c" +#line 3538 "AppWindow.c" } - __finally227: + __finally229: #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3584,7 +3576,7 @@ static void app_window_on_help_faq (AppWindow* self) { g_clear_error (&_inner_error_); #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3557 "AppWindow.c" +#line 3549 "AppWindow.c" } } @@ -3600,7 +3592,7 @@ static void app_window_real_on_quit (AppWindow* self) { application_exit (_tmp1_); #line 633 "/home/jens/Source/shotwell/src/AppWindow.vala" _application_unref0 (_tmp1_); -#line 3573 "AppWindow.c" +#line 3565 "AppWindow.c" } @@ -3609,7 +3601,7 @@ void app_window_on_quit (AppWindow* self) { g_return_if_fail (IS_APP_WINDOW (self)); #line 632 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->on_quit (self); -#line 3582 "AppWindow.c" +#line 3574 "AppWindow.c" } @@ -3654,7 +3646,7 @@ void app_window_on_jump_to_file (AppWindow* self) { if (_tmp5_) { #line 638 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3627 "AppWindow.c" +#line 3619 "AppWindow.c" } #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); @@ -3676,7 +3668,7 @@ void app_window_on_jump_to_file (AppWindow* self) { if (_tmp13_ == NULL) { #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp12_); -#line 3649 "AppWindow.c" +#line 3641 "AppWindow.c" } #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp14_ = _tmp13_; @@ -3696,7 +3688,7 @@ void app_window_on_jump_to_file (AppWindow* self) { _g_object_unref0 (media); #line 643 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3669 "AppWindow.c" +#line 3661 "AppWindow.c" } { AppWindow* _tmp16_ = NULL; @@ -3722,12 +3714,12 @@ void app_window_on_jump_to_file (AppWindow* self) { _g_object_unref0 (_tmp17_); #line 646 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3695 "AppWindow.c" - goto __catch228_g_error; +#line 3687 "AppWindow.c" + goto __catch230_g_error; } } - goto __finally228; - __catch228_g_error: + goto __finally230; + __catch230_g_error: { GError* err = NULL; GError* _tmp21_ = NULL; @@ -3749,9 +3741,9 @@ void app_window_on_jump_to_file (AppWindow* self) { _g_free0 (_tmp23_); #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_error_free0 (err); -#line 3722 "AppWindow.c" +#line 3714 "AppWindow.c" } - __finally228: + __finally230: #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -3762,11 +3754,11 @@ void app_window_on_jump_to_file (AppWindow* self) { g_clear_error (&_inner_error_); #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3735 "AppWindow.c" +#line 3727 "AppWindow.c" } #line 636 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (media); -#line 3739 "AppWindow.c" +#line 3731 "AppWindow.c" } @@ -3776,20 +3768,20 @@ static void app_window_real_destroy (GtkWidget* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow); #line 653 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_quit (self); -#line 3749 "AppWindow.c" +#line 3741 "AppWindow.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 3762 "AppWindow.c" +#line 3754 "AppWindow.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -3802,100 +3794,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3793 "AppWindow.c" - goto __catch229_g_regex_error; +#line 3785 "AppWindow.c" + goto __catch231_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 3802 "AppWindow.c" +#line 3794 "AppWindow.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3818 "AppWindow.c" - goto __catch229_g_regex_error; +#line 3810 "AppWindow.c" + goto __catch231_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 3829 "AppWindow.c" +#line 3821 "AppWindow.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 3843 "AppWindow.c" +#line 3835 "AppWindow.c" } - goto __finally229; - __catch229_g_regex_error: + goto __finally231; + __catch231_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 3857 "AppWindow.c" +#line 3849 "AppWindow.c" } - __finally229: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" + __finally231: +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 3868 "AppWindow.c" +#line 3860 "AppWindow.c" } } @@ -3920,7 +3912,7 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) { _g_free0 (_tmp1_); #line 661 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp2_) { -#line 3893 "AppWindow.c" +#line 3885 "AppWindow.c" GFile* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -3952,7 +3944,7 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) { _g_free0 (tmp); #line 663 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3925 "AppWindow.c" +#line 3917 "AppWindow.c" } } else { GFile* _tmp8_ = NULL; @@ -3994,12 +3986,12 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) { _g_free0 (tmp); #line 666 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3967 "AppWindow.c" +#line 3959 "AppWindow.c" } } #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_free0 (tmp); -#line 3972 "AppWindow.c" +#line 3964 "AppWindow.c" } @@ -4026,7 +4018,7 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) { g_propagate_error (error, _inner_error_); #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 3999 "AppWindow.c" +#line 3991 "AppWindow.c" } } @@ -4034,7 +4026,7 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) { static void app_window_real_add_actions (AppWindow* self) { #line 675 "/home/jens/Source/shotwell/src/AppWindow.vala" g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), APP_WINDOW_common_actions, G_N_ELEMENTS (APP_WINDOW_common_actions), self); -#line 4007 "AppWindow.c" +#line 3999 "AppWindow.c" } @@ -4043,7 +4035,7 @@ void app_window_add_actions (AppWindow* self) { g_return_if_fail (IS_APP_WINDOW (self)); #line 674 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->add_actions (self); -#line 4016 "AppWindow.c" +#line 4008 "AppWindow.c" } @@ -4068,7 +4060,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) { _tmp0_ = app_window_fullscreen_window; #line 680 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp0_ != NULL) { -#line 4041 "AppWindow.c" +#line 4033 "AppWindow.c" FullscreenWindow* _tmp1_ = NULL; #line 681 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = app_window_fullscreen_window; @@ -4076,7 +4068,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) { gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow)); #line 683 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 4049 "AppWindow.c" +#line 4041 "AppWindow.c" } #line 686 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_); @@ -4104,7 +4096,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) { _g_object_unref0 (_tmp7_); #line 691 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp8_) { -#line 4077 "AppWindow.c" +#line 4069 "AppWindow.c" Page* _tmp9_ = NULL; Page* _tmp10_ = NULL; FullscreenWindow* _tmp11_ = NULL; @@ -4118,7 +4110,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) { page_switching_to_fullscreen (_tmp10_, _tmp11_); #line 692 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp10_); -#line 4091 "AppWindow.c" +#line 4083 "AppWindow.c" } #line 694 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp12_ = fsw; @@ -4134,7 +4126,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) { gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow)); #line 678 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (fsw); -#line 4107 "AppWindow.c" +#line 4099 "AppWindow.c" } @@ -4155,7 +4147,7 @@ void app_window_end_fullscreen (AppWindow* self) { if (_tmp0_ == NULL) { #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 4128 "AppWindow.c" +#line 4120 "AppWindow.c" } #line 702 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = self->pos_x; @@ -4175,7 +4167,7 @@ void app_window_end_fullscreen (AppWindow* self) { _g_object_unref0 (_tmp4_); #line 706 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp5_) { -#line 4148 "AppWindow.c" +#line 4140 "AppWindow.c" Page* _tmp6_ = NULL; Page* _tmp7_ = NULL; FullscreenWindow* _tmp8_ = NULL; @@ -4189,7 +4181,7 @@ void app_window_end_fullscreen (AppWindow* self) { page_returning_from_fullscreen (_tmp7_, _tmp8_); #line 707 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp7_); -#line 4162 "AppWindow.c" +#line 4154 "AppWindow.c" } #line 709 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp9_ = app_window_fullscreen_window; @@ -4205,7 +4197,7 @@ void app_window_end_fullscreen (AppWindow* self) { app_window_fullscreen_window = NULL; #line 713 "/home/jens/Source/shotwell/src/AppWindow.vala" gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); -#line 4178 "AppWindow.c" +#line 4170 "AppWindow.c" } @@ -4228,7 +4220,7 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) { result = _tmp2_; #line 717 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 4201 "AppWindow.c" +#line 4193 "AppWindow.c" } @@ -4252,7 +4244,7 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, if (_tmp2_ == NULL) { #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp1_); -#line 4225 "AppWindow.c" +#line 4217 "AppWindow.c" } #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala" action = _tmp2_; @@ -4260,7 +4252,7 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, _tmp3_ = action; #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp3_ != NULL) { -#line 4233 "AppWindow.c" +#line 4225 "AppWindow.c" GSimpleAction* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 723 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -4269,11 +4261,11 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, _tmp5_ = sensitive; #line 723 "/home/jens/Source/shotwell/src/AppWindow.vala" g_simple_action_set_enabled (_tmp4_, _tmp5_); -#line 4242 "AppWindow.c" +#line 4234 "AppWindow.c" } #line 720 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); -#line 4246 "AppWindow.c" +#line 4238 "AppWindow.c" } @@ -4297,7 +4289,7 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name, if (_tmp2_ == NULL) { #line 727 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp1_); -#line 4270 "AppWindow.c" +#line 4262 "AppWindow.c" } #line 727 "/home/jens/Source/shotwell/src/AppWindow.vala" action = _tmp2_; @@ -4305,7 +4297,7 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name, _tmp3_ = action; #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp3_ != NULL) { -#line 4278 "AppWindow.c" +#line 4270 "AppWindow.c" GSimpleAction* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; @@ -4317,11 +4309,11 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name, _tmp6_ = _tmp5_; #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala" g_simple_action_set_enabled (_tmp4_, _tmp6_); -#line 4290 "AppWindow.c" +#line 4282 "AppWindow.c" } #line 726 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); -#line 4294 "AppWindow.c" +#line 4286 "AppWindow.c" } @@ -4345,7 +4337,7 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g if (_tmp2_ == NULL) { #line 733 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp1_); -#line 4318 "AppWindow.c" +#line 4310 "AppWindow.c" } #line 733 "/home/jens/Source/shotwell/src/AppWindow.vala" action = _tmp2_; @@ -4353,7 +4345,7 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g _tmp3_ = action; #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp3_ != NULL) { -#line 4326 "AppWindow.c" +#line 4318 "AppWindow.c" GSimpleAction* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; @@ -4365,32 +4357,32 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g _tmp6_ = _tmp5_; #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala" g_simple_action_set_enabled (_tmp4_, _tmp6_); -#line 4338 "AppWindow.c" +#line 4330 "AppWindow.c" } #line 732 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); -#line 4342 "AppWindow.c" +#line 4334 "AppWindow.c" } static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { #line 742 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_update_common_actions ((AppWindow*) self); -#line 4349 "AppWindow.c" +#line 4341 "AppWindow.c" } static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) { #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_update_common_actions ((AppWindow*) self); -#line 4356 "AppWindow.c" +#line 4348 "AppWindow.c" } static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_on_update_common_actions ((AppWindow*) self); -#line 4363 "AppWindow.c" +#line 4355 "AppWindow.c" } @@ -4418,7 +4410,7 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa _tmp2_ = old_page; #line 741 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp2_ != NULL) { -#line 4391 "AppWindow.c" +#line 4383 "AppWindow.c" Page* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; @@ -4467,13 +4459,13 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self); #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp13_); -#line 4440 "AppWindow.c" +#line 4432 "AppWindow.c" } #line 747 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp15_ = new_page; #line 747 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp15_ != NULL) { -#line 4446 "AppWindow.c" +#line 4438 "AppWindow.c" Page* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; ViewCollection* _tmp18_ = NULL; @@ -4546,7 +4538,7 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa _data_collection_unref0 (_tmp32_); #line 752 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp28_); -#line 4519 "AppWindow.c" +#line 4511 "AppWindow.c" } #line 756 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp34_ = old_page; @@ -4554,7 +4546,7 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa _tmp35_ = new_page; #line 756 "/home/jens/Source/shotwell/src/AppWindow.vala" PAGE_WINDOW_CLASS (app_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), _tmp34_, _tmp35_); -#line 4527 "AppWindow.c" +#line 4519 "AppWindow.c" } @@ -4573,7 +4565,7 @@ static void app_window_real_update_common_action_availability (AppWindow* self, app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard); #line 766 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard); -#line 4546 "AppWindow.c" +#line 4538 "AppWindow.c" } @@ -4582,7 +4574,7 @@ void app_window_update_common_action_availability (AppWindow* self, Page* old_pa g_return_if_fail (IS_APP_WINDOW (self)); #line 762 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page); -#line 4555 "AppWindow.c" +#line 4547 "AppWindow.c" } @@ -4595,13 +4587,13 @@ static void app_window_real_update_common_actions (AppWindow* self, Page* page, _tmp0_ = page; #line 773 "/home/jens/Source/shotwell/src/AppWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) { -#line 4568 "AppWindow.c" +#line 4560 "AppWindow.c" gint _tmp1_ = 0; #line 774 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp1_ = count; #line 774 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0); -#line 4574 "AppWindow.c" +#line 4566 "AppWindow.c" } #line 775 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp2_ = selected_count; @@ -4611,7 +4603,7 @@ static void app_window_real_update_common_actions (AppWindow* self, Page* page, app_window_decorate_undo_action (self); #line 778 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_decorate_redo_action (self); -#line 4584 "AppWindow.c" +#line 4576 "AppWindow.c" } @@ -4620,7 +4612,7 @@ void app_window_update_common_actions (AppWindow* self, Page* page, gint selecte g_return_if_fail (IS_APP_WINDOW (self)); #line 772 "/home/jens/Source/shotwell/src/AppWindow.vala" APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count); -#line 4593 "AppWindow.c" +#line 4585 "AppWindow.c" } @@ -4638,7 +4630,7 @@ static void app_window_on_update_common_actions (AppWindow* self) { _tmp1_ = page; #line 783 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp1_ != NULL) { -#line 4611 "AppWindow.c" +#line 4603 "AppWindow.c" Page* _tmp2_ = NULL; Page* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; @@ -4672,11 +4664,11 @@ static void app_window_on_update_common_actions (AppWindow* self) { _data_collection_unref0 (_tmp9_); #line 784 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp5_); -#line 4645 "AppWindow.c" +#line 4637 "AppWindow.c" } #line 781 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (page); -#line 4649 "AppWindow.c" +#line 4641 "AppWindow.c" } @@ -4709,7 +4701,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const if (_tmp3_ == NULL) { #line 789 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp2_); -#line 4682 "AppWindow.c" +#line 4674 "AppWindow.c" } #line 789 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = _tmp3_; @@ -4725,7 +4717,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _g_object_unref0 (bar); #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 4698 "AppWindow.c" +#line 4690 "AppWindow.c" } #line 795 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp6_ = bar; @@ -4733,19 +4725,19 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _tmp7_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_menu_model_get_type (), GMenuModel)); #line 795 "/home/jens/Source/shotwell/src/AppWindow.vala" items = _tmp7_; -#line 4706 "AppWindow.c" +#line 4698 "AppWindow.c" { gint i = 0; #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" i = 0; -#line 4711 "AppWindow.c" +#line 4703 "AppWindow.c" { gboolean _tmp8_ = FALSE; #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp8_ = TRUE; #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" while (TRUE) { -#line 4718 "AppWindow.c" +#line 4710 "AppWindow.c" gint _tmp10_ = 0; gint _tmp11_ = 0; GMenuModel* model = NULL; @@ -4758,13 +4750,13 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gint _tmp17_ = 0; #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp8_) { -#line 4731 "AppWindow.c" +#line 4723 "AppWindow.c" gint _tmp9_ = 0; #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp9_ = i; #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" i = _tmp9_ + 1; -#line 4737 "AppWindow.c" +#line 4729 "AppWindow.c" } #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp8_ = FALSE; @@ -4776,7 +4768,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const if (!(_tmp10_ < _tmp11_)) { #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" break; -#line 4749 "AppWindow.c" +#line 4741 "AppWindow.c" } #line 797 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp12_ = bar; @@ -4794,7 +4786,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _g_object_unref0 (model); #line 799 "/home/jens/Source/shotwell/src/AppWindow.vala" continue; -#line 4767 "AppWindow.c" +#line 4759 "AppWindow.c" } #line 802 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp16_ = model; @@ -4802,19 +4794,19 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _tmp17_ = g_menu_model_get_n_items (_tmp16_); #line 802 "/home/jens/Source/shotwell/src/AppWindow.vala" model_items = _tmp17_; -#line 4775 "AppWindow.c" +#line 4767 "AppWindow.c" { gint j = 0; #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" j = 0; -#line 4780 "AppWindow.c" +#line 4772 "AppWindow.c" { gboolean _tmp18_ = FALSE; #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp18_ = TRUE; #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" while (TRUE) { -#line 4787 "AppWindow.c" +#line 4779 "AppWindow.c" gint _tmp20_ = 0; gint _tmp21_ = 0; GMenuModel* subsection = NULL; @@ -4827,13 +4819,13 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gint _tmp27_ = 0; #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp18_) { -#line 4800 "AppWindow.c" +#line 4792 "AppWindow.c" gint _tmp19_ = 0; #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp19_ = j; #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" j = _tmp19_ + 1; -#line 4806 "AppWindow.c" +#line 4798 "AppWindow.c" } #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp18_ = FALSE; @@ -4845,7 +4837,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const if (!(_tmp20_ < _tmp21_)) { #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" break; -#line 4818 "AppWindow.c" +#line 4810 "AppWindow.c" } #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp22_ = model; @@ -4863,7 +4855,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _g_object_unref0 (subsection); #line 807 "/home/jens/Source/shotwell/src/AppWindow.vala" continue; -#line 4836 "AppWindow.c" +#line 4828 "AppWindow.c" } #line 810 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp26_ = subsection; @@ -4871,19 +4863,19 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _tmp27_ = g_menu_model_get_n_items (_tmp26_); #line 810 "/home/jens/Source/shotwell/src/AppWindow.vala" sub_items = _tmp27_; -#line 4844 "AppWindow.c" +#line 4836 "AppWindow.c" { gint k = 0; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" k = 0; -#line 4849 "AppWindow.c" +#line 4841 "AppWindow.c" { gboolean _tmp28_ = FALSE; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp28_ = TRUE; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" while (TRUE) { -#line 4856 "AppWindow.c" +#line 4848 "AppWindow.c" gint _tmp30_ = 0; gint _tmp31_ = 0; GMenuAttributeIter* it = NULL; @@ -4892,13 +4884,13 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const GMenuAttributeIter* _tmp34_ = NULL; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp28_) { -#line 4865 "AppWindow.c" +#line 4857 "AppWindow.c" gint _tmp29_ = 0; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp29_ = k; #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" k = _tmp29_ + 1; -#line 4871 "AppWindow.c" +#line 4863 "AppWindow.c" } #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp28_ = FALSE; @@ -4910,7 +4902,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const if (!(_tmp30_ < _tmp31_)) { #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" break; -#line 4883 "AppWindow.c" +#line 4875 "AppWindow.c" } #line 812 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp32_ = subsection; @@ -4922,7 +4914,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const it = _tmp34_; #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala" while (TRUE) { -#line 4895 "AppWindow.c" +#line 4887 "AppWindow.c" GMenuAttributeIter* _tmp35_ = NULL; gboolean _tmp36_ = FALSE; gboolean _tmp37_ = FALSE; @@ -4937,7 +4929,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const if (!_tmp36_) { #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala" break; -#line 4910 "AppWindow.c" +#line 4902 "AppWindow.c" } #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp39_ = it; @@ -4945,7 +4937,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _tmp40_ = g_menu_attribute_iter_get_name (_tmp39_); #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" if (g_strcmp0 (_tmp40_, "id") == 0) { -#line 4918 "AppWindow.c" +#line 4910 "AppWindow.c" GMenuAttributeIter* _tmp41_ = NULL; GVariant* _tmp42_ = NULL; GVariant* _tmp43_ = NULL; @@ -4965,17 +4957,17 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0; #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_variant_unref0 (_tmp43_); -#line 4938 "AppWindow.c" +#line 4930 "AppWindow.c" } else { #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp38_ = FALSE; -#line 4942 "AppWindow.c" +#line 4934 "AppWindow.c" } #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp38_) { #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp37_ = TRUE; -#line 4948 "AppWindow.c" +#line 4940 "AppWindow.c" } else { gboolean _tmp46_ = FALSE; GMenuAttributeIter* _tmp47_ = NULL; @@ -4986,7 +4978,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _tmp48_ = g_menu_attribute_iter_get_name (_tmp47_); #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala" if (g_strcmp0 (_tmp48_, "action") == 0) { -#line 4959 "AppWindow.c" +#line 4951 "AppWindow.c" GMenuAttributeIter* _tmp49_ = NULL; GVariant* _tmp50_ = NULL; GVariant* _tmp51_ = NULL; @@ -5017,19 +5009,19 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _g_free0 (_tmp55_); #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_variant_unref0 (_tmp51_); -#line 4990 "AppWindow.c" +#line 4982 "AppWindow.c" } else { #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp46_ = FALSE; -#line 4994 "AppWindow.c" +#line 4986 "AppWindow.c" } #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp37_ = _tmp46_; -#line 4998 "AppWindow.c" +#line 4990 "AppWindow.c" } #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp37_) { -#line 5002 "AppWindow.c" +#line 4994 "AppWindow.c" GMenu* md = NULL; GMenuModel* _tmp57_ = NULL; GMenu* _tmp58_ = NULL; @@ -5092,37 +5084,37 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const _g_object_unref0 (bar); #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 5065 "AppWindow.c" +#line 5057 "AppWindow.c" } } #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (it); -#line 5070 "AppWindow.c" +#line 5062 "AppWindow.c" } } } #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (subsection); -#line 5076 "AppWindow.c" +#line 5068 "AppWindow.c" } } } #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (model); -#line 5082 "AppWindow.c" +#line 5074 "AppWindow.c" } } } #line 787 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (bar); -#line 5088 "AppWindow.c" +#line 5080 "AppWindow.c" } static gpointer _command_manager_ref0 (gpointer self) { #line 833 "/home/jens/Source/shotwell/src/AppWindow.vala" return self ? command_manager_ref (self) : NULL; -#line 5095 "AppWindow.c" +#line 5087 "AppWindow.c" } @@ -5138,7 +5130,7 @@ CommandManager* app_window_get_command_manager (void) { result = _tmp1_; #line 833 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 5111 "AppWindow.c" +#line 5103 "AppWindow.c" } @@ -5149,7 +5141,7 @@ static void app_window_on_command_manager_altered (AppWindow* self) { app_window_decorate_undo_action (self); #line 838 "/home/jens/Source/shotwell/src/AppWindow.vala" app_window_decorate_redo_action (self); -#line 5122 "AppWindow.c" +#line 5114 "AppWindow.c" } @@ -5185,7 +5177,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g if (_tmp2_ == NULL) { #line 843 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp1_); -#line 5158 "AppWindow.c" +#line 5150 "AppWindow.c" } #line 843 "/home/jens/Source/shotwell/src/AppWindow.vala" action = _tmp2_; @@ -5197,7 +5189,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g _g_object_unref0 (action); #line 845 "/home/jens/Source/shotwell/src/AppWindow.vala" return; -#line 5170 "AppWindow.c" +#line 5162 "AppWindow.c" } #line 848 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp4_ = prefix; @@ -5209,7 +5201,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g _tmp6_ = desc; #line 850 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp6_ != NULL) { -#line 5182 "AppWindow.c" +#line 5174 "AppWindow.c" const gchar* _tmp7_ = NULL; CommandDescription* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -5244,7 +5236,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g _tmp14_ = action; #line 852 "/home/jens/Source/shotwell/src/AppWindow.vala" g_simple_action_set_enabled (_tmp14_, TRUE); -#line 5217 "AppWindow.c" +#line 5209 "AppWindow.c" } else { const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; @@ -5261,7 +5253,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g _tmp17_ = action; #line 855 "/home/jens/Source/shotwell/src/AppWindow.vala" g_simple_action_set_enabled (_tmp17_, FALSE); -#line 5234 "AppWindow.c" +#line 5226 "AppWindow.c" } #line 857 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp18_ = name; @@ -5273,7 +5265,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g _g_free0 (label); #line 841 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (action); -#line 5246 "AppWindow.c" +#line 5238 "AppWindow.c" } @@ -5298,7 +5290,7 @@ void app_window_decorate_undo_action (AppWindow* self) { _g_object_unref0 (_tmp3_); #line 861 "/home/jens/Source/shotwell/src/AppWindow.vala" _command_manager_unref0 (_tmp1_); -#line 5271 "AppWindow.c" +#line 5263 "AppWindow.c" } @@ -5323,7 +5315,7 @@ void app_window_decorate_redo_action (AppWindow* self) { _g_object_unref0 (_tmp3_); #line 866 "/home/jens/Source/shotwell/src/AppWindow.vala" _command_manager_unref0 (_tmp1_); -#line 5296 "AppWindow.c" +#line 5288 "AppWindow.c" } @@ -5335,7 +5327,7 @@ static void app_window_on_undo (AppWindow* self) { _tmp0_ = app_window_command_manager; #line 871 "/home/jens/Source/shotwell/src/AppWindow.vala" command_manager_undo (_tmp0_); -#line 5308 "AppWindow.c" +#line 5300 "AppWindow.c" } @@ -5347,7 +5339,7 @@ static void app_window_on_redo (AppWindow* self) { _tmp0_ = app_window_command_manager; #line 875 "/home/jens/Source/shotwell/src/AppWindow.vala" command_manager_redo (_tmp0_); -#line 5320 "AppWindow.c" +#line 5312 "AppWindow.c" } @@ -5366,7 +5358,7 @@ static void app_window_on_select_all (AppWindow* self) { if (_tmp1_ == NULL) { #line 879 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); -#line 5339 "AppWindow.c" +#line 5331 "AppWindow.c" } #line 879 "/home/jens/Source/shotwell/src/AppWindow.vala" page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); @@ -5374,7 +5366,7 @@ static void app_window_on_select_all (AppWindow* self) { _tmp2_ = page; #line 880 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp2_ != NULL) { -#line 5347 "AppWindow.c" +#line 5339 "AppWindow.c" Page* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; @@ -5388,11 +5380,11 @@ static void app_window_on_select_all (AppWindow* self) { view_collection_select_all (_tmp5_); #line 881 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp5_); -#line 5361 "AppWindow.c" +#line 5353 "AppWindow.c" } #line 878 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (page); -#line 5365 "AppWindow.c" +#line 5357 "AppWindow.c" } @@ -5411,7 +5403,7 @@ static void app_window_on_select_none (AppWindow* self) { if (_tmp1_ == NULL) { #line 885 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (_tmp0_); -#line 5384 "AppWindow.c" +#line 5376 "AppWindow.c" } #line 885 "/home/jens/Source/shotwell/src/AppWindow.vala" page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); @@ -5419,7 +5411,7 @@ static void app_window_on_select_none (AppWindow* self) { _tmp2_ = page; #line 886 "/home/jens/Source/shotwell/src/AppWindow.vala" if (_tmp2_ != NULL) { -#line 5392 "AppWindow.c" +#line 5384 "AppWindow.c" Page* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; @@ -5433,11 +5425,11 @@ static void app_window_on_select_none (AppWindow* self) { view_collection_unselect_all (_tmp5_); #line 887 "/home/jens/Source/shotwell/src/AppWindow.vala" _data_collection_unref0 (_tmp5_); -#line 5406 "AppWindow.c" +#line 5398 "AppWindow.c" } #line 884 "/home/jens/Source/shotwell/src/AppWindow.vala" _g_object_unref0 (page); -#line 5410 "AppWindow.c" +#line 5402 "AppWindow.c" } @@ -5463,7 +5455,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig _tmp2_ = self->maximized; #line 893 "/home/jens/Source/shotwell/src/AppWindow.vala" if (!_tmp2_) { -#line 5436 "AppWindow.c" +#line 5428 "AppWindow.c" gint _tmp3_ = 0; gint _tmp4_ = 0; #line 894 "/home/jens/Source/shotwell/src/AppWindow.vala" @@ -5472,7 +5464,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig self->dimensions.width = _tmp3_; #line 894 "/home/jens/Source/shotwell/src/AppWindow.vala" self->dimensions.height = _tmp4_; -#line 5445 "AppWindow.c" +#line 5437 "AppWindow.c" } #line 896 "/home/jens/Source/shotwell/src/AppWindow.vala" _tmp5_ = event; @@ -5482,7 +5474,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig result = _tmp6_; #line 896 "/home/jens/Source/shotwell/src/AppWindow.vala" return result; -#line 5455 "AppWindow.c" +#line 5447 "AppWindow.c" } @@ -5509,7 +5501,7 @@ static void app_window_class_init (AppWindowClass * klass) { ((GtkWidgetClass *) klass)->configure_event = app_window_real_configure_event; #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (klass)->finalize = app_window_finalize; -#line 5482 "AppWindow.c" +#line 5474 "AppWindow.c" } @@ -5520,7 +5512,7 @@ static void app_window_instance_init (AppWindow * self) { self->pos_x = 0; #line 405 "/home/jens/Source/shotwell/src/AppWindow.vala" self->pos_y = 0; -#line 5493 "AppWindow.c" +#line 5485 "AppWindow.c" } @@ -5530,7 +5522,7 @@ static void app_window_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_WINDOW, AppWindow); #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala" G_OBJECT_CLASS (app_window_parent_class)->finalize (obj); -#line 5503 "AppWindow.c" +#line 5495 "AppWindow.c" } |