summaryrefslogtreecommitdiff
path: root/src/AppWindow.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:55:20 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:55:20 +0100
commitf6140ff1c9ec493d947da5b346508846e7a1a06f (patch)
treec01b9164ee4b0d46b6670ccee45f6181c6237d7f /src/AppWindow.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parent2492891f112caac6076ce49721d9d5d78a152c3a (diff)
Update upstream source from tag 'upstream/0.26.4'
Update to upstream version '0.26.4' with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4
Diffstat (limited to 'src/AppWindow.c')
-rw-r--r--src/AppWindow.c2353
1 files changed, 1178 insertions, 1175 deletions
diff --git a/src/AppWindow.c b/src/AppWindow.c
index ca346cb..e2c3a0f 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -1,4 +1,4 @@
-/* AppWindow.c generated by valac 0.34.7, the Vala compiler
+/* AppWindow.c generated by valac 0.36.6, the Vala compiler
* generated from AppWindow.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -391,7 +391,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpointer self);
static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* self);
static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpointer self);
-static void fullscreen_window_finalize (GObject* obj);
+static void fullscreen_window_finalize (GObject * obj);
#define PAGE_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE_WINDOW, PageWindowPrivate))
enum {
PAGE_WINDOW_DUMMY_PROPERTY
@@ -424,7 +424,7 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event);
void page_window_set_busy_cursor (PageWindow* self);
void spin_event_loop (void);
void page_window_set_normal_cursor (PageWindow* self);
-static void page_window_finalize (GObject* obj);
+static void page_window_finalize (GObject * obj);
GType dimensions_get_type (void) G_GNUC_CONST;
Dimensions* dimensions_dup (const Dimensions* self);
void dimensions_free (Dimensions* self);
@@ -592,7 +592,7 @@ gboolean command_manager_redo (CommandManager* self);
void view_collection_select_all (ViewCollection* self);
void view_collection_unselect_all (ViewCollection* self);
static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
-static void app_window_finalize (GObject* obj);
+static void app_window_finalize (GObject * obj);
static const GActionEntry FULLSCREEN_WINDOW_entries[1] = {{"LeaveFullscreen", _fullscreen_window_on_close_gsimple_action_activate_callback}};
static const GActionEntry APP_WINDOW_common_actions[11] = {{"CommonAbout", _app_window_on_about_gsimple_action_activate_callback}, {"CommonQuit", _app_window_on_quit_gsimple_action_activate_callback}, {"CommonFullscreen", _app_window_on_fullscreen_gsimple_action_activate_callback}, {"CommonHelpContents", _app_window_on_help_contents_gsimple_action_activate_callback}, {"CommonHelpFAQ", _app_window_on_help_faq_gsimple_action_activate_callback}, {"CommonHelpReportProblem", _app_window_on_help_report_problem_gsimple_action_activate_callback}, {"CommonUndo", _app_window_on_undo_gsimple_action_activate_callback}, {"CommonRedo", _app_window_on_redo_gsimple_action_activate_callback}, {"CommonJumpToFile", _app_window_on_jump_to_file_gsimple_action_activate_callback}, {"CommonSelectAll", _app_window_on_select_all_gsimple_action_activate_callback}, {"CommonSelectNone", _app_window_on_select_none_gsimple_action_activate_callback}};
@@ -621,56 +621,53 @@ 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;
+ Page* _tmp0_;
#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;
- GdkScreen* _tmp3_ = NULL;
+ AppWindow* _tmp1_;
+ AppWindow* _tmp2_;
+ GdkScreen* _tmp3_;
GdkRectangle monitor = {0};
GdkRectangle _tmp4_ = {0};
- GdkRectangle _tmp5_ = {0};
- gint _tmp6_ = 0;
- GdkRectangle _tmp7_ = {0};
- gint _tmp8_ = 0;
- 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;
- gboolean _tmp18_ = FALSE;
- GtkToggleToolButton* _tmp19_ = NULL;
- GtkToolButton* _tmp20_ = NULL;
- GtkToolButton* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- GtkToolButton* _tmp23_ = NULL;
- Page* _tmp24_ = NULL;
- GtkToolbar* _tmp25_ = NULL;
- GtkToolbar* _tmp26_ = NULL;
- GtkToolbar* _tmp27_ = NULL;
- GtkToolbar* _tmp28_ = NULL;
- GtkToolbar* _tmp29_ = NULL;
- GtkToolbar* _tmp30_ = 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;
- GtkToolbar* _tmp43_ = NULL;
- GdkRectangle _tmp44_ = {0};
- gint _tmp45_ = 0;
- GdkRectangle _tmp46_ = {0};
- gint _tmp47_ = 0;
- Page* _tmp48_ = NULL;
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
+ GdkRectangle _tmp7_;
+ gint _tmp8_;
+ ConfigFacade* _tmp9_;
+ ConfigFacade* _tmp10_;
+ gboolean _tmp11_;
+ GtkToggleToolButton* _tmp12_;
+ GtkToggleToolButton* _tmp13_;
+ GtkToggleToolButton* _tmp14_;
+ GtkToggleToolButton* _tmp15_;
+ gboolean _tmp16_;
+ GtkToggleToolButton* _tmp17_;
+ GtkToolButton* _tmp18_;
+ GtkToolButton* _tmp19_;
+ GtkToolButton* _tmp20_;
+ Page* _tmp21_;
+ GtkToolbar* _tmp22_;
+ GtkToolbar* _tmp23_;
+ GtkToolbar* _tmp24_;
+ GtkToolbar* _tmp25_;
+ GtkToolbar* _tmp26_;
+ GtkToolbar* _tmp27_;
+ Page* _tmp28_;
+ Page* _tmp32_;
+ Page* _tmp33_;
+ GtkToolbar* _tmp34_;
+ GtkToolButton* _tmp35_;
+ GtkOverlay* _tmp36_;
+ GtkOverlay* _tmp37_;
+ Page* _tmp38_;
+ GtkOverlay* _tmp39_;
+ GtkToolbar* _tmp40_;
+ GdkRectangle _tmp41_;
+ gint _tmp42_;
+ GdkRectangle _tmp43_;
+ gint _tmp44_;
+ Page* _tmp45_;
#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"
@@ -726,129 +723,123 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
#line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = self->priv->pin_button;
#line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp14_ = _ ("Pin Toolbar");
-#line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
- 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"
- _tmp15_ = self->priv->pin_button;
+ gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_tool_button_get_type (), GtkToolButton), _ ("Pin Toolbar"));
#line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp16_ = _ ("Pin the toolbar open");
+ _tmp14_ = self->priv->pin_button;
#line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), _tmp16_);
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pin the toolbar open"));
#line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp17_ = self->priv->pin_button;
+ _tmp15_ = self->priv->pin_button;
#line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp18_ = self->priv->is_toolbar_dismissal_enabled;
+ _tmp16_ = self->priv->is_toolbar_dismissal_enabled;
#line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_toggle_tool_button_set_active (_tmp17_, !_tmp18_);
+ gtk_toggle_tool_button_set_active (_tmp15_, !_tmp16_);
#line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp19_ = self->priv->pin_button;
+ _tmp17_ = self->priv->pin_button;
#line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
- 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);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, 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"
- _tmp20_ = self->priv->close_button;
+ _tmp18_ = self->priv->close_button;
#line 52 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_tool_button_set_icon_name (_tmp20_, "view-restore");
-#line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp21_ = self->priv->close_button;
+ gtk_tool_button_set_icon_name (_tmp18_, "view-restore");
#line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp22_ = _ ("Leave fullscreen");
+ _tmp19_ = self->priv->close_button;
#line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), _tmp22_);
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), _ ("Leave fullscreen"));
#line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp23_ = self->priv->close_button;
+ _tmp20_ = self->priv->close_button;
#line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen");
#line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp24_ = page;
+ _tmp21_ = page;
#line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp25_ = page_get_toolbar (_tmp24_);
+ _tmp22_ = page_get_toolbar (_tmp21_);
#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 = _tmp25_;
+ self->priv->toolbar = _tmp22_;
#line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp26_ = self->priv->toolbar;
+ _tmp23_ = self->priv->toolbar;
#line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_toolbar_set_show_arrow (_tmp26_, FALSE);
+ gtk_toolbar_set_show_arrow (_tmp23_, FALSE);
#line 58 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp27_ = self->priv->toolbar;
+ _tmp24_ = self->priv->toolbar;
#line 58 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
#line 59 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp28_ = self->priv->toolbar;
+ _tmp25_ = self->priv->toolbar;
#line 59 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp29_ = self->priv->toolbar;
+ _tmp26_ = self->priv->toolbar;
#line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL);
+ g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL);
#line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp30_ = self->priv->toolbar;
+ _tmp27_ = self->priv->toolbar;
#line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY);
+ gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY);
#line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp31_ = page;
+ _tmp28_ = page;
#line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, TYPE_SLIDESHOW_PAGE)) {
-#line 767 "AppWindow.c"
- Page* _tmp32_ = NULL;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_SLIDESHOW_PAGE)) {
+#line 758 "AppWindow.c"
+ Page* _tmp29_;
#line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp32_ = page;
+ _tmp29_ = page;
#line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
- 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"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
+#line 764 "AppWindow.c"
} else {
- GtkToolbar* _tmp33_ = NULL;
- GtkToggleToolButton* _tmp34_ = NULL;
+ GtkToolbar* _tmp30_;
+ GtkToggleToolButton* _tmp31_;
#line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp33_ = self->priv->toolbar;
+ _tmp30_ = self->priv->toolbar;
#line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp34_ = self->priv->pin_button;
+ _tmp31_ = self->priv->pin_button;
#line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 783 "AppWindow.c"
+ gtk_toolbar_insert (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 774 "AppWindow.c"
}
#line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp35_ = page;
+ _tmp32_ = page;
#line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
- page_set_cursor_hide_time (_tmp35_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000);
+ page_set_cursor_hide_time (_tmp32_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000);
#line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp36_ = page;
+ _tmp33_ = page;
#line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
- page_start_cursor_hiding (_tmp36_);
+ page_start_cursor_hiding (_tmp33_);
#line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp37_ = self->priv->toolbar;
+ _tmp34_ = self->priv->toolbar;
#line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp38_ = self->priv->close_button;
+ _tmp35_ = self->priv->close_button;
#line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 76 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp39_ = self->priv->overlay;
+ _tmp36_ = 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 (_tmp39_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
#line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp40_ = self->priv->overlay;
+ _tmp37_ = self->priv->overlay;
#line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp41_ = page;
+ _tmp38_ = page;
#line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
- 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));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
#line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp42_ = self->priv->overlay;
+ _tmp39_ = self->priv->overlay;
#line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp43_ = self->priv->toolbar;
+ _tmp40_ = self->priv->toolbar;
#line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_overlay_add_overlay (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget));
+ gtk_overlay_add_overlay (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
#line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp44_ = monitor;
+ _tmp41_ = monitor;
#line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp45_ = _tmp44_.width;
+ _tmp42_ = _tmp41_.width;
#line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp46_ = monitor;
+ _tmp43_ = monitor;
#line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp47_ = _tmp46_.height;
+ _tmp44_ = _tmp43_.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), _tmp45_, _tmp47_);
+ gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_, _tmp44_);
#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"
@@ -858,21 +849,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"
- _tmp48_ = page;
+ _tmp45_ = page;
#line 96 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, 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 841 "AppWindow.c"
+#line 832 "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 848 "AppWindow.c"
+#line 839 "AppWindow.c"
}
@@ -881,13 +872,13 @@ 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 857 "AppWindow.c"
+#line 848 "AppWindow.c"
}
void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ GtkToggleToolButton* _tmp0_;
+ gboolean _tmp1_;
#line 106 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -896,18 +887,18 @@ 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 872 "AppWindow.c"
+#line 863 "AppWindow.c"
}
static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkRectangle* result) {
GdkRectangle monitor = {0};
- GdkScreen* _tmp0_ = NULL;
- GdkScreen* _tmp1_ = NULL;
- AppWindow* _tmp2_ = NULL;
- AppWindow* _tmp3_ = NULL;
- GdkWindow* _tmp4_ = NULL;
- gint _tmp5_ = 0;
+ GdkScreen* _tmp0_;
+ GdkScreen* _tmp1_;
+ AppWindow* _tmp2_;
+ AppWindow* _tmp3_;
+ GdkWindow* _tmp4_;
+ gint _tmp5_;
GdkRectangle _tmp6_ = {0};
#line 110 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
@@ -933,7 +924,7 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR
*result = monitor;
#line 116 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 909 "AppWindow.c"
+#line 900 "AppWindow.c"
}
@@ -941,9 +932,9 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
FullscreenWindow * self;
gboolean result = FALSE;
gboolean _result_ = FALSE;
- GdkEventConfigure* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
+ GdkEventConfigure* _tmp0_;
+ gboolean _tmp1_;
+ gboolean _tmp2_;
#line 119 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
#line 119 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -958,9 +949,9 @@ 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 934 "AppWindow.c"
- Page* _tmp3_ = NULL;
- Page* _tmp4_ = NULL;
+#line 925 "AppWindow.c"
+ Page* _tmp3_;
+ Page* _tmp4_;
#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -971,28 +962,28 @@ 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 947 "AppWindow.c"
+#line 938 "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 953 "AppWindow.c"
+#line 944 "AppWindow.c"
}
static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
FullscreenWindow * self;
gboolean result = FALSE;
- GdkEventKey* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- const gchar* _tmp2_ = NULL;
+ GdkEventKey* _tmp0_;
+ guint _tmp1_;
+ const gchar* _tmp2_;
gboolean _tmp3_ = FALSE;
- AppWindow* _tmp6_ = NULL;
- AppWindow* _tmp7_ = NULL;
- GdkEventKey* _tmp8_ = NULL;
+ AppWindow* _tmp6_;
+ AppWindow* _tmp7_;
+ GdkEventKey* _tmp8_;
gboolean _tmp9_ = FALSE;
- gboolean _tmp10_ = FALSE;
+ gboolean _tmp10_;
#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1011,24 +1002,24 @@ 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 987 "AppWindow.c"
+#line 978 "AppWindow.c"
}
#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) {
-#line 991 "AppWindow.c"
- GdkEventKey* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+#line 982 "AppWindow.c"
+ GdkEventKey* _tmp4_;
+ gboolean _tmp5_;
#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = event;
#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
_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 1000 "AppWindow.c"
+#line 991 "AppWindow.c"
} else {
#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = FALSE;
-#line 1004 "AppWindow.c"
+#line 995 "AppWindow.c"
}
#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp3_) {
@@ -1036,7 +1027,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 1012 "AppWindow.c"
+#line 1003 "AppWindow.c"
}
#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = app_window_get_instance ();
@@ -1054,16 +1045,16 @@ 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 1030 "AppWindow.c"
+#line 1021 "AppWindow.c"
}
static void fullscreen_window_on_close (FullscreenWindow* self) {
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- AppWindow* _tmp3_ = NULL;
- AppWindow* _tmp4_ = NULL;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ gboolean _tmp2_;
+ AppWindow* _tmp3_;
+ AppWindow* _tmp4_;
#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1086,7 +1077,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 1062 "AppWindow.c"
+#line 1053 "AppWindow.c"
}
@@ -1095,15 +1086,15 @@ 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 1071 "AppWindow.c"
+#line 1062 "AppWindow.c"
}
static void fullscreen_window_real_destroy (GtkWidget* base) {
FullscreenWindow * self;
Page* page = NULL;
- Page* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
+ Page* _tmp0_;
+ Page* _tmp1_;
#line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
#line 158 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1116,9 +1107,9 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
_tmp1_ = page;
#line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 1092 "AppWindow.c"
- Page* _tmp2_ = NULL;
- Page* _tmp3_ = NULL;
+#line 1083 "AppWindow.c"
+ Page* _tmp2_;
+ Page* _tmp3_;
#line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = page;
#line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1127,21 +1118,21 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
_tmp3_ = page;
#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_switching_from (_tmp3_);
-#line 1103 "AppWindow.c"
+#line 1094 "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 1109 "AppWindow.c"
+#line 1100 "AppWindow.c"
}
static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAny* event) {
FullscreenWindow * self;
gboolean result = FALSE;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1160,7 +1151,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 1136 "AppWindow.c"
+#line 1127 "AppWindow.c"
}
@@ -1169,14 +1160,14 @@ 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 1145 "AppWindow.c"
+#line 1136 "AppWindow.c"
}
static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event) {
FullscreenWindow * self;
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
gboolean _tmp4_ = FALSE;
#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
@@ -1186,24 +1177,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 1162 "AppWindow.c"
+#line 1153 "AppWindow.c"
gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
#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 1169 "AppWindow.c"
- gboolean _tmp3_ = FALSE;
+#line 1160 "AppWindow.c"
+ gboolean _tmp3_;
#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 1175 "AppWindow.c"
+#line 1166 "AppWindow.c"
} else {
#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = FALSE;
-#line 1179 "AppWindow.c"
+#line 1170 "AppWindow.c"
}
#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_) {
@@ -1211,58 +1202,58 @@ 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 1187 "AppWindow.c"
+#line 1178 "AppWindow.c"
}
}
#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) {
-#line 1192 "AppWindow.c"
- GdkEventMotion* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 1183 "AppWindow.c"
+ GdkEventMotion* _tmp5_;
+ gboolean _tmp6_;
#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = event;
#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
_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 1201 "AppWindow.c"
+#line 1192 "AppWindow.c"
} else {
#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = FALSE;
-#line 1205 "AppWindow.c"
+#line 1196 "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 1211 "AppWindow.c"
+#line 1202 "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 1218 "AppWindow.c"
+#line 1209 "AppWindow.c"
}
static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self) {
gboolean result = FALSE;
GdkDeviceManager* devmgr = NULL;
- GdkDisplay* _tmp0_ = NULL;
- GdkDeviceManager* _tmp1_ = NULL;
- GdkDeviceManager* _tmp2_ = NULL;
- GdkDeviceManager* _tmp3_ = NULL;
+ GdkDisplay* _tmp0_;
+ GdkDeviceManager* _tmp1_;
+ GdkDeviceManager* _tmp2_;
+ GdkDeviceManager* _tmp3_;
gint py = 0;
- GdkDeviceManager* _tmp4_ = NULL;
- GdkDevice* _tmp5_ = NULL;
+ GdkDeviceManager* _tmp4_;
+ GdkDevice* _tmp5_;
gint _tmp6_ = 0;
gint wy = 0;
- GtkToolbar* _tmp7_ = NULL;
- GdkWindow* _tmp8_ = NULL;
+ GtkToolbar* _tmp7_;
+ GdkWindow* _tmp8_;
gint _tmp9_ = 0;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+ gint _tmp10_;
+ gint _tmp11_;
#line 190 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1285,7 +1276,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 1261 "AppWindow.c"
+#line 1252 "AppWindow.c"
}
#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = devmgr;
@@ -1313,14 +1304,14 @@ 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 1289 "AppWindow.c"
+#line 1280 "AppWindow.c"
}
static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp0_;
+ gboolean _tmp1_;
#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1333,7 +1324,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
result = FALSE;
#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1309 "AppWindow.c"
+#line 1300 "AppWindow.c"
}
#line 213 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = fullscreen_window_is_pointer_in_toolbar (self);
@@ -1343,7 +1334,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
result = FALSE;
#line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1319 "AppWindow.c"
+#line 1310 "AppWindow.c"
}
#line 216 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_invoke_toolbar (self);
@@ -1351,7 +1342,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
result = FALSE;
#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1327 "AppWindow.c"
+#line 1318 "AppWindow.c"
}
@@ -1360,12 +1351,12 @@ 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 1336 "AppWindow.c"
+#line 1327 "AppWindow.c"
}
static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) {
- GtkToolbar* _tmp0_ = NULL;
+ GtkToolbar* _tmp0_;
#line 221 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
#line 222 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1376,22 +1367,22 @@ 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 1352 "AppWindow.c"
+#line 1343 "AppWindow.c"
}
static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
- time_t _tmp3_ = 0;
+ gboolean _tmp0_;
+ gboolean _tmp1_;
+ gboolean _tmp2_;
+ time_t _tmp3_;
time_t now = 0;
- time_t _tmp5_ = 0;
- time_t _tmp6_ = 0;
- time_t _tmp7_ = 0;
- time_t _tmp8_ = 0;
- time_t _tmp9_ = 0;
+ time_t _tmp5_;
+ time_t _tmp6_;
+ time_t _tmp7_;
+ time_t _tmp8_;
+ time_t _tmp9_;
#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1402,7 +1393,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
result = FALSE;
#line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1378 "AppWindow.c"
+#line 1369 "AppWindow.c"
}
#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->is_toolbar_dismissal_enabled;
@@ -1412,7 +1403,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
result = TRUE;
#line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1388 "AppWindow.c"
+#line 1379 "AppWindow.c"
}
#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = fullscreen_window_is_pointer_in_toolbar (self);
@@ -1424,14 +1415,14 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
result = TRUE;
#line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1400 "AppWindow.c"
+#line 1391 "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 1406 "AppWindow.c"
- time_t _tmp4_ = 0;
+#line 1397 "AppWindow.c"
+ time_t _tmp4_;
#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = time (NULL);
#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1440,7 +1431,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
result = TRUE;
#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1416 "AppWindow.c"
+#line 1407 "AppWindow.c"
}
#line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = time (NULL);
@@ -1462,7 +1453,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
result = TRUE;
#line 256 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1438 "AppWindow.c"
+#line 1429 "AppWindow.c"
}
#line 258 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_hide_toolbar (self);
@@ -1470,12 +1461,12 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
result = FALSE;
#line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1446 "AppWindow.c"
+#line 1437 "AppWindow.c"
}
static void fullscreen_window_hide_toolbar (FullscreenWindow* self) {
- GtkToolbar* _tmp0_ = NULL;
+ GtkToolbar* _tmp0_;
#line 263 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1484,7 +1475,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 1460 "AppWindow.c"
+#line 1451 "AppWindow.c"
}
@@ -1494,25 +1485,25 @@ static void fullscreen_window_class_init (FullscreenWindowClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_type_class_add_private (klass, sizeof (FullscreenWindowPrivate));
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->configure_event = (gboolean (*)(GtkWidget*, GdkEventConfigure*)) fullscreen_window_real_configure_event;
+ ((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) fullscreen_window_real_configure_event;
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) fullscreen_window_real_key_press_event;
+ ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) fullscreen_window_real_key_press_event;
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->destroy = (void (*)(GtkWidget*)) fullscreen_window_real_destroy;
+ ((GtkWidgetClass *) klass)->destroy = (void (*) (GtkWidget *)) fullscreen_window_real_destroy;
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->delete_event = (gboolean (*)(GtkWidget*, GdkEventAny*)) fullscreen_window_real_delete_event;
+ ((GtkWidgetClass *) klass)->delete_event = (gboolean (*) (GtkWidget *, GdkEventAny*)) fullscreen_window_real_delete_event;
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->motion_notify_event = (gboolean (*)(GtkWidget*, GdkEventMotion*)) fullscreen_window_real_motion_notify_event;
+ ((GtkWidgetClass *) klass)->motion_notify_event = (gboolean (*) (GtkWidget *, GdkEventMotion*)) fullscreen_window_real_motion_notify_event;
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (klass)->finalize = fullscreen_window_finalize;
-#line 1481 "AppWindow.c"
+#line 1472 "AppWindow.c"
}
static void fullscreen_window_instance_init (FullscreenWindow * self) {
- GtkOverlay* _tmp0_ = NULL;
- GtkToolButton* _tmp1_ = NULL;
- GtkToggleToolButton* _tmp2_ = NULL;
+ GtkOverlay* _tmp0_;
+ GtkToolButton* _tmp1_;
+ GtkToggleToolButton* _tmp2_;
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv = FULLSCREEN_WINDOW_GET_PRIVATE (self);
#line 12 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1543,11 +1534,11 @@ 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 1519 "AppWindow.c"
+#line 1510 "AppWindow.c"
}
-static void fullscreen_window_finalize (GObject* obj) {
+static void fullscreen_window_finalize (GObject * obj) {
FullscreenWindow * self;
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
@@ -1561,7 +1552,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 1537 "AppWindow.c"
+#line 1528 "AppWindow.c"
}
@@ -1582,7 +1573,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 1558 "AppWindow.c"
+#line 1549 "AppWindow.c"
}
@@ -1591,16 +1582,16 @@ 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 1567 "AppWindow.c"
+#line 1558 "AppWindow.c"
}
PageWindow* page_window_construct (GType object_type) {
PageWindow * self = NULL;
- Application* _tmp0_ = NULL;
- Application* _tmp1_ = NULL;
- GtkApplication* _tmp2_ = NULL;
- GtkApplication* _tmp3_ = NULL;
+ Application* _tmp0_;
+ Application* _tmp1_;
+ GtkApplication* _tmp2_;
+ GtkApplication* _tmp3_;
#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = application_get_instance ();
#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1621,14 +1612,14 @@ 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 1597 "AppWindow.c"
+#line 1588 "AppWindow.c"
}
Page* page_window_get_current_page (PageWindow* self) {
Page* result = NULL;
- Page* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
+ Page* _tmp0_;
+ Page* _tmp1_;
#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_PAGE_WINDOW (self), NULL);
#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1639,32 +1630,32 @@ Page* page_window_get_current_page (PageWindow* self) {
result = _tmp1_;
#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1615 "AppWindow.c"
+#line 1606 "AppWindow.c"
}
static void page_window_real_set_current_page (PageWindow* self, Page* page) {
- Page* _tmp0_ = NULL;
+ Page* _tmp0_;
Page* old_page = NULL;
- Page* _tmp2_ = NULL;
- Page* _tmp3_ = NULL;
- Page* _tmp4_ = NULL;
- Page* _tmp5_ = NULL;
- Page* _tmp6_ = NULL;
- Page* _tmp7_ = NULL;
+ Page* _tmp2_;
+ Page* _tmp3_;
+ Page* _tmp4_;
+ Page* _tmp5_;
+ Page* _tmp6_;
+ Page* _tmp7_;
#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE (page));
#line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->current_page;
#line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ != NULL) {
-#line 1634 "AppWindow.c"
- Page* _tmp1_ = NULL;
+#line 1625 "AppWindow.c"
+ Page* _tmp1_;
#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 1640 "AppWindow.c"
+#line 1631 "AppWindow.c"
}
#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->current_page;
@@ -1690,7 +1681,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 1666 "AppWindow.c"
+#line 1657 "AppWindow.c"
}
@@ -1699,26 +1690,26 @@ 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 1675 "AppWindow.c"
+#line 1666 "AppWindow.c"
}
static void page_window_real_clear_current_page (PageWindow* self) {
- Page* _tmp0_ = NULL;
+ Page* _tmp0_;
Page* old_page = NULL;
- Page* _tmp2_ = NULL;
- Page* _tmp3_ = NULL;
+ Page* _tmp2_;
+ Page* _tmp3_;
#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->current_page;
#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ != NULL) {
-#line 1688 "AppWindow.c"
- Page* _tmp1_ = NULL;
+#line 1679 "AppWindow.c"
+ Page* _tmp1_;
#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 1694 "AppWindow.c"
+#line 1685 "AppWindow.c"
}
#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->current_page;
@@ -1734,7 +1725,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 1710 "AppWindow.c"
+#line 1701 "AppWindow.c"
}
@@ -1743,7 +1734,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 1719 "AppWindow.c"
+#line 1710 "AppWindow.c"
}
@@ -1751,9 +1742,9 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
PageWindow * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- GtkWidget* _tmp1_ = NULL;
+ GtkWidget* _tmp1_;
gboolean _tmp5_ = FALSE;
- Page* _tmp6_ = NULL;
+ Page* _tmp6_;
gboolean _tmp10_ = FALSE;
#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -1763,9 +1754,9 @@ 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 1739 "AppWindow.c"
- GtkWidget* _tmp2_ = NULL;
- GdkEventKey* _tmp3_ = NULL;
+#line 1730 "AppWindow.c"
+ GtkWidget* _tmp2_;
+ GdkEventKey* _tmp3_;
gboolean _tmp4_ = FALSE;
#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
@@ -1775,11 +1766,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 1751 "AppWindow.c"
+#line 1742 "AppWindow.c"
} else {
#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = FALSE;
-#line 1755 "AppWindow.c"
+#line 1746 "AppWindow.c"
}
#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
@@ -1787,16 +1778,16 @@ 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 1763 "AppWindow.c"
+#line 1754 "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 1769 "AppWindow.c"
- Page* _tmp7_ = NULL;
- GdkEventKey* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 1760 "AppWindow.c"
+ Page* _tmp7_;
+ GdkEventKey* _tmp8_;
+ gboolean _tmp9_;
#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = self->priv->current_page;
#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1805,11 +1796,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 1781 "AppWindow.c"
+#line 1772 "AppWindow.c"
} else {
#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = FALSE;
-#line 1785 "AppWindow.c"
+#line 1776 "AppWindow.c"
}
#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp5_) {
@@ -1817,30 +1808,30 @@ 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 1793 "AppWindow.c"
+#line 1784 "AppWindow.c"
}
#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) {
-#line 1797 "AppWindow.c"
- GdkEventKey* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 1788 "AppWindow.c"
+ GdkEventKey* _tmp11_;
+ gboolean _tmp12_;
#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = event;
#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
_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 1806 "AppWindow.c"
+#line 1797 "AppWindow.c"
} else {
#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = FALSE;
-#line 1810 "AppWindow.c"
+#line 1801 "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 1816 "AppWindow.c"
+#line 1807 "AppWindow.c"
}
@@ -1848,9 +1839,9 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
PageWindow * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- GtkWidget* _tmp1_ = NULL;
+ GtkWidget* _tmp1_;
gboolean _tmp5_ = FALSE;
- Page* _tmp6_ = NULL;
+ Page* _tmp6_;
gboolean _tmp10_ = FALSE;
#line 327 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -1860,9 +1851,9 @@ 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 1836 "AppWindow.c"
- GtkWidget* _tmp2_ = NULL;
- GdkEventKey* _tmp3_ = NULL;
+#line 1827 "AppWindow.c"
+ GtkWidget* _tmp2_;
+ GdkEventKey* _tmp3_;
gboolean _tmp4_ = FALSE;
#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
@@ -1872,11 +1863,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 1848 "AppWindow.c"
+#line 1839 "AppWindow.c"
} else {
#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = FALSE;
-#line 1852 "AppWindow.c"
+#line 1843 "AppWindow.c"
}
#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
@@ -1884,16 +1875,16 @@ 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 1860 "AppWindow.c"
+#line 1851 "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 1866 "AppWindow.c"
- Page* _tmp7_ = NULL;
- GdkEventKey* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 1857 "AppWindow.c"
+ Page* _tmp7_;
+ GdkEventKey* _tmp8_;
+ gboolean _tmp9_;
#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = self->priv->current_page;
#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1902,11 +1893,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 1878 "AppWindow.c"
+#line 1869 "AppWindow.c"
} else {
#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = FALSE;
-#line 1882 "AppWindow.c"
+#line 1873 "AppWindow.c"
}
#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp5_) {
@@ -1914,30 +1905,30 @@ 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 1890 "AppWindow.c"
+#line 1881 "AppWindow.c"
}
#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) {
-#line 1894 "AppWindow.c"
- GdkEventKey* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 1885 "AppWindow.c"
+ GdkEventKey* _tmp11_;
+ gboolean _tmp12_;
#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = event;
#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
_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 1903 "AppWindow.c"
+#line 1894 "AppWindow.c"
} else {
#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = FALSE;
-#line 1907 "AppWindow.c"
+#line 1898 "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 1913 "AppWindow.c"
+#line 1904 "AppWindow.c"
}
@@ -1945,7 +1936,7 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
PageWindow * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- Page* _tmp1_ = NULL;
+ Page* _tmp1_;
gboolean _tmp5_ = FALSE;
#line 337 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -1955,10 +1946,10 @@ 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 1931 "AppWindow.c"
- Page* _tmp2_ = NULL;
- GdkEventFocus* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 1922 "AppWindow.c"
+ Page* _tmp2_;
+ GdkEventFocus* _tmp3_;
+ gboolean _tmp4_;
#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->current_page;
#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1967,11 +1958,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 1943 "AppWindow.c"
+#line 1934 "AppWindow.c"
} else {
#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = FALSE;
-#line 1947 "AppWindow.c"
+#line 1938 "AppWindow.c"
}
#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
@@ -1979,30 +1970,30 @@ 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 1955 "AppWindow.c"
+#line 1946 "AppWindow.c"
}
#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) {
-#line 1959 "AppWindow.c"
- GdkEventFocus* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 1950 "AppWindow.c"
+ GdkEventFocus* _tmp6_;
+ gboolean _tmp7_;
#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = event;
#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
_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 1968 "AppWindow.c"
+#line 1959 "AppWindow.c"
} else {
#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = FALSE;
-#line 1972 "AppWindow.c"
+#line 1963 "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 1978 "AppWindow.c"
+#line 1969 "AppWindow.c"
}
@@ -2010,7 +2001,7 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
PageWindow * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- Page* _tmp1_ = NULL;
+ Page* _tmp1_;
gboolean _tmp5_ = FALSE;
#line 344 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -2020,10 +2011,10 @@ 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 1996 "AppWindow.c"
- Page* _tmp2_ = NULL;
- GdkEventFocus* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 1987 "AppWindow.c"
+ Page* _tmp2_;
+ GdkEventFocus* _tmp3_;
+ gboolean _tmp4_;
#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->current_page;
#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2032,11 +2023,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 2008 "AppWindow.c"
+#line 1999 "AppWindow.c"
} else {
#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = FALSE;
-#line 2012 "AppWindow.c"
+#line 2003 "AppWindow.c"
}
#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
@@ -2044,37 +2035,37 @@ 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 2020 "AppWindow.c"
+#line 2011 "AppWindow.c"
}
#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) {
-#line 2024 "AppWindow.c"
- GdkEventFocus* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 2015 "AppWindow.c"
+ GdkEventFocus* _tmp6_;
+ gboolean _tmp7_;
#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = event;
#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
_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 2033 "AppWindow.c"
+#line 2024 "AppWindow.c"
} else {
#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = FALSE;
-#line 2037 "AppWindow.c"
+#line 2028 "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 2043 "AppWindow.c"
+#line 2034 "AppWindow.c"
}
static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event) {
PageWindow * self;
gboolean result = FALSE;
- Page* _tmp0_ = NULL;
+ Page* _tmp0_;
gboolean _tmp4_ = FALSE;
#line 351 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
@@ -2084,10 +2075,10 @@ 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 2060 "AppWindow.c"
- Page* _tmp1_ = NULL;
- GdkEventConfigure* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 2051 "AppWindow.c"
+ Page* _tmp1_;
+ GdkEventConfigure* _tmp2_;
+ gboolean _tmp3_;
#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->current_page;
#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2100,45 +2091,45 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
result = TRUE;
#line 354 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2076 "AppWindow.c"
+#line 2067 "AppWindow.c"
}
}
#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) {
-#line 2081 "AppWindow.c"
- GdkEventConfigure* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 2072 "AppWindow.c"
+ GdkEventConfigure* _tmp5_;
+ gboolean _tmp6_;
#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = event;
#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
_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 2090 "AppWindow.c"
+#line 2081 "AppWindow.c"
} else {
#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = FALSE;
-#line 2094 "AppWindow.c"
+#line 2085 "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 2100 "AppWindow.c"
+#line 2091 "AppWindow.c"
}
void page_window_set_busy_cursor (PageWindow* self) {
- gint _tmp0_ = 0;
+ gint _tmp0_;
GdkDisplay* display = NULL;
- GdkWindow* _tmp1_ = NULL;
- GdkDisplay* _tmp2_ = NULL;
- GdkDisplay* _tmp3_ = NULL;
+ GdkWindow* _tmp1_;
+ GdkDisplay* _tmp2_;
+ GdkDisplay* _tmp3_;
GdkCursor* cursor = NULL;
- GdkDisplay* _tmp4_ = NULL;
- GdkCursor* _tmp5_ = NULL;
- GdkWindow* _tmp6_ = NULL;
- GdkCursor* _tmp7_ = NULL;
+ GdkDisplay* _tmp4_;
+ GdkCursor* _tmp5_;
+ GdkWindow* _tmp6_;
+ GdkCursor* _tmp7_;
#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE_WINDOW (self));
#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2149,7 +2140,7 @@ void page_window_set_busy_cursor (PageWindow* self) {
if (_tmp0_ > 0) {
#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 2125 "AppWindow.c"
+#line 2116 "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));
@@ -2177,21 +2168,21 @@ 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 2153 "AppWindow.c"
+#line 2144 "AppWindow.c"
}
void page_window_set_normal_cursor (PageWindow* self) {
- gint _tmp0_ = 0;
+ gint _tmp0_;
GdkDisplay* display = NULL;
- GdkWindow* _tmp3_ = NULL;
- GdkDisplay* _tmp4_ = NULL;
- GdkDisplay* _tmp5_ = NULL;
+ GdkWindow* _tmp3_;
+ GdkDisplay* _tmp4_;
+ GdkDisplay* _tmp5_;
GdkCursor* cursor = NULL;
- GdkDisplay* _tmp6_ = NULL;
- GdkCursor* _tmp7_ = NULL;
- GdkWindow* _tmp8_ = NULL;
- GdkCursor* _tmp9_ = NULL;
+ GdkDisplay* _tmp6_;
+ GdkCursor* _tmp7_;
+ GdkWindow* _tmp8_;
+ GdkCursor* _tmp9_;
#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE_WINDOW (self));
#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2202,10 +2193,10 @@ void page_window_set_normal_cursor (PageWindow* self) {
self->priv->busy_counter = 0;
#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 2178 "AppWindow.c"
+#line 2169 "AppWindow.c"
} else {
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ gint _tmp1_;
+ gint _tmp2_;
#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->busy_counter;
#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2216,7 +2207,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
if (_tmp2_ > 0) {
#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 2192 "AppWindow.c"
+#line 2183 "AppWindow.c"
}
}
#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2245,7 +2236,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 2221 "AppWindow.c"
+#line 2212 "AppWindow.c"
}
@@ -2255,24 +2246,24 @@ static void page_window_class_init (PageWindowClass * klass) {
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_type_class_add_private (klass, sizeof (PageWindowPrivate));
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((PageWindowClass *) klass)->switched_pages = (void (*)(PageWindow*, Page*, Page*)) page_window_real_switched_pages;
+ ((PageWindowClass *) klass)->switched_pages = (void (*) (PageWindow *, Page*, Page*)) page_window_real_switched_pages;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((PageWindowClass *) klass)->set_current_page = (void (*)(PageWindow*, Page*)) page_window_real_set_current_page;
+ ((PageWindowClass *) klass)->set_current_page = (void (*) (PageWindow *, Page*)) page_window_real_set_current_page;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((PageWindowClass *) klass)->clear_current_page = (void (*)(PageWindow*)) page_window_real_clear_current_page;
+ ((PageWindowClass *) klass)->clear_current_page = (void (*) (PageWindow *)) page_window_real_clear_current_page;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) page_window_real_key_press_event;
+ ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) page_window_real_key_press_event;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->key_release_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) page_window_real_key_release_event;
+ ((GtkWidgetClass *) klass)->key_release_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) page_window_real_key_release_event;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*)(GtkWidget*, GdkEventFocus*)) page_window_real_focus_in_event;
+ ((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) page_window_real_focus_in_event;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*)(GtkWidget*, GdkEventFocus*)) page_window_real_focus_out_event;
+ ((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) page_window_real_focus_out_event;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->configure_event = (gboolean (*)(GtkWidget*, GdkEventConfigure*)) page_window_real_configure_event;
+ ((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) page_window_real_configure_event;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (klass)->finalize = page_window_finalize;
-#line 2248 "AppWindow.c"
+#line 2239 "AppWindow.c"
}
@@ -2283,11 +2274,11 @@ 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 2259 "AppWindow.c"
+#line 2250 "AppWindow.c"
}
-static void page_window_finalize (GObject* obj) {
+static void page_window_finalize (GObject * obj) {
PageWindow * self;
#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_WINDOW, PageWindow);
@@ -2295,7 +2286,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 2271 "AppWindow.c"
+#line 2262 "AppWindow.c"
}
@@ -2314,101 +2305,101 @@ 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 2290 "AppWindow.c"
+#line 2281 "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 2297 "AppWindow.c"
+#line 2288 "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 2304 "AppWindow.c"
+#line 2295 "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 2311 "AppWindow.c"
+#line 2302 "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 2318 "AppWindow.c"
+#line 2309 "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 2325 "AppWindow.c"
+#line 2316 "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 2332 "AppWindow.c"
+#line 2323 "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 2339 "AppWindow.c"
+#line 2330 "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 2346 "AppWindow.c"
+#line 2337 "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 2353 "AppWindow.c"
+#line 2344 "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 2360 "AppWindow.c"
+#line 2351 "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 2367 "AppWindow.c"
+#line 2358 "AppWindow.c"
}
AppWindow* app_window_construct (GType object_type) {
AppWindow * self = NULL;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
- Dimensions _tmp10_ = {0};
- gint _tmp11_ = 0;
- Dimensions _tmp12_ = {0};
- gint _tmp13_ = 0;
- gboolean _tmp14_ = FALSE;
- CommandManager* _tmp15_ = NULL;
- CommandManager* _tmp16_ = NULL;
- CommandManager* _tmp17_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
+ Dimensions _tmp10_;
+ gint _tmp11_;
+ Dimensions _tmp12_;
+ gint _tmp13_;
+ gboolean _tmp14_;
+ CommandManager* _tmp15_;
+ CommandManager* _tmp16_;
+ CommandManager* _tmp17_;
GtkCssProvider* provider = NULL;
- GtkCssProvider* _tmp18_ = NULL;
+ GtkCssProvider* _tmp18_;
GError * _inner_error_ = NULL;
#line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = (AppWindow*) page_window_construct (object_type);
@@ -2428,9 +2419,9 @@ 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 2404 "AppWindow.c"
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
+#line 2395 "AppWindow.c"
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
gboolean _tmp4_ = FALSE;
Dimensions _tmp5_ = {0};
#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2445,10 +2436,10 @@ AppWindow* app_window_construct (GType object_type) {
self->dimensions = _tmp5_;
#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp3_);
-#line 2421 "AppWindow.c"
+#line 2412 "AppWindow.c"
} else {
- ConfigFacade* _tmp6_ = NULL;
- ConfigFacade* _tmp7_ = NULL;
+ ConfigFacade* _tmp6_;
+ ConfigFacade* _tmp7_;
gboolean _tmp8_ = FALSE;
Dimensions _tmp9_ = {0};
#line 419 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2465,7 +2456,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 2441 "AppWindow.c"
+#line 2432 "AppWindow.c"
}
#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = self->dimensions;
@@ -2483,7 +2474,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 2459 "AppWindow.c"
+#line 2450 "AppWindow.c"
}
#line 428 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = app_window_command_manager;
@@ -2505,28 +2496,28 @@ AppWindow* app_window_construct (GType object_type) {
_tmp18_ = gtk_css_provider_new ();
#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
provider = _tmp18_;
-#line 2481 "AppWindow.c"
+#line 2472 "AppWindow.c"
{
- GdkScreen* _tmp19_ = NULL;
+ GdkScreen* _tmp19_;
#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 2488 "AppWindow.c"
- goto __catch226_g_error;
+#line 2479 "AppWindow.c"
+ goto __catch227_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 2495 "AppWindow.c"
+#line 2486 "AppWindow.c"
}
- goto __finally226;
- __catch226_g_error:
+ goto __finally227;
+ __catch227_g_error:
{
GError* err = NULL;
- GError* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
+ GError* _tmp20_;
+ const gchar* _tmp21_;
#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2539,9 +2530,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 2515 "AppWindow.c"
+#line 2506 "AppWindow.c"
}
- __finally226:
+ __finally227:
#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2552,13 +2543,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 2528 "AppWindow.c"
+#line 2519 "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 2534 "AppWindow.c"
+#line 2525 "AppWindow.c"
}
@@ -2567,7 +2558,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 2543 "AppWindow.c"
+#line 2534 "AppWindow.c"
}
@@ -2576,27 +2567,27 @@ 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 2552 "AppWindow.c"
+#line 2543 "AppWindow.c"
}
gboolean app_window_has_instance (void) {
gboolean result = FALSE;
- AppWindow* _tmp0_ = NULL;
+ AppWindow* _tmp0_;
#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_instance;
#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp0_ != NULL;
#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2565 "AppWindow.c"
+#line 2556 "AppWindow.c"
}
AppWindow* app_window_get_instance (void) {
AppWindow* result = NULL;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_instance;
#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2605,14 +2596,14 @@ AppWindow* app_window_get_instance (void) {
result = _tmp1_;
#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2581 "AppWindow.c"
+#line 2572 "AppWindow.c"
}
FullscreenWindow* app_window_get_fullscreen (void) {
FullscreenWindow* result = NULL;
- FullscreenWindow* _tmp0_ = NULL;
- FullscreenWindow* _tmp1_ = NULL;
+ FullscreenWindow* _tmp0_;
+ FullscreenWindow* _tmp1_;
#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_fullscreen_window;
#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2621,15 +2612,15 @@ FullscreenWindow* app_window_get_fullscreen (void) {
result = _tmp1_;
#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2597 "AppWindow.c"
+#line 2588 "AppWindow.c"
}
GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user) {
GtkBuilder* result = NULL;
GtkBuilder* builder = NULL;
- GtkBuilder* _tmp0_ = NULL;
- void* _tmp6_ = NULL;
+ GtkBuilder* _tmp0_;
+ void* _tmp6_;
GError * _inner_error_ = NULL;
#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (glade_filename != NULL, NULL);
@@ -2637,11 +2628,11 @@ 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 2613 "AppWindow.c"
+#line 2604 "AppWindow.c"
{
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = glade_filename;
#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2654,16 +2645,16 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
_g_free0 (_tmp3_);
#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2630 "AppWindow.c"
- goto __catch227_g_error;
+#line 2621 "AppWindow.c"
+ goto __catch228_g_error;
}
}
- goto __finally227;
- __catch227_g_error:
+ goto __finally228;
+ __catch228_g_error:
{
GError* _error_ = NULL;
- GError* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ GError* _tmp4_;
+ const gchar* _tmp5_;
#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
_error_ = _inner_error_;
#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2676,9 +2667,9 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
g_warning ("AppWindow.vala:482: Unable to create Gtk.Builder: %s\n", _tmp5_);
#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (_error_);
-#line 2652 "AppWindow.c"
+#line 2643 "AppWindow.c"
}
- __finally227:
+ __finally228:
#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2689,7 +2680,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 2665 "AppWindow.c"
+#line 2656 "AppWindow.c"
}
#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = user;
@@ -2699,13 +2690,13 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
result = builder;
#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2675 "AppWindow.c"
+#line 2666 "AppWindow.c"
}
void app_window_error_message (const gchar* message, GtkWindow* parent) {
- const gchar* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ GtkWindow* _tmp1_;
#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (message != NULL);
#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2716,26 +2707,26 @@ void app_window_error_message (const gchar* message, GtkWindow* parent) {
_tmp1_ = parent;
#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 2692 "AppWindow.c"
+#line 2683 "AppWindow.c"
}
void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape) {
GtkWindow* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
+ GtkWindow* _tmp1_;
GtkMessageDialog* dialog = NULL;
- const gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- GtkMessageDialog* _tmp10_ = NULL;
- GtkMessageDialog* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gboolean _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ GtkMessageDialog* _tmp10_;
+ GtkMessageDialog* _tmp11_;
+ const gchar* _tmp12_;
+ const gchar* _tmp13_;
+ gboolean _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (title != NULL);
#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2746,9 +2737,9 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
_tmp1_ = parent;
#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 2722 "AppWindow.c"
- GtkWindow* _tmp2_ = NULL;
- GtkWindow* _tmp3_ = NULL;
+#line 2713 "AppWindow.c"
+ GtkWindow* _tmp2_;
+ GtkWindow* _tmp3_;
#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2757,16 +2748,16 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
_g_object_unref0 (_tmp0_);
#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 2733 "AppWindow.c"
+#line 2724 "AppWindow.c"
} else {
- AppWindow* _tmp4_ = NULL;
+ AppWindow* _tmp4_;
#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2742 "AppWindow.c"
+#line 2733 "AppWindow.c"
}
#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = title;
@@ -2812,29 +2803,29 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
_g_object_unref0 (dialog);
#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 2788 "AppWindow.c"
+#line 2779 "AppWindow.c"
}
gboolean app_window_negate_affirm_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent) {
gboolean result = FALSE;
GtkWindow* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
+ GtkWindow* _tmp1_;
GtkMessageDialog* dialog = NULL;
- const gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- GtkMessageDialog* _tmp9_ = NULL;
- GtkMessageDialog* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ GtkMessageDialog* _tmp9_;
+ GtkMessageDialog* _tmp10_;
+ const gchar* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
+ const gchar* _tmp15_;
+ const gchar* _tmp16_;
gboolean response = FALSE;
- gint _tmp17_ = 0;
+ gint _tmp17_;
#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (message != NULL, FALSE);
#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2847,9 +2838,9 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
_tmp1_ = parent;
#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 2823 "AppWindow.c"
- GtkWindow* _tmp2_ = NULL;
- GtkWindow* _tmp3_ = NULL;
+#line 2814 "AppWindow.c"
+ GtkWindow* _tmp2_;
+ GtkWindow* _tmp3_;
#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2858,16 +2849,16 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
_g_object_unref0 (_tmp0_);
#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 2834 "AppWindow.c"
+#line 2825 "AppWindow.c"
} else {
- AppWindow* _tmp4_ = NULL;
+ AppWindow* _tmp4_;
#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2843 "AppWindow.c"
+#line 2834 "AppWindow.c"
}
#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = title;
@@ -2921,30 +2912,29 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
_g_object_unref0 (_tmp0_);
#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2897 "AppWindow.c"
+#line 2888 "AppWindow.c"
}
GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent) {
GtkResponseType result = 0;
GtkWindow* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
+ GtkWindow* _tmp1_;
GtkMessageDialog* dialog = NULL;
- const gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- GtkMessageDialog* _tmp9_ = NULL;
- GtkMessageDialog* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ GtkMessageDialog* _tmp9_;
+ GtkMessageDialog* _tmp10_;
+ const gchar* _tmp11_;
+ const gchar* _tmp12_;
+ const gchar* _tmp13_;
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
gint response = 0;
- gint _tmp18_ = 0;
+ gint _tmp17_;
#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (message != NULL, 0);
#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2957,9 +2947,9 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
_tmp1_ = parent;
#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 2933 "AppWindow.c"
- GtkWindow* _tmp2_ = NULL;
- GtkWindow* _tmp3_ = NULL;
+#line 2923 "AppWindow.c"
+ GtkWindow* _tmp2_;
+ GtkWindow* _tmp3_;
#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2968,16 +2958,16 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
_g_object_unref0 (_tmp0_);
#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 2944 "AppWindow.c"
+#line 2934 "AppWindow.c"
} else {
- AppWindow* _tmp4_ = NULL;
+ AppWindow* _tmp4_;
#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2953 "AppWindow.c"
+#line 2943 "AppWindow.c"
}
#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = title;
@@ -3002,27 +2992,25 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = affirmative;
#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp13_ = _ ("_Cancel");
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _tmp13_, GTK_RESPONSE_CANCEL, NULL);
+ gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp14_ = title;
+ _tmp13_ = title;
#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp15_ = message;
+ _tmp14_ = message;
#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp16_ = build_alert_body_text (_tmp14_, _tmp15_, TRUE);
+ _tmp15_ = build_alert_body_text (_tmp13_, _tmp14_, TRUE);
#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp17_ = _tmp16_;
+ _tmp16_ = _tmp15_;
#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_message_dialog_set_markup (dialog, _tmp17_);
+ gtk_message_dialog_set_markup (dialog, _tmp16_);
#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp16_);
#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_set (dialog, "use-markup", TRUE, NULL);
#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
+ _tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
- response = _tmp18_;
+ response = _tmp17_;
#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3033,30 +3021,29 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
_g_object_unref0 (_tmp0_);
#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3009 "AppWindow.c"
+#line 2997 "AppWindow.c"
}
GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent) {
GtkResponseType result = 0;
GtkWindow* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
+ GtkWindow* _tmp1_;
GtkMessageDialog* dialog = NULL;
- const gchar* _tmp5_ = NULL;
- GtkMessageDialog* _tmp6_ = NULL;
- GtkMessageDialog* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- GtkMessageDialog* _tmp9_ = NULL;
+ const gchar* _tmp5_;
+ GtkMessageDialog* _tmp6_;
+ GtkMessageDialog* _tmp7_;
+ const gchar* _tmp8_;
+ GtkMessageDialog* _tmp9_;
const gchar* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- GtkMessageDialog* _tmp13_ = NULL;
- GtkMessageDialog* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
+ const gchar* _tmp11_;
+ GtkMessageDialog* _tmp13_;
+ GtkMessageDialog* _tmp14_;
+ const gchar* _tmp15_;
gint response = 0;
- GtkMessageDialog* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- GtkMessageDialog* _tmp19_ = NULL;
+ GtkMessageDialog* _tmp16_;
+ gint _tmp17_;
+ GtkMessageDialog* _tmp18_;
#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (message != NULL, 0);
#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3067,9 +3054,9 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
_tmp1_ = parent;
#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 3043 "AppWindow.c"
- GtkWindow* _tmp2_ = NULL;
- GtkWindow* _tmp3_ = NULL;
+#line 3030 "AppWindow.c"
+ GtkWindow* _tmp2_;
+ GtkWindow* _tmp3_;
#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3078,16 +3065,16 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
_g_object_unref0 (_tmp0_);
#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 3054 "AppWindow.c"
+#line 3041 "AppWindow.c"
} else {
- AppWindow* _tmp4_ = NULL;
+ AppWindow* _tmp4_;
#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3063 "AppWindow.c"
+#line 3050 "AppWindow.c"
}
#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = message;
@@ -3111,17 +3098,17 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
_tmp11_ = title;
#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp11_ != NULL) {
-#line 3087 "AppWindow.c"
- const gchar* _tmp12_ = NULL;
+#line 3074 "AppWindow.c"
+ const gchar* _tmp12_;
#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = title;
#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp12_;
-#line 3093 "AppWindow.c"
+#line 3080 "AppWindow.c"
} else {
#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = RESOURCES_APP_TITLE;
-#line 3097 "AppWindow.c"
+#line 3084 "AppWindow.c"
}
#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = dialog;
@@ -3132,19 +3119,17 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = affirmative;
#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp16_ = _ ("_Cancel");
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _tmp16_, GTK_RESPONSE_CANCEL, NULL);
+ gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp17_ = dialog;
+ _tmp16_ = dialog;
#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
+ _tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
- response = _tmp18_;
+ response = _tmp17_;
#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp19_ = dialog;
+ _tmp18_ = dialog;
#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = (GtkResponseType) response;
#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3153,29 +3138,28 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
_g_object_unref0 (_tmp0_);
#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3129 "AppWindow.c"
+#line 3114 "AppWindow.c"
}
GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* affirmative_all, const gchar* title, GtkWindow* parent) {
GtkResponseType result = 0;
GtkWindow* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
+ GtkWindow* _tmp1_;
GtkMessageDialog* dialog = NULL;
- const gchar* _tmp5_ = NULL;
- GtkMessageDialog* _tmp6_ = NULL;
+ const gchar* _tmp5_;
+ GtkMessageDialog* _tmp6_;
const gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- GtkMessageDialog* _tmp10_ = NULL;
- GtkMessageDialog* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
+ const gchar* _tmp8_;
+ GtkMessageDialog* _tmp10_;
+ GtkMessageDialog* _tmp11_;
+ const gchar* _tmp12_;
+ const gchar* _tmp13_;
+ const gchar* _tmp14_;
gint response = 0;
- GtkMessageDialog* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- GtkMessageDialog* _tmp18_ = NULL;
+ GtkMessageDialog* _tmp15_;
+ gint _tmp16_;
+ GtkMessageDialog* _tmp17_;
#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (message != NULL, 0);
#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3190,9 +3174,9 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
_tmp1_ = parent;
#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 3166 "AppWindow.c"
- GtkWindow* _tmp2_ = NULL;
- GtkWindow* _tmp3_ = NULL;
+#line 3150 "AppWindow.c"
+ GtkWindow* _tmp2_;
+ GtkWindow* _tmp3_;
#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3201,16 +3185,16 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
_g_object_unref0 (_tmp0_);
#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 3177 "AppWindow.c"
+#line 3161 "AppWindow.c"
} else {
- AppWindow* _tmp4_ = NULL;
+ AppWindow* _tmp4_;
#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3186 "AppWindow.c"
+#line 3170 "AppWindow.c"
}
#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = message;
@@ -3224,17 +3208,17 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
_tmp8_ = title;
#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp8_ != NULL) {
-#line 3200 "AppWindow.c"
- const gchar* _tmp9_ = NULL;
+#line 3184 "AppWindow.c"
+ const gchar* _tmp9_;
#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = title;
#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _tmp9_;
-#line 3206 "AppWindow.c"
+#line 3190 "AppWindow.c"
} else {
#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = RESOURCES_APP_TITLE;
-#line 3210 "AppWindow.c"
+#line 3194 "AppWindow.c"
}
#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = dialog;
@@ -3249,19 +3233,17 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = affirmative_all;
#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp15_ = _ ("_Cancel");
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _tmp15_, GTK_RESPONSE_CANCEL, NULL);
+ gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp16_ = dialog;
+ _tmp15_ = dialog;
#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
+ _tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog));
#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
- response = _tmp17_;
+ response = _tmp16_;
#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp18_ = dialog;
+ _tmp17_ = dialog;
#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = (GtkResponseType) response;
#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3270,42 +3252,39 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
_g_object_unref0 (_tmp0_);
#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3246 "AppWindow.c"
+#line 3228 "AppWindow.c"
}
void app_window_database_error (GError* err) {
- const gchar* _tmp0_ = NULL;
- GError* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ GError* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp0_ = _ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
-"not continue.\n" \
-"\n" \
-"%s");
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp1_ = err;
+ _tmp0_ = err;
#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp2_ = _tmp1_->message;
+ _tmp1_ = _tmp0_->message;
#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
+ _tmp2_ = g_strdup_printf (_ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
+"not continue.\n" \
+"\n" \
+"%s"), _tmp1_);
#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
- app_window_panic (_tmp4_);
+ app_window_panic (_tmp3_);
#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _g_free0 (_tmp4_);
-#line 3270 "AppWindow.c"
+ _g_free0 (_tmp3_);
+#line 3249 "AppWindow.c"
}
void app_window_panic (const gchar* msg) {
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- Application* _tmp2_ = NULL;
- Application* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ Application* _tmp2_;
+ Application* _tmp3_;
#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (msg != NULL);
#line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3324,7 +3303,7 @@ void app_window_panic (const gchar* msg) {
application_panic (_tmp3_);
#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
_application_unref0 (_tmp3_);
-#line 3297 "AppWindow.c"
+#line 3276 "AppWindow.c"
}
@@ -3333,7 +3312,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 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
return NULL;
-#line 3306 "AppWindow.c"
+#line 3285 "AppWindow.c"
}
@@ -3342,7 +3321,7 @@ gchar* app_window_get_app_role (AppWindow* self) {
g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 3315 "AppWindow.c"
+#line 3294 "AppWindow.c"
}
@@ -3350,16 +3329,13 @@ void app_window_on_about (AppWindow* self) {
#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
static const gchar* artists[] = {"Aachen logo under public domain license https://www.flickr.com/photos/" \
"30784528@N04/10860988196/", NULL};
-#line 3322 "AppWindow.c"
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- GdkPixbuf* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
+#line 3301 "AppWindow.c"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ GdkPixbuf* _tmp5_;
#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3367,28 +3343,22 @@ void app_window_on_about (AppWindow* self) {
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp2_ = _ (_tmp1_);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp3_ = app_window_get_app_role (self);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp4_ = _tmp3_;
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp5_ = _ ("Visit the Shotwell web site");
+ _tmp2_ = app_window_get_app_role (self);
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp6_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
+ _tmp3_ = _tmp2_;
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp8_ = _ ("translator-credits");
+ _tmp5_ = _tmp4_;
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", _tmp2_, "comments", _tmp4_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp5_, "authors", RESOURCES_AUTHORS, "logo", _tmp7_, "artists", artists, "translator-credits", _tmp8_, NULL, NULL);
+ gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", _ (_tmp1_), "comments", _tmp3_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _ ("Visit the Shotwell web site"), "authors", RESOURCES_AUTHORS, "logo", _tmp5_, "artists", artists, "translator-credits", _ ("translator-credits"), NULL, NULL);
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp5_);
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp1_);
-#line 3360 "AppWindow.c"
+#line 3330 "AppWindow.c"
}
@@ -3396,51 +3366,48 @@ static void app_window_on_help_contents (AppWindow* self) {
GError * _inner_error_ = NULL;
#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 3368 "AppWindow.c"
+#line 3338 "AppWindow.c"
{
- GdkScreen* _tmp0_ = NULL;
+ GdkScreen* _tmp0_;
#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
resources_launch_help (_tmp0_, NULL, &_inner_error_);
#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3377 "AppWindow.c"
- goto __catch228_g_error;
+#line 3347 "AppWindow.c"
+ goto __catch229_g_error;
}
}
- goto __finally228;
- __catch228_g_error:
+ goto __finally229;
+ __catch229_g_error:
{
GError* err = NULL;
- const gchar* _tmp1_ = NULL;
- GError* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ GError* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
_inner_error_ = NULL;
#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp1_ = _ ("Unable to display help: %s");
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp2_ = err;
+ _tmp1_ = err;
#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp3_ = _tmp2_->message;
+ _tmp2_ = _tmp1_->message;
#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp4_ = g_strdup_printf (_tmp1_, _tmp3_);
+ _tmp3_ = g_strdup_printf (_ ("Unable to display help: %s"), _tmp2_);
#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
- app_window_error_message (_tmp5_, NULL);
+ app_window_error_message (_tmp4_, NULL);
#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp4_);
#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 3410 "AppWindow.c"
+#line 3377 "AppWindow.c"
}
- __finally228:
+ __finally229:
#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3449,7 +3416,7 @@ static void app_window_on_help_contents (AppWindow* self) {
g_clear_error (&_inner_error_);
#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3421 "AppWindow.c"
+#line 3388 "AppWindow.c"
}
}
@@ -3458,48 +3425,45 @@ static void app_window_on_help_report_problem (AppWindow* self) {
GError * _inner_error_ = NULL;
#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 3430 "AppWindow.c"
+#line 3397 "AppWindow.c"
{
#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3436 "AppWindow.c"
- goto __catch229_g_error;
+#line 3403 "AppWindow.c"
+ goto __catch230_g_error;
}
}
- goto __finally229;
- __catch229_g_error:
+ goto __finally230;
+ __catch230_g_error:
{
GError* err = NULL;
- const gchar* _tmp0_ = NULL;
- GError* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ GError* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
_inner_error_ = NULL;
#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp0_ = _ ("Unable to navigate to bug database: %s");
-#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp1_ = err;
+ _tmp0_ = err;
#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp2_ = _tmp1_->message;
+ _tmp1_ = _tmp0_->message;
#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
+ _tmp2_ = g_strdup_printf (_ ("Unable to navigate to bug database: %s"), _tmp1_);
#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
- app_window_error_message (_tmp4_, NULL);
+ app_window_error_message (_tmp3_, NULL);
#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 3469 "AppWindow.c"
+#line 3433 "AppWindow.c"
}
- __finally229:
+ __finally230:
#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3508,7 +3472,7 @@ static void app_window_on_help_report_problem (AppWindow* self) {
g_clear_error (&_inner_error_);
#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3480 "AppWindow.c"
+#line 3444 "AppWindow.c"
}
}
@@ -3517,48 +3481,45 @@ static void app_window_on_help_faq (AppWindow* self) {
GError * _inner_error_ = NULL;
#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 3489 "AppWindow.c"
+#line 3453 "AppWindow.c"
{
#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3495 "AppWindow.c"
- goto __catch230_g_error;
+#line 3459 "AppWindow.c"
+ goto __catch231_g_error;
}
}
- goto __finally230;
- __catch230_g_error:
+ goto __finally231;
+ __catch231_g_error:
{
GError* err = NULL;
- const gchar* _tmp0_ = NULL;
- GError* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ GError* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
_inner_error_ = NULL;
#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp0_ = _ ("Unable to display FAQ: %s");
-#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp1_ = err;
+ _tmp0_ = err;
#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp2_ = _tmp1_->message;
+ _tmp1_ = _tmp0_->message;
#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
+ _tmp2_ = g_strdup_printf (_ ("Unable to display FAQ: %s"), _tmp1_);
#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
- app_window_error_message (_tmp4_, NULL);
+ app_window_error_message (_tmp3_, NULL);
#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 3528 "AppWindow.c"
+#line 3489 "AppWindow.c"
}
- __finally230:
+ __finally231:
#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3567,14 +3528,14 @@ static void app_window_on_help_faq (AppWindow* self) {
g_clear_error (&_inner_error_);
#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3539 "AppWindow.c"
+#line 3500 "AppWindow.c"
}
}
static void app_window_real_on_quit (AppWindow* self) {
- Application* _tmp0_ = NULL;
- Application* _tmp1_ = NULL;
+ Application* _tmp0_;
+ Application* _tmp1_;
#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = application_get_instance ();
#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3583,7 +3544,7 @@ static void app_window_real_on_quit (AppWindow* self) {
application_exit (_tmp1_);
#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
_application_unref0 (_tmp1_);
-#line 3555 "AppWindow.c"
+#line 3516 "AppWindow.c"
}
@@ -3592,28 +3553,28 @@ void app_window_on_quit (AppWindow* self) {
g_return_if_fail (IS_APP_WINDOW (self));
#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 3564 "AppWindow.c"
+#line 3525 "AppWindow.c"
}
void app_window_on_jump_to_file (AppWindow* self) {
- Page* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
- ViewCollection* _tmp2_ = NULL;
- ViewCollection* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gboolean _tmp5_ = FALSE;
+ Page* _tmp0_;
+ Page* _tmp1_;
+ ViewCollection* _tmp2_;
+ ViewCollection* _tmp3_;
+ gint _tmp4_;
+ gboolean _tmp5_;
MediaSource* media = NULL;
- Page* _tmp6_ = NULL;
- Page* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
- ViewCollection* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
- DataView* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- MediaSource* _tmp13_ = NULL;
- MediaSource* _tmp14_ = NULL;
- MediaSource* _tmp15_ = NULL;
+ Page* _tmp6_;
+ Page* _tmp7_;
+ ViewCollection* _tmp8_;
+ ViewCollection* _tmp9_;
+ DataView* _tmp10_;
+ DataView* _tmp11_;
+ DataSource* _tmp12_;
+ MediaSource* _tmp13_;
+ MediaSource* _tmp14_;
+ MediaSource* _tmp15_;
GError * _inner_error_ = NULL;
#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
@@ -3637,7 +3598,7 @@ void app_window_on_jump_to_file (AppWindow* self) {
if (_tmp5_) {
#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3609 "AppWindow.c"
+#line 3570 "AppWindow.c"
}
#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
@@ -3659,7 +3620,7 @@ void app_window_on_jump_to_file (AppWindow* self) {
if (_tmp13_ == NULL) {
#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp12_);
-#line 3631 "AppWindow.c"
+#line 3592 "AppWindow.c"
}
#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = _tmp13_;
@@ -3679,14 +3640,14 @@ void app_window_on_jump_to_file (AppWindow* self) {
_g_object_unref0 (media);
#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3651 "AppWindow.c"
+#line 3612 "AppWindow.c"
}
{
- AppWindow* _tmp16_ = NULL;
- AppWindow* _tmp17_ = NULL;
- MediaSource* _tmp18_ = NULL;
- GFile* _tmp19_ = NULL;
- GFile* _tmp20_ = NULL;
+ AppWindow* _tmp16_;
+ AppWindow* _tmp17_;
+ MediaSource* _tmp18_;
+ GFile* _tmp19_;
+ GFile* _tmp20_;
#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = app_window_get_instance ();
#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3705,17 +3666,17 @@ void app_window_on_jump_to_file (AppWindow* self) {
_g_object_unref0 (_tmp17_);
#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3677 "AppWindow.c"
- goto __catch231_g_error;
+#line 3638 "AppWindow.c"
+ goto __catch232_g_error;
}
}
- goto __finally231;
- __catch231_g_error:
+ goto __finally232;
+ __catch232_g_error:
{
GError* err = NULL;
- GError* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
+ GError* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3732,9 +3693,9 @@ void app_window_on_jump_to_file (AppWindow* self) {
_g_free0 (_tmp23_);
#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 3704 "AppWindow.c"
+#line 3665 "AppWindow.c"
}
- __finally231:
+ __finally232:
#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3745,11 +3706,11 @@ void app_window_on_jump_to_file (AppWindow* self) {
g_clear_error (&_inner_error_);
#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3717 "AppWindow.c"
+#line 3678 "AppWindow.c"
}
#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (media);
-#line 3721 "AppWindow.c"
+#line 3682 "AppWindow.c"
}
@@ -3759,135 +3720,177 @@ static void app_window_real_destroy (GtkWidget* base) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
#line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_quit (self);
-#line 3731 "AppWindow.c"
+#line 3692 "AppWindow.c"
}
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
+ gboolean _tmp0_ = FALSE;
+ gboolean _tmp1_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 3744 "AppWindow.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp1_ = TRUE;
+#line 3711 "AppWindow.c"
+ } else {
+ const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 3718 "AppWindow.c"
+ }
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = TRUE;
+#line 3724 "AppWindow.c"
+ } else {
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 3734 "AppWindow.c"
+ }
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 3738 "AppWindow.c"
+ gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ return result;
+#line 3746 "AppWindow.c"
+ }
{
GRegex* regex = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- GRegex* _tmp3_ = NULL;
- GRegex* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- GRegex* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp0_ = old;
-#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.34/vapi/glib-2.0.vapi"
- _tmp2_ = _tmp1_;
-#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.34/vapi/glib-2.0.vapi"
- _tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ GRegex* _tmp9_;
+ GRegex* _tmp10_;
+ gchar* _tmp11_ = NULL;
+ GRegex* _tmp12_;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3775 "AppWindow.c"
- goto __catch232_g_regex_error;
+#line 3778 "AppWindow.c"
+ goto __catch233_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/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.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 3784 "AppWindow.c"
+#line 3787 "AppWindow.c"
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp7_ = replacement;
-#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.34/vapi/glib-2.0.vapi"
- _tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3800 "AppWindow.c"
- goto __catch232_g_regex_error;
+#line 3803 "AppWindow.c"
+ goto __catch233_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/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.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 3811 "AppWindow.c"
+#line 3814 "AppWindow.c"
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 3825 "AppWindow.c"
+#line 3828 "AppWindow.c"
}
- goto __finally232;
- __catch232_g_regex_error:
+ goto __finally233;
+ __catch233_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 3839 "AppWindow.c"
+#line 3842 "AppWindow.c"
}
- __finally232:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ __finally233:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/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.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 3850 "AppWindow.c"
+#line 3853 "AppWindow.c"
}
}
void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
gchar* tmp = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gboolean _tmp2_;
GError * _inner_error_ = NULL;
#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
@@ -3903,12 +3906,12 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
_g_free0 (_tmp1_);
#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_) {
-#line 3875 "AppWindow.c"
- GFile* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
+#line 3878 "AppWindow.c"
+ GFile* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = file;
#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3935,16 +3938,16 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
_g_free0 (tmp);
#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3907 "AppWindow.c"
+#line 3910 "AppWindow.c"
}
} else {
- GFile* _tmp8_ = NULL;
- GFile* _tmp9_ = NULL;
- GFile* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
+ GFile* _tmp8_;
+ GFile* _tmp9_;
+ GFile* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ const gchar* _tmp14_;
#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = file;
#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3977,19 +3980,19 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
_g_free0 (tmp);
#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3949 "AppWindow.c"
+#line 3952 "AppWindow.c"
}
}
#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (tmp);
-#line 3954 "AppWindow.c"
+#line 3957 "AppWindow.c"
}
void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
- GdkWindow* _tmp0_ = NULL;
- GdkScreen* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ GdkWindow* _tmp0_;
+ GdkScreen* _tmp1_;
+ const gchar* _tmp2_;
GError * _inner_error_ = NULL;
#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
@@ -4009,7 +4012,7 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
g_propagate_error (error, _inner_error_);
#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3981 "AppWindow.c"
+#line 3984 "AppWindow.c"
}
}
@@ -4017,7 +4020,7 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
static void app_window_real_add_actions (AppWindow* self) {
#line 677 "/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 3989 "AppWindow.c"
+#line 3992 "AppWindow.c"
}
@@ -4026,23 +4029,23 @@ void app_window_add_actions (AppWindow* self) {
g_return_if_fail (IS_APP_WINDOW (self));
#line 676 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->add_actions (self);
-#line 3998 "AppWindow.c"
+#line 4001 "AppWindow.c"
}
void app_window_go_fullscreen (AppWindow* self, Page* page) {
- FullscreenWindow* _tmp0_ = NULL;
+ FullscreenWindow* _tmp0_;
gint _tmp2_ = 0;
gint _tmp3_ = 0;
FullscreenWindow* fsw = NULL;
- Page* _tmp4_ = NULL;
- FullscreenWindow* _tmp5_ = NULL;
- Page* _tmp6_ = NULL;
- Page* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- FullscreenWindow* _tmp12_ = NULL;
- FullscreenWindow* _tmp13_ = NULL;
- FullscreenWindow* _tmp14_ = NULL;
+ Page* _tmp4_;
+ FullscreenWindow* _tmp5_;
+ Page* _tmp6_;
+ Page* _tmp7_;
+ gboolean _tmp8_;
+ FullscreenWindow* _tmp12_;
+ FullscreenWindow* _tmp13_;
+ FullscreenWindow* _tmp14_;
#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4051,15 +4054,15 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
_tmp0_ = app_window_fullscreen_window;
#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ != NULL) {
-#line 4023 "AppWindow.c"
- FullscreenWindow* _tmp1_ = NULL;
+#line 4026 "AppWindow.c"
+ FullscreenWindow* _tmp1_;
#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = app_window_fullscreen_window;
#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4031 "AppWindow.c"
+#line 4034 "AppWindow.c"
}
#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_);
@@ -4087,10 +4090,10 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
_g_object_unref0 (_tmp7_);
#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp8_) {
-#line 4059 "AppWindow.c"
- Page* _tmp9_ = NULL;
- Page* _tmp10_ = NULL;
- FullscreenWindow* _tmp11_ = NULL;
+#line 4062 "AppWindow.c"
+ Page* _tmp9_;
+ Page* _tmp10_;
+ FullscreenWindow* _tmp11_;
#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4101,7 +4104,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
page_switching_to_fullscreen (_tmp10_, _tmp11_);
#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp10_);
-#line 4073 "AppWindow.c"
+#line 4076 "AppWindow.c"
}
#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = fsw;
@@ -4117,19 +4120,19 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (fsw);
-#line 4089 "AppWindow.c"
+#line 4092 "AppWindow.c"
}
void app_window_end_fullscreen (AppWindow* self) {
- FullscreenWindow* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- Page* _tmp3_ = NULL;
- Page* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- FullscreenWindow* _tmp9_ = NULL;
- FullscreenWindow* _tmp10_ = NULL;
+ FullscreenWindow* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ Page* _tmp3_;
+ Page* _tmp4_;
+ gboolean _tmp5_;
+ FullscreenWindow* _tmp9_;
+ FullscreenWindow* _tmp10_;
#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4138,7 +4141,7 @@ void app_window_end_fullscreen (AppWindow* self) {
if (_tmp0_ == NULL) {
#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4110 "AppWindow.c"
+#line 4113 "AppWindow.c"
}
#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->pos_x;
@@ -4158,10 +4161,10 @@ void app_window_end_fullscreen (AppWindow* self) {
_g_object_unref0 (_tmp4_);
#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp5_) {
-#line 4130 "AppWindow.c"
- Page* _tmp6_ = NULL;
- Page* _tmp7_ = NULL;
- FullscreenWindow* _tmp8_ = NULL;
+#line 4133 "AppWindow.c"
+ Page* _tmp6_;
+ Page* _tmp7_;
+ FullscreenWindow* _tmp8_;
#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4172,7 +4175,7 @@ void app_window_end_fullscreen (AppWindow* self) {
page_returning_from_fullscreen (_tmp7_, _tmp8_);
#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp7_);
-#line 4144 "AppWindow.c"
+#line 4147 "AppWindow.c"
}
#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = app_window_fullscreen_window;
@@ -4188,15 +4191,15 @@ void app_window_end_fullscreen (AppWindow* self) {
app_window_fullscreen_window = NULL;
#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 4160 "AppWindow.c"
+#line 4163 "AppWindow.c"
}
GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
GAction* result = NULL;
- const gchar* _tmp0_ = NULL;
- GAction* _tmp1_ = NULL;
- GAction* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ GAction* _tmp1_;
+ GAction* _tmp2_;
#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4211,16 +4214,16 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
result = _tmp2_;
#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 4183 "AppWindow.c"
+#line 4186 "AppWindow.c"
}
void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive) {
GSimpleAction* action = NULL;
- const gchar* _tmp0_ = NULL;
- GAction* _tmp1_ = NULL;
- GSimpleAction* _tmp2_ = NULL;
- GSimpleAction* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ GAction* _tmp1_;
+ GSimpleAction* _tmp2_;
+ GSimpleAction* _tmp3_;
#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4235,7 +4238,7 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
if (_tmp2_ == NULL) {
#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp1_);
-#line 4207 "AppWindow.c"
+#line 4210 "AppWindow.c"
}
#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp2_;
@@ -4243,29 +4246,29 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
_tmp3_ = action;
#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp3_ != NULL) {
-#line 4215 "AppWindow.c"
- GSimpleAction* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+#line 4218 "AppWindow.c"
+ GSimpleAction* _tmp4_;
+ gboolean _tmp5_;
#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = action;
#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = sensitive;
#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 4224 "AppWindow.c"
+#line 4227 "AppWindow.c"
}
#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 4228 "AppWindow.c"
+#line 4231 "AppWindow.c"
}
void app_window_set_common_action_important (AppWindow* self, const gchar* name, gboolean important) {
GSimpleAction* action = NULL;
- const gchar* _tmp0_ = NULL;
- GAction* _tmp1_ = NULL;
- GSimpleAction* _tmp2_ = NULL;
- GSimpleAction* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ GAction* _tmp1_;
+ GSimpleAction* _tmp2_;
+ GSimpleAction* _tmp3_;
#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4280,7 +4283,7 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
if (_tmp2_ == NULL) {
#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp1_);
-#line 4252 "AppWindow.c"
+#line 4255 "AppWindow.c"
}
#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp2_;
@@ -4288,10 +4291,10 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
_tmp3_ = action;
#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp3_ != NULL) {
-#line 4260 "AppWindow.c"
- GSimpleAction* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+#line 4263 "AppWindow.c"
+ GSimpleAction* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = action;
#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4300,20 +4303,20 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
_tmp6_ = _tmp5_;
#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4272 "AppWindow.c"
+#line 4275 "AppWindow.c"
}
#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 4276 "AppWindow.c"
+#line 4279 "AppWindow.c"
}
void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible) {
GSimpleAction* action = NULL;
- const gchar* _tmp0_ = NULL;
- GAction* _tmp1_ = NULL;
- GSimpleAction* _tmp2_ = NULL;
- GSimpleAction* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ GAction* _tmp1_;
+ GSimpleAction* _tmp2_;
+ GSimpleAction* _tmp3_;
#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4328,7 +4331,7 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
if (_tmp2_ == NULL) {
#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp1_);
-#line 4300 "AppWindow.c"
+#line 4303 "AppWindow.c"
}
#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp2_;
@@ -4336,10 +4339,10 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
_tmp3_ = action;
#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp3_ != NULL) {
-#line 4308 "AppWindow.c"
- GSimpleAction* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+#line 4311 "AppWindow.c"
+ GSimpleAction* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = action;
#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4348,43 +4351,43 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
_tmp6_ = _tmp5_;
#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4320 "AppWindow.c"
+#line 4323 "AppWindow.c"
}
#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 4324 "AppWindow.c"
+#line 4327 "AppWindow.c"
}
static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_update_common_actions ((AppWindow*) self);
-#line 4331 "AppWindow.c"
+#line 4334 "AppWindow.c"
}
static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_update_common_actions ((AppWindow*) self);
-#line 4338 "AppWindow.c"
+#line 4341 "AppWindow.c"
}
static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_update_common_actions ((AppWindow*) self);
-#line 4345 "AppWindow.c"
+#line 4348 "AppWindow.c"
}
static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page) {
AppWindow * self;
- Page* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
- Page* _tmp2_ = NULL;
- Page* _tmp15_ = NULL;
- Page* _tmp34_ = NULL;
- Page* _tmp35_ = NULL;
+ Page* _tmp0_;
+ Page* _tmp1_;
+ Page* _tmp2_;
+ Page* _tmp15_;
+ Page* _tmp34_;
+ Page* _tmp35_;
#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4401,19 +4404,19 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
_tmp2_ = old_page;
#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 4373 "AppWindow.c"
- Page* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- guint _tmp6_ = 0U;
- Page* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
- ViewCollection* _tmp9_ = NULL;
- guint _tmp10_ = 0U;
- Page* _tmp11_ = NULL;
- ViewCollection* _tmp12_ = NULL;
- ViewCollection* _tmp13_ = NULL;
- guint _tmp14_ = 0U;
+#line 4376 "AppWindow.c"
+ Page* _tmp3_;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ guint _tmp6_;
+ Page* _tmp7_;
+ ViewCollection* _tmp8_;
+ ViewCollection* _tmp9_;
+ guint _tmp10_;
+ Page* _tmp11_;
+ ViewCollection* _tmp12_;
+ ViewCollection* _tmp13_;
+ guint _tmp14_;
#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = old_page;
#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4450,31 +4453,31 @@ 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 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp13_);
-#line 4422 "AppWindow.c"
+#line 4425 "AppWindow.c"
}
#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = new_page;
#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp15_ != NULL) {
-#line 4428 "AppWindow.c"
- Page* _tmp16_ = NULL;
- ViewCollection* _tmp17_ = NULL;
- ViewCollection* _tmp18_ = NULL;
- Page* _tmp19_ = NULL;
- ViewCollection* _tmp20_ = NULL;
- ViewCollection* _tmp21_ = NULL;
- Page* _tmp22_ = NULL;
- ViewCollection* _tmp23_ = NULL;
- ViewCollection* _tmp24_ = NULL;
- Page* _tmp25_ = NULL;
- Page* _tmp26_ = NULL;
- ViewCollection* _tmp27_ = NULL;
- ViewCollection* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- Page* _tmp30_ = NULL;
- ViewCollection* _tmp31_ = NULL;
- ViewCollection* _tmp32_ = NULL;
- gint _tmp33_ = 0;
+#line 4431 "AppWindow.c"
+ Page* _tmp16_;
+ ViewCollection* _tmp17_;
+ ViewCollection* _tmp18_;
+ Page* _tmp19_;
+ ViewCollection* _tmp20_;
+ ViewCollection* _tmp21_;
+ Page* _tmp22_;
+ ViewCollection* _tmp23_;
+ ViewCollection* _tmp24_;
+ Page* _tmp25_;
+ Page* _tmp26_;
+ ViewCollection* _tmp27_;
+ ViewCollection* _tmp28_;
+ gint _tmp29_;
+ Page* _tmp30_;
+ ViewCollection* _tmp31_;
+ ViewCollection* _tmp32_;
+ gint _tmp33_;
#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = new_page;
#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4529,7 +4532,7 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
_data_collection_unref0 (_tmp32_);
#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp28_);
-#line 4501 "AppWindow.c"
+#line 4504 "AppWindow.c"
}
#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_ = old_page;
@@ -4537,13 +4540,13 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
_tmp35_ = new_page;
#line 758 "/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 4509 "AppWindow.c"
+#line 4512 "AppWindow.c"
}
static void app_window_real_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
gboolean is_checkerboard = FALSE;
- Page* _tmp0_ = NULL;
+ Page* _tmp0_;
#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4556,7 +4559,7 @@ static void app_window_real_update_common_action_availability (AppWindow* self,
app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
#line 768 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 4528 "AppWindow.c"
+#line 4531 "AppWindow.c"
}
@@ -4565,26 +4568,26 @@ void app_window_update_common_action_availability (AppWindow* self, Page* old_pa
g_return_if_fail (IS_APP_WINDOW (self));
#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 4537 "AppWindow.c"
+#line 4540 "AppWindow.c"
}
static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
- Page* _tmp0_ = NULL;
- gint _tmp2_ = 0;
+ Page* _tmp0_;
+ gint _tmp2_;
#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE (page));
#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = page;
#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 4550 "AppWindow.c"
- gint _tmp1_ = 0;
+#line 4553 "AppWindow.c"
+ gint _tmp1_;
#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = count;
#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 4556 "AppWindow.c"
+#line 4559 "AppWindow.c"
}
#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = selected_count;
@@ -4594,7 +4597,7 @@ static void app_window_real_update_common_actions (AppWindow* self, Page* page,
app_window_decorate_undo_action (self);
#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_decorate_redo_action (self);
-#line 4566 "AppWindow.c"
+#line 4569 "AppWindow.c"
}
@@ -4603,14 +4606,14 @@ void app_window_update_common_actions (AppWindow* self, Page* page, gint selecte
g_return_if_fail (IS_APP_WINDOW (self));
#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 4575 "AppWindow.c"
+#line 4578 "AppWindow.c"
}
static void app_window_on_update_common_actions (AppWindow* self) {
Page* page = NULL;
- Page* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
+ Page* _tmp0_;
+ Page* _tmp1_;
#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4621,16 +4624,16 @@ static void app_window_on_update_common_actions (AppWindow* self) {
_tmp1_ = page;
#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 4593 "AppWindow.c"
- Page* _tmp2_ = NULL;
- Page* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- gint _tmp6_ = 0;
- Page* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
- ViewCollection* _tmp9_ = NULL;
- gint _tmp10_ = 0;
+#line 4596 "AppWindow.c"
+ Page* _tmp2_;
+ Page* _tmp3_;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ gint _tmp6_;
+ Page* _tmp7_;
+ ViewCollection* _tmp8_;
+ ViewCollection* _tmp9_;
+ gint _tmp10_;
#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = page;
#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4655,25 +4658,25 @@ static void app_window_on_update_common_actions (AppWindow* self) {
_data_collection_unref0 (_tmp9_);
#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp5_);
-#line 4627 "AppWindow.c"
+#line 4630 "AppWindow.c"
}
#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (page);
-#line 4631 "AppWindow.c"
+#line 4634 "AppWindow.c"
}
void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label) {
GMenu* bar = NULL;
- Page* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
- GMenuModel* _tmp2_ = NULL;
- GMenu* _tmp3_ = NULL;
- GMenu* _tmp4_ = NULL;
- GMenu* _tmp5_ = NULL;
+ Page* _tmp0_;
+ Page* _tmp1_;
+ GMenuModel* _tmp2_;
+ GMenu* _tmp3_;
+ GMenu* _tmp4_;
+ GMenu* _tmp5_;
gint items = 0;
- GMenu* _tmp6_ = NULL;
- gint _tmp7_ = 0;
+ GMenu* _tmp6_;
+ gint _tmp7_;
#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4692,7 +4695,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
if (_tmp3_ == NULL) {
#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp2_);
-#line 4664 "AppWindow.c"
+#line 4667 "AppWindow.c"
}
#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
@@ -4708,7 +4711,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_g_object_unref0 (bar);
#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4680 "AppWindow.c"
+#line 4683 "AppWindow.c"
}
#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = bar;
@@ -4716,38 +4719,38 @@ 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 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
items = _tmp7_;
-#line 4688 "AppWindow.c"
+#line 4691 "AppWindow.c"
{
gint i = 0;
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
i = 0;
-#line 4693 "AppWindow.c"
+#line 4696 "AppWindow.c"
{
gboolean _tmp8_ = FALSE;
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = TRUE;
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
while (TRUE) {
-#line 4700 "AppWindow.c"
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+#line 4703 "AppWindow.c"
+ gint _tmp10_;
+ gint _tmp11_;
GMenuModel* model = NULL;
- GMenu* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- GMenuModel* _tmp14_ = NULL;
- GMenu* _tmp15_ = NULL;
+ GMenu* _tmp12_;
+ gint _tmp13_;
+ GMenuModel* _tmp14_;
+ GMenu* _tmp15_;
gint model_items = 0;
- GMenuModel* _tmp16_ = NULL;
- gint _tmp17_ = 0;
+ GMenuModel* _tmp16_;
+ gint _tmp17_;
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp8_) {
-#line 4713 "AppWindow.c"
- gint _tmp9_ = 0;
+#line 4716 "AppWindow.c"
+ gint _tmp9_;
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = i;
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
i = _tmp9_ + 1;
-#line 4719 "AppWindow.c"
+#line 4722 "AppWindow.c"
}
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = FALSE;
@@ -4759,7 +4762,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
if (!(_tmp10_ < _tmp11_)) {
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
break;
-#line 4731 "AppWindow.c"
+#line 4734 "AppWindow.c"
}
#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = bar;
@@ -4777,7 +4780,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_g_object_unref0 (model);
#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
continue;
-#line 4749 "AppWindow.c"
+#line 4752 "AppWindow.c"
}
#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = model;
@@ -4785,38 +4788,38 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_tmp17_ = g_menu_model_get_n_items (_tmp16_);
#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
model_items = _tmp17_;
-#line 4757 "AppWindow.c"
+#line 4760 "AppWindow.c"
{
gint j = 0;
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
j = 0;
-#line 4762 "AppWindow.c"
+#line 4765 "AppWindow.c"
{
gboolean _tmp18_ = FALSE;
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = TRUE;
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
while (TRUE) {
-#line 4769 "AppWindow.c"
- gint _tmp20_ = 0;
- gint _tmp21_ = 0;
+#line 4772 "AppWindow.c"
+ gint _tmp20_;
+ gint _tmp21_;
GMenuModel* subsection = NULL;
- GMenuModel* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- GMenuModel* _tmp24_ = NULL;
- GMenuModel* _tmp25_ = NULL;
+ GMenuModel* _tmp22_;
+ gint _tmp23_;
+ GMenuModel* _tmp24_;
+ GMenuModel* _tmp25_;
gint sub_items = 0;
- GMenuModel* _tmp26_ = NULL;
- gint _tmp27_ = 0;
+ GMenuModel* _tmp26_;
+ gint _tmp27_;
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp18_) {
-#line 4782 "AppWindow.c"
- gint _tmp19_ = 0;
+#line 4785 "AppWindow.c"
+ gint _tmp19_;
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp19_ = j;
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
j = _tmp19_ + 1;
-#line 4788 "AppWindow.c"
+#line 4791 "AppWindow.c"
}
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = FALSE;
@@ -4828,7 +4831,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
if (!(_tmp20_ < _tmp21_)) {
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
break;
-#line 4800 "AppWindow.c"
+#line 4803 "AppWindow.c"
}
#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_ = model;
@@ -4846,7 +4849,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_g_object_unref0 (subsection);
#line 809 "/home/jens/Source/shotwell/src/AppWindow.vala"
continue;
-#line 4818 "AppWindow.c"
+#line 4821 "AppWindow.c"
}
#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp26_ = subsection;
@@ -4854,34 +4857,34 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_tmp27_ = g_menu_model_get_n_items (_tmp26_);
#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
sub_items = _tmp27_;
-#line 4826 "AppWindow.c"
+#line 4829 "AppWindow.c"
{
gint k = 0;
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
k = 0;
-#line 4831 "AppWindow.c"
+#line 4834 "AppWindow.c"
{
gboolean _tmp28_ = FALSE;
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_ = TRUE;
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
while (TRUE) {
-#line 4838 "AppWindow.c"
- gint _tmp30_ = 0;
- gint _tmp31_ = 0;
+#line 4841 "AppWindow.c"
+ gint _tmp30_;
+ gint _tmp31_;
GMenuAttributeIter* it = NULL;
- GMenuModel* _tmp32_ = NULL;
- gint _tmp33_ = 0;
- GMenuAttributeIter* _tmp34_ = NULL;
+ GMenuModel* _tmp32_;
+ gint _tmp33_;
+ GMenuAttributeIter* _tmp34_;
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp28_) {
-#line 4847 "AppWindow.c"
- gint _tmp29_ = 0;
+#line 4850 "AppWindow.c"
+ gint _tmp29_;
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp29_ = k;
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
k = _tmp29_ + 1;
-#line 4853 "AppWindow.c"
+#line 4856 "AppWindow.c"
}
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_ = FALSE;
@@ -4893,7 +4896,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
if (!(_tmp30_ < _tmp31_)) {
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
break;
-#line 4865 "AppWindow.c"
+#line 4868 "AppWindow.c"
}
#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp32_ = subsection;
@@ -4905,13 +4908,13 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
it = _tmp34_;
#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
while (TRUE) {
-#line 4877 "AppWindow.c"
- GMenuAttributeIter* _tmp35_ = NULL;
- gboolean _tmp36_ = FALSE;
+#line 4880 "AppWindow.c"
+ GMenuAttributeIter* _tmp35_;
+ gboolean _tmp36_;
gboolean _tmp37_ = FALSE;
gboolean _tmp38_ = FALSE;
- GMenuAttributeIter* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
+ GMenuAttributeIter* _tmp39_;
+ const gchar* _tmp40_;
#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp35_ = it;
#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4920,7 +4923,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
if (!_tmp36_) {
#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
break;
-#line 4892 "AppWindow.c"
+#line 4895 "AppWindow.c"
}
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp39_ = it;
@@ -4928,12 +4931,12 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_tmp40_ = g_menu_attribute_iter_get_name (_tmp39_);
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (g_strcmp0 (_tmp40_, "id") == 0) {
-#line 4900 "AppWindow.c"
- GMenuAttributeIter* _tmp41_ = NULL;
- GVariant* _tmp42_ = NULL;
- GVariant* _tmp43_ = NULL;
- const gchar* _tmp44_ = NULL;
- const gchar* _tmp45_ = NULL;
+#line 4903 "AppWindow.c"
+ GMenuAttributeIter* _tmp41_;
+ GVariant* _tmp42_;
+ GVariant* _tmp43_;
+ const gchar* _tmp44_;
+ const gchar* _tmp45_;
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp41_ = it;
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4948,36 +4951,36 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0;
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_variant_unref0 (_tmp43_);
-#line 4920 "AppWindow.c"
+#line 4923 "AppWindow.c"
} else {
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp38_ = FALSE;
-#line 4924 "AppWindow.c"
+#line 4927 "AppWindow.c"
}
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp38_) {
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp37_ = TRUE;
-#line 4930 "AppWindow.c"
+#line 4933 "AppWindow.c"
} else {
gboolean _tmp46_ = FALSE;
- GMenuAttributeIter* _tmp47_ = NULL;
- const gchar* _tmp48_ = NULL;
+ GMenuAttributeIter* _tmp47_;
+ const gchar* _tmp48_;
#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp47_ = it;
#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp48_ = g_menu_attribute_iter_get_name (_tmp47_);
#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (g_strcmp0 (_tmp48_, "action") == 0) {
-#line 4941 "AppWindow.c"
- GMenuAttributeIter* _tmp49_ = NULL;
- GVariant* _tmp50_ = NULL;
- GVariant* _tmp51_ = NULL;
- const gchar* _tmp52_ = NULL;
- const gchar* _tmp53_ = NULL;
- gchar* _tmp54_ = NULL;
- gchar* _tmp55_ = NULL;
- gboolean _tmp56_ = FALSE;
+#line 4944 "AppWindow.c"
+ GMenuAttributeIter* _tmp49_;
+ GVariant* _tmp50_;
+ GVariant* _tmp51_;
+ const gchar* _tmp52_;
+ const gchar* _tmp53_;
+ gchar* _tmp54_;
+ gchar* _tmp55_;
+ gboolean _tmp56_;
#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp49_ = it;
#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5000,33 +5003,33 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_g_free0 (_tmp55_);
#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_variant_unref0 (_tmp51_);
-#line 4972 "AppWindow.c"
+#line 4975 "AppWindow.c"
} else {
#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp46_ = FALSE;
-#line 4976 "AppWindow.c"
+#line 4979 "AppWindow.c"
}
#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp37_ = _tmp46_;
-#line 4980 "AppWindow.c"
+#line 4983 "AppWindow.c"
}
#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp37_) {
-#line 4984 "AppWindow.c"
+#line 4987 "AppWindow.c"
GMenu* md = NULL;
- GMenuModel* _tmp57_ = NULL;
- GMenu* _tmp58_ = NULL;
+ GMenuModel* _tmp57_;
+ GMenu* _tmp58_;
GMenuItem* m = NULL;
- GMenuModel* _tmp59_ = NULL;
- gint _tmp60_ = 0;
- GMenuItem* _tmp61_ = NULL;
- GMenuItem* _tmp62_ = NULL;
- const gchar* _tmp63_ = NULL;
- GMenu* _tmp64_ = NULL;
- gint _tmp65_ = 0;
- GMenu* _tmp66_ = NULL;
- gint _tmp67_ = 0;
- GMenuItem* _tmp68_ = NULL;
+ GMenuModel* _tmp59_;
+ gint _tmp60_;
+ GMenuItem* _tmp61_;
+ GMenuItem* _tmp62_;
+ const gchar* _tmp63_;
+ GMenu* _tmp64_;
+ gint _tmp65_;
+ GMenu* _tmp66_;
+ gint _tmp67_;
+ GMenuItem* _tmp68_;
#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp57_ = subsection;
#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5075,44 +5078,44 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
_g_object_unref0 (bar);
#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 5047 "AppWindow.c"
+#line 5050 "AppWindow.c"
}
}
#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (it);
-#line 5052 "AppWindow.c"
+#line 5055 "AppWindow.c"
}
}
}
#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (subsection);
-#line 5058 "AppWindow.c"
+#line 5061 "AppWindow.c"
}
}
}
#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (model);
-#line 5064 "AppWindow.c"
+#line 5067 "AppWindow.c"
}
}
}
#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (bar);
-#line 5070 "AppWindow.c"
+#line 5073 "AppWindow.c"
}
static gpointer _command_manager_ref0 (gpointer self) {
#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
return self ? command_manager_ref (self) : NULL;
-#line 5077 "AppWindow.c"
+#line 5080 "AppWindow.c"
}
CommandManager* app_window_get_command_manager (void) {
CommandManager* result = NULL;
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_command_manager;
#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5121,7 +5124,7 @@ CommandManager* app_window_get_command_manager (void) {
result = _tmp1_;
#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 5093 "AppWindow.c"
+#line 5096 "AppWindow.c"
}
@@ -5132,22 +5135,22 @@ static void app_window_on_command_manager_altered (AppWindow* self) {
app_window_decorate_undo_action (self);
#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_decorate_redo_action (self);
-#line 5104 "AppWindow.c"
+#line 5107 "AppWindow.c"
}
static void app_window_decorate_command_manager_action (AppWindow* self, const gchar* name, const gchar* prefix, const gchar* default_explanation, CommandDescription* desc) {
GSimpleAction* action = NULL;
- const gchar* _tmp0_ = NULL;
- GAction* _tmp1_ = NULL;
- GSimpleAction* _tmp2_ = NULL;
- GSimpleAction* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ GAction* _tmp1_;
+ GSimpleAction* _tmp2_;
+ GSimpleAction* _tmp3_;
gchar* label = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- CommandDescription* _tmp6_ = NULL;
- const gchar* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ CommandDescription* _tmp6_;
+ const gchar* _tmp18_;
+ const gchar* _tmp19_;
#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5168,7 +5171,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
if (_tmp2_ == NULL) {
#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp1_);
-#line 5140 "AppWindow.c"
+#line 5143 "AppWindow.c"
}
#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp2_;
@@ -5180,7 +5183,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
_g_object_unref0 (action);
#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 5152 "AppWindow.c"
+#line 5155 "AppWindow.c"
}
#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = prefix;
@@ -5192,15 +5195,15 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
_tmp6_ = desc;
#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp6_ != NULL) {
-#line 5164 "AppWindow.c"
- const gchar* _tmp7_ = NULL;
- CommandDescription* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- GSimpleAction* _tmp14_ = NULL;
+#line 5167 "AppWindow.c"
+ const gchar* _tmp7_;
+ CommandDescription* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ GSimpleAction* _tmp14_;
#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = label;
#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5227,11 +5230,11 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
_tmp14_ = action;
#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_simple_action_set_enabled (_tmp14_, TRUE);
-#line 5199 "AppWindow.c"
+#line 5202 "AppWindow.c"
} else {
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- GSimpleAction* _tmp17_ = NULL;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
+ GSimpleAction* _tmp17_;
#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = prefix;
#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5244,7 +5247,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
_tmp17_ = action;
#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_simple_action_set_enabled (_tmp17_, FALSE);
-#line 5216 "AppWindow.c"
+#line 5219 "AppWindow.c"
}
#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = name;
@@ -5256,15 +5259,15 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
_g_free0 (label);
#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 5228 "AppWindow.c"
+#line 5231 "AppWindow.c"
}
void app_window_decorate_undo_action (AppWindow* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
- CommandDescription* _tmp2_ = NULL;
- CommandDescription* _tmp3_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
+ CommandDescription* _tmp2_;
+ CommandDescription* _tmp3_;
#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5281,15 +5284,15 @@ void app_window_decorate_undo_action (AppWindow* self) {
_g_object_unref0 (_tmp3_);
#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
_command_manager_unref0 (_tmp1_);
-#line 5253 "AppWindow.c"
+#line 5256 "AppWindow.c"
}
void app_window_decorate_redo_action (AppWindow* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
- CommandDescription* _tmp2_ = NULL;
- CommandDescription* _tmp3_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
+ CommandDescription* _tmp2_;
+ CommandDescription* _tmp3_;
#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5306,39 +5309,39 @@ void app_window_decorate_redo_action (AppWindow* self) {
_g_object_unref0 (_tmp3_);
#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
_command_manager_unref0 (_tmp1_);
-#line 5278 "AppWindow.c"
+#line 5281 "AppWindow.c"
}
static void app_window_on_undo (AppWindow* self) {
- CommandManager* _tmp0_ = NULL;
+ CommandManager* _tmp0_;
#line 872 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_command_manager;
#line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
command_manager_undo (_tmp0_);
-#line 5290 "AppWindow.c"
+#line 5293 "AppWindow.c"
}
static void app_window_on_redo (AppWindow* self) {
- CommandManager* _tmp0_ = NULL;
+ CommandManager* _tmp0_;
#line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_command_manager;
#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
command_manager_redo (_tmp0_);
-#line 5302 "AppWindow.c"
+#line 5305 "AppWindow.c"
}
static void app_window_on_select_all (AppWindow* self) {
Page* page = NULL;
- Page* _tmp0_ = NULL;
- CheckerboardPage* _tmp1_ = NULL;
- Page* _tmp2_ = NULL;
+ Page* _tmp0_;
+ CheckerboardPage* _tmp1_;
+ Page* _tmp2_;
#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5349,7 +5352,7 @@ static void app_window_on_select_all (AppWindow* self) {
if (_tmp1_ == NULL) {
#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 5321 "AppWindow.c"
+#line 5324 "AppWindow.c"
}
#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
@@ -5357,10 +5360,10 @@ static void app_window_on_select_all (AppWindow* self) {
_tmp2_ = page;
#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 5329 "AppWindow.c"
- Page* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
+#line 5332 "AppWindow.c"
+ Page* _tmp3_;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page;
#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5371,19 +5374,19 @@ static void app_window_on_select_all (AppWindow* self) {
view_collection_select_all (_tmp5_);
#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp5_);
-#line 5343 "AppWindow.c"
+#line 5346 "AppWindow.c"
}
#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (page);
-#line 5347 "AppWindow.c"
+#line 5350 "AppWindow.c"
}
static void app_window_on_select_none (AppWindow* self) {
Page* page = NULL;
- Page* _tmp0_ = NULL;
- CheckerboardPage* _tmp1_ = NULL;
- Page* _tmp2_ = NULL;
+ Page* _tmp0_;
+ CheckerboardPage* _tmp1_;
+ Page* _tmp2_;
#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5394,7 +5397,7 @@ static void app_window_on_select_none (AppWindow* self) {
if (_tmp1_ == NULL) {
#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 5366 "AppWindow.c"
+#line 5369 "AppWindow.c"
}
#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
@@ -5402,10 +5405,10 @@ static void app_window_on_select_none (AppWindow* self) {
_tmp2_ = page;
#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 5374 "AppWindow.c"
- Page* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
+#line 5377 "AppWindow.c"
+ Page* _tmp3_;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page;
#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5416,22 +5419,22 @@ static void app_window_on_select_none (AppWindow* self) {
view_collection_unselect_all (_tmp5_);
#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp5_);
-#line 5388 "AppWindow.c"
+#line 5391 "AppWindow.c"
}
#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (page);
-#line 5392 "AppWindow.c"
+#line 5395 "AppWindow.c"
}
static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event) {
AppWindow * self;
gboolean result = FALSE;
- GdkWindow* _tmp0_ = NULL;
- GdkWindowState _tmp1_ = 0;
- gboolean _tmp2_ = FALSE;
- GdkEventConfigure* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ GdkWindow* _tmp0_;
+ GdkWindowState _tmp1_;
+ gboolean _tmp2_;
+ GdkEventConfigure* _tmp5_;
+ gboolean _tmp6_;
#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5446,7 +5449,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
_tmp2_ = self->maximized;
#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp2_) {
-#line 5418 "AppWindow.c"
+#line 5421 "AppWindow.c"
gint _tmp3_ = 0;
gint _tmp4_ = 0;
#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5455,7 +5458,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
self->dimensions.width = _tmp3_;
#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->dimensions.height = _tmp4_;
-#line 5427 "AppWindow.c"
+#line 5430 "AppWindow.c"
}
#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = event;
@@ -5465,7 +5468,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
result = _tmp6_;
#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 5437 "AppWindow.c"
+#line 5440 "AppWindow.c"
}
@@ -5473,26 +5476,26 @@ static void app_window_class_init (AppWindowClass * klass) {
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_parent_class = g_type_class_peek_parent (klass);
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) app_window_real_on_fullscreen;
+ ((AppWindowClass *) klass)->on_fullscreen = (void (*) (AppWindow *)) app_window_real_on_fullscreen;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) app_window_real_get_app_role;
+ ((AppWindowClass *) klass)->get_app_role = (gchar* (*) (AppWindow *)) app_window_real_get_app_role;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) app_window_real_on_quit;
+ ((AppWindowClass *) klass)->on_quit = (void (*) (AppWindow *)) app_window_real_on_quit;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->destroy = (void (*)(GtkWidget*)) app_window_real_destroy;
+ ((GtkWidgetClass *) klass)->destroy = (void (*) (GtkWidget *)) app_window_real_destroy;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((AppWindowClass *) klass)->add_actions = (void (*)(AppWindow*)) app_window_real_add_actions;
+ ((AppWindowClass *) klass)->add_actions = (void (*) (AppWindow *)) app_window_real_add_actions;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((PageWindowClass *) klass)->switched_pages = (void (*)(PageWindow*, Page*, Page*)) app_window_real_switched_pages;
+ ((PageWindowClass *) klass)->switched_pages = (void (*) (PageWindow *, Page*, Page*)) app_window_real_switched_pages;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((AppWindowClass *) klass)->update_common_action_availability = (void (*)(AppWindow*, Page*, Page*)) app_window_real_update_common_action_availability;
+ ((AppWindowClass *) klass)->update_common_action_availability = (void (*) (AppWindow *, Page*, Page*)) app_window_real_update_common_action_availability;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((AppWindowClass *) klass)->update_common_actions = (void (*)(AppWindow*, Page*, gint, gint)) app_window_real_update_common_actions;
+ ((AppWindowClass *) klass)->update_common_actions = (void (*) (AppWindow *, Page*, gint, gint)) app_window_real_update_common_actions;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
- ((GtkWidgetClass *) klass)->configure_event = (gboolean (*)(GtkWidget*, GdkEventConfigure*)) app_window_real_configure_event;
+ ((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) app_window_real_configure_event;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (klass)->finalize = app_window_finalize;
-#line 5464 "AppWindow.c"
+#line 5467 "AppWindow.c"
}
@@ -5503,17 +5506,17 @@ 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 5475 "AppWindow.c"
+#line 5478 "AppWindow.c"
}
-static void app_window_finalize (GObject* obj) {
+static void app_window_finalize (GObject * obj) {
AppWindow * self;
#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
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 5485 "AppWindow.c"
+#line 5488 "AppWindow.c"
}