summaryrefslogtreecommitdiff
path: root/src/SlideshowPage.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
commitabdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch)
tree26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/SlideshowPage.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parentdd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/SlideshowPage.c')
-rw-r--r--src/SlideshowPage.c1600
1 files changed, 780 insertions, 820 deletions
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index c188275..642fce7 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1,4 +1,4 @@
-/* SlideshowPage.c generated by valac 0.34.7, the Vala compiler
+/* SlideshowPage.c generated by valac 0.36.6, the Vala compiler
* generated from SlideshowPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -294,6 +294,11 @@ typedef struct _SlideshowPageSettingsDialogClass SlideshowPageSettingsDialogClas
#define _pango_attribute_destroy0(var) ((var == NULL) ? NULL : (var = (pango_attribute_destroy (var), NULL)))
#define _pango_attr_list_unref0(var) ((var == NULL) ? NULL : (var = (pango_attr_list_unref (var), NULL)))
typedef struct _SlideshowPageSettingsDialogPrivate SlideshowPageSettingsDialogPrivate;
+enum {
+ SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL,
+ SLIDESHOW_PAGE_LAST_SIGNAL
+};
+static guint slideshow_page_signals[SLIDESHOW_PAGE_LAST_SIGNAL] = {0};
struct _Page {
GtkScrolledWindow parent_instance;
@@ -566,7 +571,7 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul
PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target);
PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target);
GType direction_get_type (void) G_GNUC_CONST;
-static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo** next, GdkPixbuf** next_pixbuf);
+static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo* * next, GdkPixbuf* * next_pixbuf);
void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction);
GType photo_exception_get_type (void) G_GNUC_CONST;
void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result);
@@ -588,7 +593,7 @@ GtkWindow* page_get_container (Page* self);
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
void app_window_end_fullscreen (AppWindow* self);
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource** next, DataSource** prev, const gchar* type_selector);
+gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector);
#define PHOTO_TYPENAME "thumb"
GType background_job_job_priority_get_type (void) G_GNUC_CONST;
void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force);
@@ -644,8 +649,8 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
#define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN 0.1
#define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX 1.0
-static void slideshow_page_settings_dialog_finalize (GObject* obj);
-static void slideshow_page_finalize (GObject* obj);
+static void slideshow_page_settings_dialog_finalize (GObject * obj);
+static void slideshow_page_finalize (GObject * obj);
static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -653,90 +658,81 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
static gpointer _data_collection_ref0 (gpointer self) {
#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return self ? data_collection_ref (self) : NULL;
-#line 657 "SlideshowPage.c"
+#line 662 "SlideshowPage.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 664 "SlideshowPage.c"
+#line 669 "SlideshowPage.c"
}
static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
#line 163 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 671 "SlideshowPage.c"
+#line 676 "SlideshowPage.c"
}
static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
#line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
slideshow_page_on_play_pause ((SlideshowPage*) self);
-#line 678 "SlideshowPage.c"
+#line 683 "SlideshowPage.c"
}
static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
#line 177 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 685 "SlideshowPage.c"
+#line 690 "SlideshowPage.c"
}
static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
#line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
slideshow_page_on_change_settings ((SlideshowPage*) self);
-#line 692 "SlideshowPage.c"
+#line 697 "SlideshowPage.c"
}
SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start) {
SlideshowPage * self = NULL;
- const gchar* _tmp0_ = NULL;
- SourceCollection* _tmp1_ = NULL;
- SourceCollection* _tmp2_ = NULL;
- ViewCollection* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
+ SourceCollection* _tmp0_;
+ SourceCollection* _tmp1_;
+ ViewCollection* _tmp2_;
+ ViewCollection* _tmp3_;
GeeCollection* pluggables = NULL;
- TransitionEffectsManager* _tmp5_ = NULL;
- TransitionEffectsManager* _tmp6_ = NULL;
- GeeCollection* _tmp7_ = NULL;
- GeeCollection* _tmp8_ = NULL;
+ TransitionEffectsManager* _tmp4_;
+ TransitionEffectsManager* _tmp5_;
+ GeeCollection* _tmp6_;
+ GeeCollection* _tmp7_;
GeeArrayList* a = NULL;
- GeeArrayList* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gpointer* _tmp11_ = NULL;
- Photo* _tmp12_ = NULL;
- Photo* _tmp13_ = NULL;
+ GeeArrayList* _tmp8_;
+ gint _tmp9_;
+ gpointer* _tmp10_;
+ Photo* _tmp11_;
+ Photo* _tmp12_;
GtkToolbar* toolbar = NULL;
- GtkToolbar* _tmp14_ = NULL;
+ GtkToolbar* _tmp13_;
GtkToolButton* previous_button = NULL;
- const gchar* _tmp15_ = NULL;
- GtkToolButton* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
- const gchar* _tmp18_ = NULL;
- GtkToolButton* _tmp19_ = NULL;
- GtkToolButton* _tmp20_ = NULL;
- GtkToolButton* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- GtkToolButton* _tmp23_ = NULL;
- GtkToolButton* _tmp24_ = NULL;
+ GtkToolButton* _tmp14_;
+ GtkToolButton* _tmp15_;
+ GtkToolButton* _tmp16_;
+ GtkToolButton* _tmp17_;
+ GtkToolButton* _tmp18_;
+ GtkToolButton* _tmp19_;
GtkToolButton* next_button = NULL;
- const gchar* _tmp25_ = NULL;
- GtkToolButton* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
- GtkToolButton* _tmp28_ = NULL;
- GtkToolButton* _tmp29_ = NULL;
- GtkToolButton* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- GtkToolButton* _tmp32_ = NULL;
- const gchar* _tmp33_ = NULL;
- GtkToolButton* _tmp34_ = NULL;
- GtkToolButton* _tmp35_ = NULL;
- GtkToolButton* _tmp36_ = NULL;
- Screensaver* _tmp37_ = NULL;
+ GtkToolButton* _tmp20_;
+ GtkToolButton* _tmp21_;
+ GtkToolButton* _tmp22_;
+ GtkToolButton* _tmp23_;
+ GtkToolButton* _tmp24_;
+ GtkToolButton* _tmp25_;
+ GtkToolButton* _tmp26_;
+ GtkToolButton* _tmp27_;
+ Screensaver* _tmp28_;
#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -744,41 +740,39 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_val_if_fail (IS_PHOTO (start), NULL);
#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp0_ = _ ("Slideshow");
-#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self = (SlideshowPage*) single_photo_page_construct (object_type, _tmp0_, TRUE);
+ self = (SlideshowPage*) single_photo_page_construct (object_type, _ ("Slideshow"), TRUE);
#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp1_ = sources;
+ _tmp0_ = sources;
#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp2_ = _data_collection_ref0 (_tmp1_);
+ _tmp1_ = _data_collection_ref0 (_tmp0_);
#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_data_collection_unref0 (self->priv->sources);
#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->sources = _tmp2_;
+ self->priv->sources = _tmp1_;
#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp3_ = controller;
+ _tmp2_ = controller;
#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp4_ = _data_collection_ref0 (_tmp3_);
+ _tmp3_ = _data_collection_ref0 (_tmp2_);
#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_data_collection_unref0 (self->priv->controller);
#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->controller = _tmp4_;
+ self->priv->controller = _tmp3_;
#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp5_ = transition_effects_manager_get_instance ();
+ _tmp4_ = transition_effects_manager_get_instance ();
#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp7_ = transition_effects_manager_get_effect_ids (_tmp6_);
+ _tmp6_ = transition_effects_manager_get_effect_ids (_tmp5_);
#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _transition_effects_manager_unref0 (_tmp6_);
+ _transition_effects_manager_unref0 (_tmp5_);
#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- pluggables = _tmp8_;
+ pluggables = _tmp7_;
#line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
+ _tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- a = _tmp9_;
+ a = _tmp8_;
#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
gee_array_list_add_all (a, pluggables);
#line 149 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -786,135 +780,119 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
#line 150 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID);
#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp11_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp10_);
+ _tmp10_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp9_);
#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self->priv->transitions = (_vala_array_free (self->priv->transitions, self->priv->transitions_length1, (GDestroyNotify) g_free), NULL);
#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->transitions = _tmp11_;
+ self->priv->transitions = _tmp10_;
#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->transitions_length1 = _tmp10_;
+ self->priv->transitions_length1 = _tmp9_;
#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self->priv->_transitions_size_ = self->priv->transitions_length1;
#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp12_ = start;
+ _tmp11_ = start;
#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp13_ = _g_object_ref0 (_tmp12_);
+ _tmp12_ = _g_object_ref0 (_tmp11_);
#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->current);
#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->current = _tmp13_;
+ self->priv->current = _tmp12_;
#line 154 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
slideshow_page_update_transition_effect (self);
#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp14_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp13_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- toolbar = _tmp14_;
+ toolbar = _tmp13_;
#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp15_ = _ ("Back");
+ _tmp14_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Back"));
#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp16_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp15_);
-#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_object_ref_sink (_tmp16_);
+ g_object_ref_sink (_tmp14_);
#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- previous_button = _tmp16_;
+ previous_button = _tmp14_;
#line 161 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
gtk_tool_button_set_icon_name (previous_button, "go-previous");
#line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp17_ = _ ("Go to the previous photo");
-#line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), _tmp17_);
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), _ ("Go to the previous photo"));
#line 163 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_signal_connect_object (previous_button, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
#line 165 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp18_ = _ ("Pause");
-#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp19_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp18_);
+ _tmp15_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Pause"));
#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_object_ref_sink (_tmp19_);
+ g_object_ref_sink (_tmp15_);
#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->play_pause_button);
#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->play_pause_button = _tmp19_;
+ self->priv->play_pause_button = _tmp15_;
#line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp20_ = self->priv->play_pause_button;
+ _tmp16_ = self->priv->play_pause_button;
#line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_button_set_icon_name (_tmp20_, "media-playback-pause");
-#line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp21_ = self->priv->play_pause_button;
+ gtk_tool_button_set_icon_name (_tmp16_, "media-playback-pause");
#line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp22_ = _ ("Pause the slideshow");
+ _tmp17_ = self->priv->play_pause_button;
#line 169 "/home/jens/Source/shotwell/src/SlideshowPage.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 (_tmp17_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow"));
#line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp23_ = self->priv->play_pause_button;
+ _tmp18_ = self->priv->play_pause_button;
#line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_signal_connect_object (_tmp23_, "clicked", (GCallback) _slideshow_page_on_play_pause_gtk_tool_button_clicked, self, 0);
+ g_signal_connect_object (_tmp18_, "clicked", (GCallback) _slideshow_page_on_play_pause_gtk_tool_button_clicked, self, 0);
#line 172 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp24_ = self->priv->play_pause_button;
+ _tmp19_ = self->priv->play_pause_button;
#line 172 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp25_ = _ ("Next");
+ _tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Next"));
#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp26_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp25_);
+ g_object_ref_sink (_tmp20_);
#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_object_ref_sink (_tmp26_);
-#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- next_button = _tmp26_;
+ next_button = _tmp20_;
#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
gtk_tool_button_set_icon_name (next_button, "go-next");
#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp27_ = _ ("Go to the next photo");
-#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), _tmp27_);
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), _ ("Go to the next photo"));
#line 177 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_signal_connect_object (next_button, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
#line 179 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp28_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+ _tmp21_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_object_ref_sink (_tmp28_);
+ g_object_ref_sink (_tmp21_);
#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->settings_button);
#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->settings_button = _tmp28_;
+ self->priv->settings_button = _tmp21_;
#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp29_ = self->priv->settings_button;
+ _tmp22_ = self->priv->settings_button;
#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_button_set_icon_name (_tmp29_, "preferences-system");
+ gtk_tool_button_set_icon_name (_tmp22_, "preferences-system");
#line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp30_ = self->priv->settings_button;
+ _tmp23_ = self->priv->settings_button;
#line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp31_ = _ ("Settings");
-#line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_button_set_label (_tmp30_, _tmp31_);
-#line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp32_ = self->priv->settings_button;
+ gtk_tool_button_set_label (_tmp23_, _ ("Settings"));
#line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp33_ = _ ("Change slideshow settings");
+ _tmp24_ = self->priv->settings_button;
#line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), _tmp33_);
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), _ ("Change slideshow settings"));
#line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp34_ = self->priv->settings_button;
+ _tmp25_ = self->priv->settings_button;
#line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_signal_connect_object (_tmp34_, "clicked", (GCallback) _slideshow_page_on_change_settings_gtk_tool_button_clicked, self, 0);
+ g_signal_connect_object (_tmp25_, "clicked", (GCallback) _slideshow_page_on_change_settings_gtk_tool_button_clicked, self, 0);
#line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp35_ = self->priv->settings_button;
+ _tmp26_ = self->priv->settings_button;
#line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+ gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp36_ = self->priv->settings_button;
+ _tmp27_ = self->priv->settings_button;
#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp37_ = screensaver_new ();
+ _tmp28_ = screensaver_new ();
#line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_screensaver_unref0 (self->priv->screensaver);
#line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->screensaver = _tmp37_;
+ self->priv->screensaver = _tmp28_;
#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (next_button);
#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -927,14 +905,14 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
_g_object_unref0 (pluggables);
#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return self;
-#line 931 "SlideshowPage.c"
+#line 909 "SlideshowPage.c"
}
SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start) {
#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return slideshow_page_construct (TYPE_SLIDESHOW_PAGE, sources, controller, start);
-#line 938 "SlideshowPage.c"
+#line 916 "SlideshowPage.c"
}
@@ -943,22 +921,22 @@ static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self) {
result = slideshow_page_auto_advance ((SlideshowPage*) self);
#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 947 "SlideshowPage.c"
+#line 925 "SlideshowPage.c"
}
static void slideshow_page_real_switched_to (Page* base) {
SlideshowPage * self;
- SourceCollection* _tmp0_ = NULL;
+ SourceCollection* _tmp0_;
Scaling _tmp1_ = {0};
- PixbufCache* _tmp2_ = NULL;
+ PixbufCache* _tmp2_;
GdkPixbuf* pixbuf = NULL;
- Photo* _tmp3_ = NULL;
+ Photo* _tmp3_;
Photo* _tmp4_ = NULL;
GdkPixbuf* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
- GTimer* _tmp11_ = NULL;
- Screensaver* _tmp12_ = NULL;
+ gboolean _tmp6_;
+ GTimer* _tmp11_;
+ Screensaver* _tmp12_;
#line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -987,11 +965,11 @@ static void slideshow_page_real_switched_to (Page* base) {
pixbuf = _tmp5_;
#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp6_) {
-#line 991 "SlideshowPage.c"
- GdkPixbuf* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
+#line 969 "SlideshowPage.c"
+ GdkPixbuf* _tmp7_;
+ Photo* _tmp8_;
Dimensions _tmp9_ = {0};
- Direction _tmp10_ = 0;
+ Direction _tmp10_;
#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp7_ = pixbuf;
#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1002,7 +980,7 @@ static void slideshow_page_real_switched_to (Page* base) {
_tmp10_ = DIRECTION_FORWARD;
#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_);
-#line 1006 "SlideshowPage.c"
+#line 984 "SlideshowPage.c"
}
#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) SLIDESHOW_PAGE_CHECK_ADVANCE_MSEC, _slideshow_page_auto_advance_gsource_func, g_object_ref (self), g_object_unref);
@@ -1016,13 +994,13 @@ static void slideshow_page_real_switched_to (Page* base) {
screensaver_inhibit (_tmp12_, "Playing slideshow");
#line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (pixbuf);
-#line 1020 "SlideshowPage.c"
+#line 998 "SlideshowPage.c"
}
static void slideshow_page_real_switching_from (Page* base) {
SlideshowPage * self;
- Screensaver* _tmp0_ = NULL;
+ Screensaver* _tmp0_;
#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1033,16 +1011,16 @@ static void slideshow_page_real_switching_from (Page* base) {
screensaver_uninhibit (_tmp0_);
#line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self->priv->exiting = TRUE;
-#line 1037 "SlideshowPage.c"
+#line 1015 "SlideshowPage.c"
}
-static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo** next, GdkPixbuf** next_pixbuf) {
+static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo* * next, GdkPixbuf* * next_pixbuf) {
Photo* _vala_next = NULL;
GdkPixbuf* _vala_next_pixbuf = NULL;
gboolean result = FALSE;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
GError * _inner_error_ = NULL;
#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE);
@@ -1056,47 +1034,47 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
_g_object_unref0 (_vala_next);
#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_vala_next = _tmp1_;
-#line 1060 "SlideshowPage.c"
+#line 1038 "SlideshowPage.c"
{
gboolean _tmp2_ = FALSE;
#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = TRUE;
#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
while (TRUE) {
-#line 1067 "SlideshowPage.c"
+#line 1045 "SlideshowPage.c"
DataSource* forward = NULL;
DataSource* back = NULL;
- ViewCollection* _tmp41_ = NULL;
- Photo* _tmp42_ = NULL;
+ ViewCollection* _tmp40_;
+ Photo* _tmp41_;
+ DataSource* _tmp42_ = NULL;
DataSource* _tmp43_ = NULL;
- DataSource* _tmp44_ = NULL;
- PixbufCache* _tmp45_ = NULL;
- DataSource* _tmp46_ = NULL;
- PixbufCache* _tmp47_ = NULL;
- DataSource* _tmp48_ = NULL;
+ PixbufCache* _tmp44_;
+ DataSource* _tmp45_;
+ PixbufCache* _tmp46_;
+ DataSource* _tmp47_;
GeeSet* neighbors = NULL;
- ViewCollection* _tmp49_ = NULL;
- Photo* _tmp50_ = NULL;
- GeeSet* _tmp51_ = NULL;
- GeeSet* _tmp52_ = NULL;
- DataSource* _tmp53_ = NULL;
- GeeSet* _tmp54_ = NULL;
- DataSource* _tmp55_ = NULL;
- PixbufCache* _tmp56_ = NULL;
- GeeSet* _tmp57_ = NULL;
+ ViewCollection* _tmp48_;
+ Photo* _tmp49_;
+ GeeSet* _tmp50_;
+ GeeSet* _tmp51_;
+ DataSource* _tmp52_;
+ GeeSet* _tmp53_;
+ DataSource* _tmp54_;
+ PixbufCache* _tmp55_;
+ GeeSet* _tmp56_;
#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (!_tmp2_) {
-#line 1090 "SlideshowPage.c"
+#line 1068 "SlideshowPage.c"
}
#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = FALSE;
-#line 1094 "SlideshowPage.c"
+#line 1072 "SlideshowPage.c"
{
GdkPixbuf* _tmp3_ = NULL;
- PixbufCache* _tmp4_ = NULL;
- Photo* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- GdkPixbuf* _tmp7_ = NULL;
+ PixbufCache* _tmp4_;
+ Photo* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_;
#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp4_ = self->priv->cache;
#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1107,8 +1085,8 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
_tmp3_ = _tmp6_;
#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1111 "SlideshowPage.c"
- goto __catch461_g_error;
+#line 1089 "SlideshowPage.c"
+ goto __catch462_g_error;
}
#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp7_ = _tmp3_;
@@ -1120,30 +1098,30 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
_vala_next_pixbuf = _tmp7_;
#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_tmp3_);
-#line 1124 "SlideshowPage.c"
+#line 1102 "SlideshowPage.c"
}
- goto __finally461;
- __catch461_g_error:
+ goto __finally462;
+ __catch462_g_error:
{
GError* err = NULL;
- Photo* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- GError* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ Photo* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ GError* _tmp11_;
+ const gchar* _tmp12_;
DataView* view = NULL;
- ViewCollection* _tmp13_ = NULL;
- Photo* _tmp14_ = NULL;
- DataView* _tmp15_ = NULL;
+ ViewCollection* _tmp13_;
+ Photo* _tmp14_;
+ DataView* _tmp15_;
DataView* _tmp16_ = NULL;
- Direction _tmp17_ = 0;
- DataView* _tmp24_ = NULL;
- DataView* _tmp25_ = NULL;
- DataSource* _tmp26_ = NULL;
+ Direction _tmp17_;
+ DataView* _tmp24_;
+ DataView* _tmp25_;
+ DataSource* _tmp26_;
gboolean _tmp27_ = FALSE;
gboolean _tmp28_ = FALSE;
- Photo* _tmp29_ = NULL;
- Photo* _tmp30_ = NULL;
+ Photo* _tmp29_;
+ Photo* _tmp30_;
#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
err = _inner_error_;
#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1174,10 +1152,10 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
_tmp17_ = direction;
#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp17_ == DIRECTION_FORWARD) {
-#line 1178 "SlideshowPage.c"
- ViewCollection* _tmp18_ = NULL;
- DataView* _tmp19_ = NULL;
- DataView* _tmp20_ = NULL;
+#line 1156 "SlideshowPage.c"
+ ViewCollection* _tmp18_;
+ DataView* _tmp19_;
+ DataView* _tmp20_;
#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp18_ = self->priv->controller;
#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1188,11 +1166,11 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
_g_object_unref0 (_tmp16_);
#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp16_ = _tmp20_;
-#line 1192 "SlideshowPage.c"
+#line 1170 "SlideshowPage.c"
} else {
- ViewCollection* _tmp21_ = NULL;
- DataView* _tmp22_ = NULL;
- DataView* _tmp23_ = NULL;
+ ViewCollection* _tmp21_;
+ DataView* _tmp22_;
+ DataView* _tmp23_;
#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp21_ = self->priv->controller;
#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1203,7 +1181,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
_g_object_unref0 (_tmp16_);
#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp16_ = _tmp23_;
-#line 1207 "SlideshowPage.c"
+#line 1185 "SlideshowPage.c"
}
#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp24_ = _g_object_ref0 (_tmp16_);
@@ -1225,63 +1203,60 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
_tmp30_ = start;
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp29_ == _tmp30_) {
-#line 1229 "SlideshowPage.c"
- Photo* _tmp31_ = NULL;
- Photo* _tmp32_ = NULL;
+#line 1207 "SlideshowPage.c"
+ Photo* _tmp31_;
+ Photo* _tmp32_;
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp31_ = _vala_next;
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp32_ = self->priv->current;
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp28_ = _tmp31_ != _tmp32_;
-#line 1238 "SlideshowPage.c"
+#line 1216 "SlideshowPage.c"
} else {
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp28_ = FALSE;
-#line 1242 "SlideshowPage.c"
+#line 1220 "SlideshowPage.c"
}
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp28_) {
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp27_ = TRUE;
-#line 1248 "SlideshowPage.c"
+#line 1226 "SlideshowPage.c"
} else {
- Photo* _tmp33_ = NULL;
- Photo* _tmp34_ = NULL;
+ Photo* _tmp33_;
+ Photo* _tmp34_;
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp33_ = _vala_next;
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp34_ = self->priv->current;
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp27_ = _tmp33_ == _tmp34_;
-#line 1258 "SlideshowPage.c"
+#line 1236 "SlideshowPage.c"
}
#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp27_) {
-#line 1262 "SlideshowPage.c"
- const gchar* _tmp35_ = NULL;
- GtkWindow* _tmp36_ = NULL;
- GtkWindow* _tmp37_ = NULL;
- AppWindow* _tmp38_ = NULL;
- AppWindow* _tmp39_ = NULL;
-#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp35_ = _ ("All photo source files are missing.");
+#line 1240 "SlideshowPage.c"
+ GtkWindow* _tmp35_;
+ GtkWindow* _tmp36_;
+ AppWindow* _tmp37_;
+ AppWindow* _tmp38_;
#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp36_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp37_ = _tmp36_;
+ _tmp36_ = _tmp35_;
#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- app_window_error_message (_tmp35_, _tmp37_);
+ app_window_error_message (_ ("All photo source files are missing."), _tmp36_);
#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _g_object_unref0 (_tmp37_);
+ _g_object_unref0 (_tmp36_);
#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp38_ = app_window_get_instance ();
+ _tmp37_ = app_window_get_instance ();
#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp39_ = _tmp38_;
+ _tmp38_ = _tmp37_;
#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- app_window_end_fullscreen (_tmp39_);
+ app_window_end_fullscreen (_tmp38_);
#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _g_object_unref0 (_tmp39_);
+ _g_object_unref0 (_tmp38_);
#line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_vala_next);
#line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1302,25 +1277,25 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
if (next) {
#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
*next = _vala_next;
-#line 1306 "SlideshowPage.c"
+#line 1281 "SlideshowPage.c"
} else {
#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_vala_next);
-#line 1310 "SlideshowPage.c"
+#line 1285 "SlideshowPage.c"
}
#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (next_pixbuf) {
#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
*next_pixbuf = _vala_next_pixbuf;
-#line 1316 "SlideshowPage.c"
+#line 1291 "SlideshowPage.c"
} else {
#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_vala_next_pixbuf);
-#line 1320 "SlideshowPage.c"
+#line 1295 "SlideshowPage.c"
}
#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 1324 "SlideshowPage.c"
+#line 1299 "SlideshowPage.c"
}
#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_tmp16_);
@@ -1330,73 +1305,73 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
_g_error_free0 (err);
#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
continue;
-#line 1334 "SlideshowPage.c"
+#line 1309 "SlideshowPage.c"
}
- __finally461:
+ __finally462:
#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1339 "SlideshowPage.c"
- gboolean _tmp40_ = FALSE;
+#line 1314 "SlideshowPage.c"
+ gboolean _tmp39_ = FALSE;
#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
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 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_clear_error (&_inner_error_);
#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- return _tmp40_;
-#line 1347 "SlideshowPage.c"
+ return _tmp39_;
+#line 1322 "SlideshowPage.c"
}
#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp41_ = self->priv->controller;
+ _tmp40_ = self->priv->controller;
#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp42_ = _vala_next;
+ _tmp41_ = _vala_next;
#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- view_collection_get_immediate_neighbors (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_SOURCE, DataSource), &_tmp43_, &_tmp44_, PHOTO_TYPENAME);
+ view_collection_get_immediate_neighbors (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_SOURCE, DataSource), &_tmp42_, &_tmp43_, PHOTO_TYPENAME);
#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (forward);
#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- forward = _tmp43_;
+ forward = _tmp42_;
#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (back);
#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- back = _tmp44_;
+ back = _tmp43_;
#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp45_ = self->priv->cache;
+ _tmp44_ = self->priv->cache;
#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp46_ = forward;
+ _tmp45_ = forward;
#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- pixbuf_cache_prefetch (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
+ pixbuf_cache_prefetch (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp47_ = self->priv->cache;
+ _tmp46_ = self->priv->cache;
#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp48_ = back;
+ _tmp47_ = back;
#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- pixbuf_cache_prefetch (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
+ pixbuf_cache_prefetch (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp49_ = self->priv->controller;
+ _tmp48_ = self->priv->controller;
#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp50_ = _vala_next;
+ _tmp49_ = _vala_next;
#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp51_ = view_collection_get_extended_neighbors (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
+ _tmp50_ = view_collection_get_extended_neighbors (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- neighbors = _tmp51_;
+ neighbors = _tmp50_;
#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp52_ = neighbors;
+ _tmp51_ = neighbors;
#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp53_ = forward;
+ _tmp52_ = forward;
#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
+ gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_);
#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp54_ = neighbors;
+ _tmp53_ = neighbors;
#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp55_ = back;
+ _tmp54_ = back;
#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_);
+ gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_);
#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp56_ = self->priv->cache;
+ _tmp55_ = self->priv->cache;
#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp57_ = neighbors;
+ _tmp56_ = neighbors;
#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- pixbuf_cache_prefetch_many (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE);
+ pixbuf_cache_prefetch_many (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE);
#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
result = TRUE;
#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1409,66 +1384,64 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
if (next) {
#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
*next = _vala_next;
-#line 1413 "SlideshowPage.c"
+#line 1388 "SlideshowPage.c"
} else {
#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_vala_next);
-#line 1417 "SlideshowPage.c"
+#line 1392 "SlideshowPage.c"
}
#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (next_pixbuf) {
#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
*next_pixbuf = _vala_next_pixbuf;
-#line 1423 "SlideshowPage.c"
+#line 1398 "SlideshowPage.c"
} else {
#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_vala_next_pixbuf);
-#line 1427 "SlideshowPage.c"
+#line 1402 "SlideshowPage.c"
}
#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 1431 "SlideshowPage.c"
+#line 1406 "SlideshowPage.c"
}
}
#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (next) {
#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
*next = _vala_next;
-#line 1438 "SlideshowPage.c"
+#line 1413 "SlideshowPage.c"
} else {
#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_vala_next);
-#line 1442 "SlideshowPage.c"
+#line 1417 "SlideshowPage.c"
}
#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (next_pixbuf) {
#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
*next_pixbuf = _vala_next_pixbuf;
-#line 1448 "SlideshowPage.c"
+#line 1423 "SlideshowPage.c"
} else {
#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_vala_next_pixbuf);
-#line 1452 "SlideshowPage.c"
+#line 1427 "SlideshowPage.c"
}
}
static void slideshow_page_on_play_pause (SlideshowPage* self) {
- gboolean _tmp0_ = FALSE;
- gboolean _tmp11_ = FALSE;
- GTimer* _tmp12_ = NULL;
+ gboolean _tmp0_;
+ gboolean _tmp7_;
+ GTimer* _tmp8_;
#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_if_fail (IS_SLIDESHOW_PAGE (self));
#line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp0_ = self->priv->playing;
#line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp0_) {
-#line 1467 "SlideshowPage.c"
- GtkToolButton* _tmp1_ = NULL;
- GtkToolButton* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- GtkToolButton* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+#line 1442 "SlideshowPage.c"
+ GtkToolButton* _tmp1_;
+ GtkToolButton* _tmp2_;
+ GtkToolButton* _tmp3_;
#line 269 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp1_ = self->priv->play_pause_button;
#line 269 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1476,67 +1449,57 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
#line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = self->priv->play_pause_button;
#line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp3_ = _ ("Play");
-#line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_button_set_label (_tmp2_, _tmp3_);
+ gtk_tool_button_set_label (_tmp2_, _ ("Play"));
#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp4_ = self->priv->play_pause_button;
-#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp5_ = _ ("Continue the slideshow");
+ _tmp3_ = self->priv->play_pause_button;
#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_tool_item_get_type (), GtkToolItem), _tmp5_);
-#line 1489 "SlideshowPage.c"
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tool_item_get_type (), GtkToolItem), _ ("Continue the slideshow"));
+#line 1458 "SlideshowPage.c"
} else {
- GtkToolButton* _tmp6_ = NULL;
- GtkToolButton* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- GtkToolButton* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
+ GtkToolButton* _tmp4_;
+ GtkToolButton* _tmp5_;
+ GtkToolButton* _tmp6_;
#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp6_ = self->priv->play_pause_button;
+ _tmp4_ = self->priv->play_pause_button;
#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_button_set_icon_name (_tmp6_, "media-playback-pause");
-#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp7_ = self->priv->play_pause_button;
+ gtk_tool_button_set_icon_name (_tmp4_, "media-playback-pause");
#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp8_ = _ ("Pause");
+ _tmp5_ = self->priv->play_pause_button;
#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_button_set_label (_tmp7_, _tmp8_);
+ gtk_tool_button_set_label (_tmp5_, _ ("Pause"));
#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp9_ = self->priv->play_pause_button;
-#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp10_ = _ ("Pause the slideshow");
+ _tmp6_ = self->priv->play_pause_button;
#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_tool_item_get_type (), GtkToolItem), _tmp10_);
-#line 1512 "SlideshowPage.c"
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow"));
+#line 1475 "SlideshowPage.c"
}
#line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp11_ = self->priv->playing;
+ _tmp7_ = self->priv->playing;
#line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->playing = !_tmp11_;
+ self->priv->playing = !_tmp7_;
#line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp12_ = self->priv->timer;
+ _tmp8_ = self->priv->timer;
#line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_timer_start (_tmp12_);
-#line 1522 "SlideshowPage.c"
+ g_timer_start (_tmp8_);
+#line 1485 "SlideshowPage.c"
}
static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
SlideshowPage * self;
DataView* view = NULL;
- ViewCollection* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
+ ViewCollection* _tmp0_;
+ Photo* _tmp1_;
+ DataView* _tmp2_;
Photo* prev_photo = NULL;
DataView* start_view = NULL;
- ViewCollection* _tmp3_ = NULL;
- DataView* _tmp4_ = NULL;
- DataView* _tmp5_ = NULL;
+ ViewCollection* _tmp3_;
+ DataView* _tmp4_;
+ DataView* _tmp5_;
DataView* prev_view = NULL;
- DataView* _tmp6_ = NULL;
- DataView* _tmp7_ = NULL;
- Photo* _tmp20_ = NULL;
+ DataView* _tmp6_;
+ DataView* _tmp7_;
+ Photo* _tmp20_;
#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1565,24 +1528,24 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
prev_view = _tmp7_;
#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
while (TRUE) {
-#line 1569 "SlideshowPage.c"
- DataView* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataSource* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- ViewCollection* _tmp15_ = NULL;
- DataView* _tmp16_ = NULL;
- DataView* _tmp17_ = NULL;
- DataView* _tmp18_ = NULL;
- DataView* _tmp19_ = NULL;
+#line 1532 "SlideshowPage.c"
+ DataView* _tmp8_;
+ DataView* _tmp9_;
+ DataSource* _tmp10_;
+ DataSource* _tmp11_;
+ gboolean _tmp12_;
+ ViewCollection* _tmp15_;
+ DataView* _tmp16_;
+ DataView* _tmp17_;
+ DataView* _tmp18_;
+ DataView* _tmp19_;
#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp8_ = prev_view;
#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (!(_tmp8_ != NULL)) {
#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
break;
-#line 1586 "SlideshowPage.c"
+#line 1549 "SlideshowPage.c"
}
#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp9_ = prev_view;
@@ -1596,9 +1559,9 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
_g_object_unref0 (_tmp11_);
#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp12_) {
-#line 1600 "SlideshowPage.c"
- DataView* _tmp13_ = NULL;
- DataSource* _tmp14_ = NULL;
+#line 1563 "SlideshowPage.c"
+ DataView* _tmp13_;
+ DataSource* _tmp14_;
#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp13_ = prev_view;
#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1609,7 +1572,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
prev_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);
#line 294 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
break;
-#line 1613 "SlideshowPage.c"
+#line 1576 "SlideshowPage.c"
}
#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp15_ = self->priv->controller;
@@ -1640,7 +1603,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
_g_object_unref0 (view);
#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return;
-#line 1643 "SlideshowPage.c"
+#line 1606 "SlideshowPage.c"
}
}
#line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1655,30 +1618,30 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
_g_object_unref0 (prev_photo);
#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (view);
-#line 1658 "SlideshowPage.c"
+#line 1621 "SlideshowPage.c"
}
static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
SlideshowPage * self;
DataView* view = NULL;
- ViewCollection* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
+ ViewCollection* _tmp0_;
+ Photo* _tmp1_;
+ DataView* _tmp2_;
Photo* next_photo = NULL;
DataView* start_view = NULL;
- ViewCollection* _tmp3_ = NULL;
- DataView* _tmp4_ = NULL;
- DataView* _tmp5_ = NULL;
+ ViewCollection* _tmp3_;
+ DataView* _tmp4_;
+ DataView* _tmp5_;
DataView* next_view = NULL;
- DataView* _tmp6_ = NULL;
- DataView* _tmp7_ = NULL;
- ConfigFacade* _tmp20_ = NULL;
- ConfigFacade* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
- Photo* _tmp25_ = NULL;
+ DataView* _tmp6_;
+ DataView* _tmp7_;
+ ConfigFacade* _tmp20_;
+ ConfigFacade* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ gboolean _tmp24_;
+ Photo* _tmp25_;
#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
#line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1707,24 +1670,24 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
next_view = _tmp7_;
#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
while (TRUE) {
-#line 1710 "SlideshowPage.c"
- DataView* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataSource* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- ViewCollection* _tmp15_ = NULL;
- DataView* _tmp16_ = NULL;
- DataView* _tmp17_ = NULL;
- DataView* _tmp18_ = NULL;
- DataView* _tmp19_ = NULL;
+#line 1673 "SlideshowPage.c"
+ DataView* _tmp8_;
+ DataView* _tmp9_;
+ DataSource* _tmp10_;
+ DataSource* _tmp11_;
+ gboolean _tmp12_;
+ ViewCollection* _tmp15_;
+ DataView* _tmp16_;
+ DataView* _tmp17_;
+ DataView* _tmp18_;
+ DataView* _tmp19_;
#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp8_ = next_view;
#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (!(_tmp8_ != NULL)) {
#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
break;
-#line 1727 "SlideshowPage.c"
+#line 1690 "SlideshowPage.c"
}
#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp9_ = next_view;
@@ -1738,9 +1701,9 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
_g_object_unref0 (_tmp11_);
#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp12_) {
-#line 1741 "SlideshowPage.c"
- DataView* _tmp13_ = NULL;
- DataSource* _tmp14_ = NULL;
+#line 1704 "SlideshowPage.c"
+ DataView* _tmp13_;
+ DataSource* _tmp14_;
#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp13_ = next_view;
#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1751,7 +1714,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
next_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);
#line 318 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
break;
-#line 1754 "SlideshowPage.c"
+#line 1717 "SlideshowPage.c"
}
#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp15_ = self->priv->controller;
@@ -1782,7 +1745,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
_g_object_unref0 (view);
#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return;
-#line 1784 "SlideshowPage.c"
+#line 1747 "SlideshowPage.c"
}
}
#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1803,7 +1766,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
if (_tmp24_) {
#line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
slideshow_page_random_transition_effect (self);
-#line 1805 "SlideshowPage.c"
+#line 1768 "SlideshowPage.c"
}
#line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp25_ = next_photo;
@@ -1817,20 +1780,20 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
_g_object_unref0 (next_photo);
#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (view);
-#line 1819 "SlideshowPage.c"
+#line 1782 "SlideshowPage.c"
}
static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction direction) {
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
GdkPixbuf* next_pixbuf = NULL;
- Photo* _tmp2_ = NULL;
- Direction _tmp3_ = 0;
+ Photo* _tmp2_;
+ Direction _tmp3_;
Photo* _tmp4_ = NULL;
GdkPixbuf* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
- GTimer* _tmp11_ = NULL;
+ gboolean _tmp6_;
+ GTimer* _tmp11_;
#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_if_fail (IS_SLIDESHOW_PAGE (self));
#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1859,11 +1822,11 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
next_pixbuf = _tmp5_;
#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp6_) {
-#line 1861 "SlideshowPage.c"
- GdkPixbuf* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
+#line 1824 "SlideshowPage.c"
+ GdkPixbuf* _tmp7_;
+ Photo* _tmp8_;
Dimensions _tmp9_ = {0};
- Direction _tmp10_ = 0;
+ Direction _tmp10_;
#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp7_ = next_pixbuf;
#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1874,7 +1837,7 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
_tmp10_ = direction;
#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_);
-#line 1876 "SlideshowPage.c"
+#line 1839 "SlideshowPage.c"
}
#line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp11_ = self->priv->timer;
@@ -1882,20 +1845,20 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
g_timer_start (_tmp11_);
#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (next_pixbuf);
-#line 1884 "SlideshowPage.c"
+#line 1847 "SlideshowPage.c"
}
static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
- GTimer* _tmp2_ = NULL;
- gdouble _tmp3_ = 0.0;
- ConfigFacade* _tmp4_ = NULL;
- ConfigFacade* _tmp5_ = NULL;
- gdouble _tmp6_ = 0.0;
- gboolean _tmp7_ = FALSE;
+ gboolean _tmp0_;
+ gboolean _tmp1_;
+ GTimer* _tmp2_;
+ gdouble _tmp3_;
+ ConfigFacade* _tmp4_;
+ ConfigFacade* _tmp5_;
+ gdouble _tmp6_;
+ gboolean _tmp7_;
#line 349 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE);
#line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1906,7 +1869,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
result = FALSE;
#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 1908 "SlideshowPage.c"
+#line 1871 "SlideshowPage.c"
}
#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp1_ = self->priv->playing;
@@ -1916,7 +1879,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
result = TRUE;
#line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 1918 "SlideshowPage.c"
+#line 1881 "SlideshowPage.c"
}
#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = self->priv->timer;
@@ -1938,7 +1901,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
result = TRUE;
#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 1940 "SlideshowPage.c"
+#line 1903 "SlideshowPage.c"
}
#line 359 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -1946,7 +1909,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
result = TRUE;
#line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 1948 "SlideshowPage.c"
+#line 1911 "SlideshowPage.c"
}
@@ -1954,15 +1917,15 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
SlideshowPage * self;
gboolean result = FALSE;
gboolean handled = FALSE;
- GdkEventKey* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GdkEventKey* _tmp0_;
+ guint _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
GQuark _tmp5_ = 0U;
#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
static GQuark _tmp4_label0 = 0;
-#line 1963 "SlideshowPage.c"
- gboolean _tmp6_ = FALSE;
+#line 1926 "SlideshowPage.c"
+ gboolean _tmp6_;
gboolean _tmp7_ = FALSE;
#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
@@ -1984,27 +1947,27 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("space")))) {
#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
switch (0) {
-#line 1986 "SlideshowPage.c"
+#line 1949 "SlideshowPage.c"
default:
{
#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
slideshow_page_on_play_pause (self);
#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
break;
-#line 1993 "SlideshowPage.c"
+#line 1956 "SlideshowPage.c"
}
}
} else {
#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
switch (0) {
-#line 1999 "SlideshowPage.c"
+#line 1962 "SlideshowPage.c"
default:
{
#line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
handled = FALSE;
#line 373 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
break;
-#line 2006 "SlideshowPage.c"
+#line 1969 "SlideshowPage.c"
}
}
}
@@ -2016,44 +1979,44 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
result = TRUE;
#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 2018 "SlideshowPage.c"
+#line 1981 "SlideshowPage.c"
}
#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) {
-#line 2022 "SlideshowPage.c"
- GdkEventKey* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 1985 "SlideshowPage.c"
+ GdkEventKey* _tmp8_;
+ gboolean _tmp9_;
#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp8_ = event;
#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp9_ = GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp8_);
#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp7_ = _tmp9_;
-#line 2031 "SlideshowPage.c"
+#line 1994 "SlideshowPage.c"
} else {
#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp7_ = TRUE;
-#line 2035 "SlideshowPage.c"
+#line 1998 "SlideshowPage.c"
}
#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
result = _tmp7_;
#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 2041 "SlideshowPage.c"
+#line 2004 "SlideshowPage.c"
}
static void slideshow_page_on_change_settings (SlideshowPage* self) {
SlideshowPageSettingsDialog* settings_dialog = NULL;
- SlideshowPageSettingsDialog* _tmp0_ = NULL;
- SlideshowPageSettingsDialog* _tmp1_ = NULL;
+ SlideshowPageSettingsDialog* _tmp0_;
+ SlideshowPageSettingsDialog* _tmp1_;
gboolean slideshow_playing = FALSE;
- gboolean _tmp2_ = FALSE;
- SlideshowPageSettingsDialog* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- SlideshowPageSettingsDialog* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
- GTimer* _tmp24_ = NULL;
+ gboolean _tmp2_;
+ SlideshowPageSettingsDialog* _tmp3_;
+ gint _tmp4_;
+ SlideshowPageSettingsDialog* _tmp22_;
+ gboolean _tmp23_;
+ GTimer* _tmp24_;
#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_if_fail (IS_SLIDESHOW_PAGE (self));
#line 383 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2073,31 +2036,31 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
#line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self->priv->playing = FALSE;
#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_signal_emit_by_name (self, "hide-toolbar");
+ g_signal_emit (self, slideshow_page_signals[SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL], 0);
#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp3_ = settings_dialog;
#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog));
#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2082 "SlideshowPage.c"
- ConfigFacade* _tmp5_ = NULL;
- ConfigFacade* _tmp6_ = NULL;
- SlideshowPageSettingsDialog* _tmp7_ = NULL;
- gdouble _tmp8_ = 0.0;
- ConfigFacade* _tmp9_ = NULL;
- ConfigFacade* _tmp10_ = NULL;
- SlideshowPageSettingsDialog* _tmp11_ = NULL;
- gdouble _tmp12_ = 0.0;
- ConfigFacade* _tmp13_ = NULL;
- ConfigFacade* _tmp14_ = NULL;
- SlideshowPageSettingsDialog* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- ConfigFacade* _tmp18_ = NULL;
- ConfigFacade* _tmp19_ = NULL;
- SlideshowPageSettingsDialog* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
+#line 2045 "SlideshowPage.c"
+ ConfigFacade* _tmp5_;
+ ConfigFacade* _tmp6_;
+ SlideshowPageSettingsDialog* _tmp7_;
+ gdouble _tmp8_;
+ ConfigFacade* _tmp9_;
+ ConfigFacade* _tmp10_;
+ SlideshowPageSettingsDialog* _tmp11_;
+ gdouble _tmp12_;
+ ConfigFacade* _tmp13_;
+ ConfigFacade* _tmp14_;
+ SlideshowPageSettingsDialog* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
+ ConfigFacade* _tmp18_;
+ ConfigFacade* _tmp19_;
+ SlideshowPageSettingsDialog* _tmp20_;
+ gboolean _tmp21_;
#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp5_ = config_facade_get_instance ();
#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2152,7 +2115,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
_g_object_unref0 (_tmp19_);
#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
slideshow_page_update_transition_effect (self);
-#line 2154 "SlideshowPage.c"
+#line 2117 "SlideshowPage.c"
}
#line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp22_ = settings_dialog;
@@ -2168,21 +2131,21 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
g_timer_start (_tmp24_);
#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (settings_dialog);
-#line 2170 "SlideshowPage.c"
+#line 2133 "SlideshowPage.c"
}
static void slideshow_page_update_transition_effect (SlideshowPage* self) {
gchar* effect_id = NULL;
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gdouble effect_delay = 0.0;
- ConfigFacade* _tmp4_ = NULL;
- ConfigFacade* _tmp5_ = NULL;
- gdouble _tmp6_ = 0.0;
- gdouble _tmp7_ = 0.0;
+ ConfigFacade* _tmp4_;
+ ConfigFacade* _tmp5_;
+ gdouble _tmp6_;
+ gdouble _tmp7_;
#line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_if_fail (IS_SLIDESHOW_PAGE (self));
#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2213,22 +2176,22 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) {
single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), effect_id, (gint) (effect_delay * 1000.0));
#line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_free0 (effect_id);
-#line 2215 "SlideshowPage.c"
+#line 2178 "SlideshowPage.c"
}
static void slideshow_page_random_transition_effect (SlideshowPage* self) {
gdouble effect_delay = 0.0;
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
- gdouble _tmp2_ = 0.0;
- gdouble _tmp3_ = 0.0;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
gchar* effect_id = NULL;
- gchar* _tmp4_ = NULL;
- gchar** _tmp5_ = NULL;
- gint _tmp5__length1 = 0;
- const gchar* _tmp12_ = NULL;
- gdouble _tmp13_ = 0.0;
+ gchar* _tmp4_;
+ gchar** _tmp5_;
+ gint _tmp5__length1;
+ const gchar* _tmp12_;
+ gdouble _tmp13_;
#line 413 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_if_fail (IS_SLIDESHOW_PAGE (self));
#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2253,16 +2216,16 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
_tmp5__length1 = self->priv->transitions_length1;
#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (0 < _tmp5__length1) {
-#line 2255 "SlideshowPage.c"
+#line 2218 "SlideshowPage.c"
gint random = 0;
- gchar** _tmp6_ = NULL;
- gint _tmp6__length1 = 0;
- gint32 _tmp7_ = 0;
- gchar** _tmp8_ = NULL;
- gint _tmp8__length1 = 0;
- gint _tmp9_ = 0;
- const gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
+ gchar** _tmp6_;
+ gint _tmp6__length1;
+ gint32 _tmp7_;
+ gchar** _tmp8_;
+ gint _tmp8__length1;
+ gint _tmp9_;
+ const gchar* _tmp10_;
+ gchar* _tmp11_;
#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp6_ = self->priv->transitions;
#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2285,7 +2248,7 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
_g_free0 (effect_id);
#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
effect_id = _tmp11_;
-#line 2287 "SlideshowPage.c"
+#line 2250 "SlideshowPage.c"
}
#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp12_ = effect_id;
@@ -2295,61 +2258,61 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, (gint) (_tmp13_ * 1000.0));
#line 413 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_free0 (effect_id);
-#line 2297 "SlideshowPage.c"
+#line 2260 "SlideshowPage.c"
}
static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
gchar* title = NULL;
- Photo* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ Photo* _tmp0_;
+ gchar* _tmp1_;
gboolean _tmp2_ = FALSE;
- const gchar* _tmp3_ = NULL;
+ const gchar* _tmp3_;
PangoLayout* layout = NULL;
- const gchar* _tmp5_ = NULL;
- PangoLayout* _tmp6_ = NULL;
+ const gchar* _tmp5_;
+ PangoLayout* _tmp6_;
PangoAttrList* list = NULL;
- PangoAttrList* _tmp7_ = NULL;
+ PangoAttrList* _tmp7_;
PangoAttribute* size = NULL;
- PangoAttribute* _tmp8_ = NULL;
- PangoAttrList* _tmp9_ = NULL;
- PangoAttribute* _tmp10_ = NULL;
- PangoAttribute* _tmp11_ = NULL;
- PangoLayout* _tmp12_ = NULL;
- PangoAttrList* _tmp13_ = NULL;
- PangoLayout* _tmp14_ = NULL;
- Dimensions _tmp15_ = {0};
- gint _tmp16_ = 0;
+ PangoAttribute* _tmp8_;
+ PangoAttrList* _tmp9_;
+ PangoAttribute* _tmp10_;
+ PangoAttribute* _tmp11_;
+ PangoLayout* _tmp12_;
+ PangoAttrList* _tmp13_;
+ PangoLayout* _tmp14_;
+ Dimensions _tmp15_;
+ gint _tmp16_;
gint title_width = 0;
gint title_height = 0;
- PangoLayout* _tmp17_ = NULL;
+ PangoLayout* _tmp17_;
gint _tmp18_ = 0;
gint _tmp19_ = 0;
gdouble x = 0.0;
- Dimensions _tmp20_ = {0};
- gint _tmp21_ = 0;
+ Dimensions _tmp20_;
+ gint _tmp21_;
gdouble y = 0.0;
- Dimensions _tmp22_ = {0};
- gint _tmp23_ = 0;
- gdouble _tmp24_ = 0.0;
- gint _tmp25_ = 0;
- Dimensions _tmp26_ = {0};
- gint _tmp27_ = 0;
- gdouble _tmp31_ = 0.0;
- gint _tmp32_ = 0;
- Dimensions _tmp33_ = {0};
- gint _tmp34_ = 0;
- cairo_t* _tmp38_ = NULL;
- cairo_t* _tmp39_ = NULL;
- gdouble _tmp40_ = 0.0;
- gdouble _tmp41_ = 0.0;
- cairo_t* _tmp42_ = NULL;
- PangoLayout* _tmp43_ = NULL;
- cairo_t* _tmp44_ = NULL;
- PangoLayout* _tmp45_ = NULL;
- cairo_t* _tmp46_ = NULL;
- cairo_t* _tmp47_ = NULL;
- cairo_t* _tmp48_ = NULL;
+ Dimensions _tmp22_;
+ gint _tmp23_;
+ gdouble _tmp24_;
+ gint _tmp25_;
+ Dimensions _tmp26_;
+ gint _tmp27_;
+ gdouble _tmp31_;
+ gint _tmp32_;
+ Dimensions _tmp33_;
+ gint _tmp34_;
+ cairo_t* _tmp38_;
+ cairo_t* _tmp39_;
+ gdouble _tmp40_;
+ gdouble _tmp41_;
+ cairo_t* _tmp42_;
+ PangoLayout* _tmp43_;
+ cairo_t* _tmp44_;
+ PangoLayout* _tmp45_;
+ cairo_t* _tmp46_;
+ cairo_t* _tmp47_;
+ cairo_t* _tmp48_;
#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_if_fail (IS_SLIDESHOW_PAGE (self));
#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2368,14 +2331,14 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
if (_tmp3_ == NULL) {
#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = TRUE;
-#line 2370 "SlideshowPage.c"
+#line 2333 "SlideshowPage.c"
} else {
- const gchar* _tmp4_ = NULL;
+ const gchar* _tmp4_;
#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp4_ = title;
#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2377 "SlideshowPage.c"
+#line 2340 "SlideshowPage.c"
}
#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp2_) {
@@ -2383,7 +2346,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
_g_free0 (title);
#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return;
-#line 2385 "SlideshowPage.c"
+#line 2348 "SlideshowPage.c"
}
#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp5_ = title;
@@ -2451,10 +2414,10 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
_tmp27_ = _tmp26_.height;
#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if ((_tmp24_ + _tmp25_) >= (_tmp27_ * 0.95)) {
-#line 2453 "SlideshowPage.c"
- Dimensions _tmp28_ = {0};
- gint _tmp29_ = 0;
- gint _tmp30_ = 0;
+#line 2416 "SlideshowPage.c"
+ Dimensions _tmp28_;
+ gint _tmp29_;
+ gint _tmp30_;
#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp28_ = *ctx_dim;
#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2463,7 +2426,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
_tmp30_ = title_height;
#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
y = (_tmp29_ * 0.95) - _tmp30_;
-#line 2465 "SlideshowPage.c"
+#line 2428 "SlideshowPage.c"
}
#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp31_ = x;
@@ -2475,10 +2438,10 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
_tmp34_ = _tmp33_.width;
#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if ((_tmp31_ + _tmp32_) >= (_tmp34_ * 0.95)) {
-#line 2477 "SlideshowPage.c"
- Dimensions _tmp35_ = {0};
- gint _tmp36_ = 0;
- gint _tmp37_ = 0;
+#line 2440 "SlideshowPage.c"
+ Dimensions _tmp35_;
+ gint _tmp36_;
+ gint _tmp37_;
#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp35_ = *ctx_dim;
#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2487,7 +2450,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
_tmp37_ = title_width;
#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
x = (gdouble) ((_tmp36_ / 2) - (_tmp37_ / 2));
-#line 2489 "SlideshowPage.c"
+#line 2452 "SlideshowPage.c"
}
#line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp38_ = ctx;
@@ -2533,19 +2496,19 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
_g_object_unref0 (layout);
#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_free0 (title);
-#line 2535 "SlideshowPage.c"
+#line 2498 "SlideshowPage.c"
}
static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim) {
SlideshowPage * self;
- cairo_t* _tmp0_ = NULL;
- Dimensions _tmp1_ = {0};
+ cairo_t* _tmp0_;
+ Dimensions _tmp1_;
gboolean _tmp2_ = FALSE;
- ConfigFacade* _tmp3_ = NULL;
- ConfigFacade* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ ConfigFacade* _tmp3_;
+ ConfigFacade* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
#line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2570,30 +2533,30 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime
_g_object_unref0 (_tmp4_);
#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp6_) {
-#line 2572 "SlideshowPage.c"
- gboolean _tmp7_ = FALSE;
+#line 2535 "SlideshowPage.c"
+ gboolean _tmp7_;
#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp7_ = single_photo_page_is_transition_in_progress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = !_tmp7_;
-#line 2578 "SlideshowPage.c"
+#line 2541 "SlideshowPage.c"
} else {
#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = FALSE;
-#line 2582 "SlideshowPage.c"
+#line 2545 "SlideshowPage.c"
}
#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp2_) {
-#line 2586 "SlideshowPage.c"
- cairo_t* _tmp8_ = NULL;
- Dimensions _tmp9_ = {0};
+#line 2549 "SlideshowPage.c"
+ cairo_t* _tmp8_;
+ Dimensions _tmp9_;
#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp8_ = ctx;
#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp9_ = *ctx_dim;
#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
slideshow_page_paint_title (self, _tmp8_, &_tmp9_);
-#line 2595 "SlideshowPage.c"
+#line 2558 "SlideshowPage.c"
}
}
@@ -2603,96 +2566,95 @@ static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer
result = utf8_ci_compare (a, b);
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 2605 "SlideshowPage.c"
+#line 2568 "SlideshowPage.c"
}
static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
slideshow_page_settings_dialog_on_transition_changed ((SlideshowPageSettingsDialog*) self);
-#line 2612 "SlideshowPage.c"
+#line 2575 "SlideshowPage.c"
}
static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GType object_type) {
SlideshowPageSettingsDialog * self = NULL;
- GtkBuilder* _tmp0_ = NULL;
- GtkBuilder* _tmp1_ = NULL;
- GObject* _tmp2_ = NULL;
- GtkBox* _tmp3_ = NULL;
- GtkBox* _tmp4_ = NULL;
- GtkBox* _tmp5_ = NULL;
+ GtkBuilder* _tmp0_;
+ GtkBuilder* _tmp1_;
+ GObject* _tmp2_;
+ GtkBox* _tmp3_;
+ GtkBox* _tmp4_;
+ GtkBox* _tmp5_;
gdouble delay = 0.0;
- ConfigFacade* _tmp6_ = NULL;
- ConfigFacade* _tmp7_ = NULL;
- gdouble _tmp8_ = 0.0;
- gdouble _tmp9_ = 0.0;
- FullscreenWindow* _tmp10_ = NULL;
- FullscreenWindow* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ ConfigFacade* _tmp6_;
+ ConfigFacade* _tmp7_;
+ gdouble _tmp8_;
+ gdouble _tmp9_;
+ FullscreenWindow* _tmp10_;
+ FullscreenWindow* _tmp11_;
GtkAdjustment* adjustment = NULL;
- gdouble _tmp13_ = 0.0;
- GtkAdjustment* _tmp14_ = NULL;
- GtkBuilder* _tmp15_ = NULL;
- GObject* _tmp16_ = NULL;
- GtkScale* _tmp17_ = NULL;
- GtkScale* _tmp18_ = NULL;
- GtkAdjustment* _tmp19_ = NULL;
- GtkBuilder* _tmp20_ = NULL;
- GObject* _tmp21_ = NULL;
- GtkSpinButton* _tmp22_ = NULL;
- GtkSpinButton* _tmp23_ = NULL;
- GtkAdjustment* _tmp24_ = NULL;
- GtkSpinButton* _tmp25_ = NULL;
- gdouble _tmp26_ = 0.0;
- GtkSpinButton* _tmp27_ = NULL;
- GtkSpinButton* _tmp28_ = NULL;
- GtkBuilder* _tmp29_ = NULL;
- GObject* _tmp30_ = NULL;
- GtkComboBoxText* _tmp31_ = NULL;
+ gdouble _tmp12_;
+ GtkAdjustment* _tmp13_;
+ GtkBuilder* _tmp14_;
+ GObject* _tmp15_;
+ GtkScale* _tmp16_;
+ GtkScale* _tmp17_;
+ GtkAdjustment* _tmp18_;
+ GtkBuilder* _tmp19_;
+ GObject* _tmp20_;
+ GtkSpinButton* _tmp21_;
+ GtkSpinButton* _tmp22_;
+ GtkAdjustment* _tmp23_;
+ GtkSpinButton* _tmp24_;
+ gdouble _tmp25_;
+ GtkSpinButton* _tmp26_;
+ GtkSpinButton* _tmp27_;
+ GtkBuilder* _tmp28_;
+ GObject* _tmp29_;
+ GtkComboBoxText* _tmp30_;
gchar* effect_id = NULL;
- ConfigFacade* _tmp32_ = NULL;
- ConfigFacade* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
+ ConfigFacade* _tmp31_;
+ ConfigFacade* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
gchar* null_display_name = NULL;
- TransitionEffectsManager* _tmp36_ = NULL;
- TransitionEffectsManager* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- GtkComboBoxText* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
- GtkComboBoxText* _tmp42_ = NULL;
+ TransitionEffectsManager* _tmp35_;
+ TransitionEffectsManager* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ GtkComboBoxText* _tmp39_;
+ const gchar* _tmp40_;
+ GtkComboBoxText* _tmp41_;
gint i = 0;
- GtkComboBoxText* _tmp67_ = NULL;
+ GtkComboBoxText* _tmp66_;
gdouble transition_delay = 0.0;
- ConfigFacade* _tmp68_ = NULL;
- ConfigFacade* _tmp69_ = NULL;
- gdouble _tmp70_ = 0.0;
- gdouble _tmp71_ = 0.0;
- GtkAdjustment* _tmp72_ = NULL;
- GtkBuilder* _tmp73_ = NULL;
- GObject* _tmp74_ = NULL;
- GtkScale* _tmp75_ = NULL;
- GtkScale* _tmp76_ = NULL;
- GtkAdjustment* _tmp77_ = NULL;
- GtkBuilder* _tmp78_ = NULL;
- GObject* _tmp79_ = NULL;
- GtkSpinButton* _tmp80_ = NULL;
- GtkSpinButton* _tmp81_ = NULL;
- GtkAdjustment* _tmp82_ = NULL;
- GtkSpinButton* _tmp83_ = NULL;
- GtkSpinButton* _tmp84_ = NULL;
- GtkSpinButton* _tmp85_ = NULL;
+ ConfigFacade* _tmp67_;
+ ConfigFacade* _tmp68_;
+ gdouble _tmp69_;
+ gdouble _tmp70_;
+ GtkAdjustment* _tmp71_;
+ GtkBuilder* _tmp72_;
+ GObject* _tmp73_;
+ GtkScale* _tmp74_;
+ GtkScale* _tmp75_;
+ GtkAdjustment* _tmp76_;
+ GtkBuilder* _tmp77_;
+ GObject* _tmp78_;
+ GtkSpinButton* _tmp79_;
+ GtkSpinButton* _tmp80_;
+ GtkAdjustment* _tmp81_;
+ GtkSpinButton* _tmp82_;
+ GtkSpinButton* _tmp83_;
+ GtkSpinButton* _tmp84_;
gboolean show_title = FALSE;
- ConfigFacade* _tmp86_ = NULL;
- ConfigFacade* _tmp87_ = NULL;
- gboolean _tmp88_ = FALSE;
- gboolean _tmp89_ = FALSE;
- GtkBuilder* _tmp90_ = NULL;
- GObject* _tmp91_ = NULL;
- GtkCheckButton* _tmp92_ = NULL;
- GtkCheckButton* _tmp93_ = NULL;
+ ConfigFacade* _tmp85_;
+ ConfigFacade* _tmp86_;
+ gboolean _tmp87_;
+ gboolean _tmp88_;
+ GtkBuilder* _tmp89_;
+ GObject* _tmp90_;
+ GtkCheckButton* _tmp91_;
+ GtkCheckButton* _tmp92_;
#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = (SlideshowPageSettingsDialog*) g_object_new (object_type, NULL);
#line 38 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2742,327 +2704,325 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
#line 47 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
#line 49 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp12_ = _ ("Settings");
-#line 49 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp12_);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Settings"));
#line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp13_ = delay;
+ _tmp12_ = delay;
#line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp14_ = gtk_adjustment_new (_tmp13_, CONFIG_FACADE_SLIDESHOW_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
+ _tmp13_ = gtk_adjustment_new (_tmp12_, CONFIG_FACADE_SLIDESHOW_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
#line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_object_ref_sink (_tmp14_);
+ g_object_ref_sink (_tmp13_);
#line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- adjustment = _tmp14_;
+ adjustment = _tmp13_;
#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp15_ = self->priv->builder;
+ _tmp14_ = self->priv->builder;
#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp16_ = gtk_builder_get_object (_tmp15_, "delay_hscale");
+ _tmp15_ = gtk_builder_get_object (_tmp14_, "delay_hscale");
#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp16_) : NULL);
+ _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp15_) : NULL);
#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->delay_hscale);
#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->delay_hscale = _tmp17_;
+ self->priv->delay_hscale = _tmp16_;
#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp18_ = self->priv->delay_hscale;
+ _tmp17_ = self->priv->delay_hscale;
#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp19_ = adjustment;
+ _tmp18_ = adjustment;
#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), _tmp19_);
+ gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), _tmp18_);
#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp20_ = self->priv->builder;
+ _tmp19_ = self->priv->builder;
#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp21_ = gtk_builder_get_object (_tmp20_, "delay_entry");
+ _tmp20_ = gtk_builder_get_object (_tmp19_, "delay_entry");
#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp21_) : NULL);
+ _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp20_) : NULL);
#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->delay_entry);
#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->delay_entry = _tmp22_;
+ self->priv->delay_entry = _tmp21_;
#line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp23_ = self->priv->delay_entry;
+ _tmp22_ = self->priv->delay_entry;
#line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp24_ = adjustment;
+ _tmp23_ = adjustment;
#line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_spin_button_set_adjustment (_tmp23_, _tmp24_);
+ gtk_spin_button_set_adjustment (_tmp22_, _tmp23_);
#line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp25_ = self->priv->delay_entry;
+ _tmp24_ = self->priv->delay_entry;
#line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp26_ = delay;
+ _tmp25_ = delay;
#line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_spin_button_set_value (_tmp25_, _tmp26_);
+ gtk_spin_button_set_value (_tmp24_, _tmp25_);
#line 58 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp27_ = self->priv->delay_entry;
+ _tmp26_ = self->priv->delay_entry;
#line 58 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_spin_button_set_numeric (_tmp27_, TRUE);
+ gtk_spin_button_set_numeric (_tmp26_, TRUE);
#line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp28_ = self->priv->delay_entry;
+ _tmp27_ = self->priv->delay_entry;
#line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_entry_get_type (), GtkEntry), TRUE);
+ gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_entry_get_type (), GtkEntry), TRUE);
#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp29_ = self->priv->builder;
+ _tmp28_ = self->priv->builder;
#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp30_ = gtk_builder_get_object (_tmp29_, "transition_effect_selector");
+ _tmp29_ = gtk_builder_get_object (_tmp28_, "transition_effect_selector");
#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp30_) : NULL);
+ _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp29_) : NULL);
#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->transition_effect_selector);
#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->transition_effect_selector = _tmp31_;
+ self->priv->transition_effect_selector = _tmp30_;
#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp32_ = config_facade_get_instance ();
+ _tmp31_ = config_facade_get_instance ();
#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp33_ = _tmp32_;
+ _tmp32_ = _tmp31_;
#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp34_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp33_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp35_ = _tmp34_;
+ _tmp34_ = _tmp33_;
#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _g_object_unref0 (_tmp33_);
+ _g_object_unref0 (_tmp32_);
#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- effect_id = _tmp35_;
+ effect_id = _tmp34_;
#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp36_ = transition_effects_manager_get_instance ();
+ _tmp35_ = transition_effects_manager_get_instance ();
#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp37_ = _tmp36_;
+ _tmp36_ = _tmp35_;
#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp38_ = transition_effects_manager_get_effect_name (_tmp37_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
+ _tmp37_ = transition_effects_manager_get_effect_name (_tmp36_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp39_ = _tmp38_;
+ _tmp38_ = _tmp37_;
#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _transition_effects_manager_unref0 (_tmp37_);
+ _transition_effects_manager_unref0 (_tmp36_);
#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- null_display_name = _tmp39_;
+ null_display_name = _tmp38_;
#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp40_ = self->priv->transition_effect_selector;
+ _tmp39_ = self->priv->transition_effect_selector;
#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp41_ = null_display_name;
+ _tmp40_ = null_display_name;
#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_combo_box_text_append_text (_tmp40_, _tmp41_);
+ gtk_combo_box_text_append_text (_tmp39_, _tmp40_);
#line 70 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp42_ = self->priv->transition_effect_selector;
+ _tmp41_ = self->priv->transition_effect_selector;
#line 70 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), 0);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), 0);
#line 72 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
i = 1;
-#line 2847 "SlideshowPage.c"
+#line 2807 "SlideshowPage.c"
{
GeeIterator* _display_name_it = NULL;
- TransitionEffectsManager* _tmp43_ = NULL;
- TransitionEffectsManager* _tmp44_ = NULL;
- GeeCollection* _tmp45_ = NULL;
- GeeCollection* _tmp46_ = NULL;
- GeeIterator* _tmp47_ = NULL;
- GeeIterator* _tmp48_ = NULL;
+ TransitionEffectsManager* _tmp42_;
+ TransitionEffectsManager* _tmp43_;
+ GeeCollection* _tmp44_;
+ GeeCollection* _tmp45_;
+ GeeIterator* _tmp46_;
+ GeeIterator* _tmp47_;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp43_ = transition_effects_manager_get_instance ();
+ _tmp42_ = transition_effects_manager_get_instance ();
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp44_ = _tmp43_;
+ _tmp43_ = _tmp42_;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp45_ = transition_effects_manager_get_effect_names (_tmp44_, _utf8_ci_compare_gcompare_data_func, NULL, NULL);
+ _tmp44_ = transition_effects_manager_get_effect_names (_tmp43_, _utf8_ci_compare_gcompare_data_func, NULL, NULL);
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp46_ = _tmp45_;
+ _tmp45_ = _tmp44_;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp47_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable));
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp48_ = _tmp47_;
+ _tmp47_ = _tmp46_;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _g_object_unref0 (_tmp46_);
+ _g_object_unref0 (_tmp45_);
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _transition_effects_manager_unref0 (_tmp44_);
+ _transition_effects_manager_unref0 (_tmp43_);
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _display_name_it = _tmp48_;
+ _display_name_it = _tmp47_;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
while (TRUE) {
-#line 2876 "SlideshowPage.c"
- GeeIterator* _tmp49_ = NULL;
- gboolean _tmp50_ = FALSE;
+#line 2836 "SlideshowPage.c"
+ GeeIterator* _tmp48_;
+ gboolean _tmp49_;
gchar* display_name = NULL;
- GeeIterator* _tmp51_ = NULL;
- gpointer _tmp52_ = NULL;
- const gchar* _tmp53_ = NULL;
- const gchar* _tmp54_ = NULL;
- GtkComboBoxText* _tmp55_ = NULL;
- const gchar* _tmp56_ = NULL;
- const gchar* _tmp57_ = NULL;
- TransitionEffectsManager* _tmp58_ = NULL;
- TransitionEffectsManager* _tmp59_ = NULL;
- const gchar* _tmp60_ = NULL;
- gchar* _tmp61_ = NULL;
- gchar* _tmp62_ = NULL;
- gboolean _tmp63_ = FALSE;
- gint _tmp66_ = 0;
+ GeeIterator* _tmp50_;
+ gpointer _tmp51_;
+ const gchar* _tmp52_;
+ const gchar* _tmp53_;
+ GtkComboBoxText* _tmp54_;
+ const gchar* _tmp55_;
+ const gchar* _tmp56_;
+ TransitionEffectsManager* _tmp57_;
+ TransitionEffectsManager* _tmp58_;
+ const gchar* _tmp59_;
+ gchar* _tmp60_;
+ gchar* _tmp61_;
+ gboolean _tmp62_;
+ gint _tmp65_;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp49_ = _display_name_it;
+ _tmp48_ = _display_name_it;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp50_ = gee_iterator_next (_tmp49_);
+ _tmp49_ = gee_iterator_next (_tmp48_);
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- if (!_tmp50_) {
+ if (!_tmp49_) {
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
break;
-#line 2902 "SlideshowPage.c"
+#line 2862 "SlideshowPage.c"
}
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp51_ = _display_name_it;
+ _tmp50_ = _display_name_it;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp52_ = gee_iterator_get (_tmp51_);
+ _tmp51_ = gee_iterator_get (_tmp50_);
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- display_name = (gchar*) _tmp52_;
+ display_name = (gchar*) _tmp51_;
#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp53_ = display_name;
+ _tmp52_ = display_name;
#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp54_ = null_display_name;
+ _tmp53_ = null_display_name;
#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- if (g_strcmp0 (_tmp53_, _tmp54_) == 0) {
+ if (g_strcmp0 (_tmp52_, _tmp53_) == 0) {
#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_free0 (display_name);
#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
continue;
-#line 2920 "SlideshowPage.c"
+#line 2880 "SlideshowPage.c"
}
#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp55_ = self->priv->transition_effect_selector;
+ _tmp54_ = self->priv->transition_effect_selector;
#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp56_ = display_name;
+ _tmp55_ = display_name;
#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_combo_box_text_append_text (_tmp55_, _tmp56_);
+ gtk_combo_box_text_append_text (_tmp54_, _tmp55_);
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp57_ = effect_id;
+ _tmp56_ = effect_id;
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp58_ = transition_effects_manager_get_instance ();
+ _tmp57_ = transition_effects_manager_get_instance ();
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp59_ = _tmp58_;
+ _tmp58_ = _tmp57_;
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp60_ = display_name;
+ _tmp59_ = display_name;
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp61_ = transition_effects_manager_get_id_for_effect_name (_tmp59_, _tmp60_);
+ _tmp60_ = transition_effects_manager_get_id_for_effect_name (_tmp58_, _tmp59_);
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp62_ = _tmp61_;
+ _tmp61_ = _tmp60_;
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp63_ = g_strcmp0 (_tmp57_, _tmp62_) == 0;
+ _tmp62_ = g_strcmp0 (_tmp56_, _tmp61_) == 0;
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _g_free0 (_tmp62_);
+ _g_free0 (_tmp61_);
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _transition_effects_manager_unref0 (_tmp59_);
+ _transition_effects_manager_unref0 (_tmp58_);
#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- if (_tmp63_) {
-#line 2948 "SlideshowPage.c"
- GtkComboBoxText* _tmp64_ = NULL;
- gint _tmp65_ = 0;
+ if (_tmp62_) {
+#line 2908 "SlideshowPage.c"
+ GtkComboBoxText* _tmp63_;
+ gint _tmp64_;
#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp64_ = self->priv->transition_effect_selector;
+ _tmp63_ = self->priv->transition_effect_selector;
#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp65_ = i;
+ _tmp64_ = i;
#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_combo_box_get_type (), GtkComboBox), _tmp65_);
-#line 2957 "SlideshowPage.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_combo_box_get_type (), GtkComboBox), _tmp64_);
+#line 2917 "SlideshowPage.c"
}
#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp66_ = i;
+ _tmp65_ = i;
#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- i = _tmp66_ + 1;
+ i = _tmp65_ + 1;
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_free0 (display_name);
-#line 2965 "SlideshowPage.c"
+#line 2925 "SlideshowPage.c"
}
#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (_display_name_it);
-#line 2969 "SlideshowPage.c"
+#line 2929 "SlideshowPage.c"
}
#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp67_ = self->priv->transition_effect_selector;
+ _tmp66_ = self->priv->transition_effect_selector;
#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0);
#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp68_ = config_facade_get_instance ();
+ _tmp67_ = config_facade_get_instance ();
#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp69_ = _tmp68_;
+ _tmp68_ = _tmp67_;
#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp70_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp69_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp71_ = _tmp70_;
+ _tmp70_ = _tmp69_;
#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _g_object_unref0 (_tmp69_);
+ _g_object_unref0 (_tmp68_);
#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- transition_delay = _tmp71_;
+ transition_delay = _tmp70_;
#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp72_ = gtk_adjustment_new (transition_delay, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
+ _tmp71_ = gtk_adjustment_new (transition_delay, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_object_ref_sink (_tmp72_);
+ g_object_ref_sink (_tmp71_);
#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->transition_effect_adjustment);
#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->transition_effect_adjustment = _tmp72_;
+ self->priv->transition_effect_adjustment = _tmp71_;
#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp73_ = self->priv->builder;
+ _tmp72_ = self->priv->builder;
#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp74_ = gtk_builder_get_object (_tmp73_, "transition_effect_hscale");
+ _tmp73_ = gtk_builder_get_object (_tmp72_, "transition_effect_hscale");
#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp75_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp74_) : NULL);
+ _tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp73_) : NULL);
#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->transition_effect_hscale);
#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->transition_effect_hscale = _tmp75_;
+ self->priv->transition_effect_hscale = _tmp74_;
#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp76_ = self->priv->transition_effect_hscale;
+ _tmp75_ = self->priv->transition_effect_hscale;
#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp77_ = self->priv->transition_effect_adjustment;
+ _tmp76_ = self->priv->transition_effect_adjustment;
#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_range_get_type (), GtkRange), _tmp77_);
+ gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_range_get_type (), GtkRange), _tmp76_);
#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp78_ = self->priv->builder;
+ _tmp77_ = self->priv->builder;
#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp79_ = gtk_builder_get_object (_tmp78_, "transition_effect_entry");
+ _tmp78_ = gtk_builder_get_object (_tmp77_, "transition_effect_entry");
#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp79_) : NULL);
+ _tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp78_) : NULL);
#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->transition_effect_entry);
#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->transition_effect_entry = _tmp80_;
+ self->priv->transition_effect_entry = _tmp79_;
#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp81_ = self->priv->transition_effect_entry;
+ _tmp80_ = self->priv->transition_effect_entry;
#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp82_ = self->priv->transition_effect_adjustment;
+ _tmp81_ = self->priv->transition_effect_adjustment;
#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_spin_button_set_adjustment (_tmp81_, _tmp82_);
+ gtk_spin_button_set_adjustment (_tmp80_, _tmp81_);
#line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp83_ = self->priv->transition_effect_entry;
+ _tmp82_ = self->priv->transition_effect_entry;
#line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_spin_button_set_value (_tmp83_, transition_delay);
+ gtk_spin_button_set_value (_tmp82_, transition_delay);
#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp84_ = self->priv->transition_effect_entry;
+ _tmp83_ = self->priv->transition_effect_entry;
#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_spin_button_set_numeric (_tmp84_, TRUE);
+ gtk_spin_button_set_numeric (_tmp83_, TRUE);
#line 97 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp85_ = self->priv->transition_effect_entry;
+ _tmp84_ = self->priv->transition_effect_entry;
#line 97 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_entry_get_type (), GtkEntry), TRUE);
+ gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_entry_get_type (), GtkEntry), TRUE);
#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp86_ = config_facade_get_instance ();
+ _tmp85_ = config_facade_get_instance ();
#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp87_ = _tmp86_;
+ _tmp86_ = _tmp85_;
#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp88_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp87_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp89_ = _tmp88_;
+ _tmp88_ = _tmp87_;
#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _g_object_unref0 (_tmp87_);
+ _g_object_unref0 (_tmp86_);
#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- show_title = _tmp89_;
+ show_title = _tmp88_;
#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp90_ = self->priv->builder;
+ _tmp89_ = self->priv->builder;
#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp91_ = gtk_builder_get_object (_tmp90_, "show_title_button");
+ _tmp90_ = gtk_builder_get_object (_tmp89_, "show_title_button");
#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp92_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp91_) : NULL);
+ _tmp91_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp90_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp90_) : NULL);
#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_object_unref0 (self->priv->show_title_button);
#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- self->priv->show_title_button = _tmp92_;
+ self->priv->show_title_button = _tmp91_;
#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- _tmp93_ = self->priv->show_title_button;
+ _tmp92_ = self->priv->show_title_button;
#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, gtk_toggle_button_get_type (), GtkToggleButton), show_title);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, gtk_toggle_button_get_type (), GtkToggleButton), show_title);
#line 103 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
#line 105 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3075,26 +3035,26 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
_g_object_unref0 (adjustment);
#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return self;
-#line 3077 "SlideshowPage.c"
+#line 3037 "SlideshowPage.c"
}
static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void) {
#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return slideshow_page_settings_dialog_construct (SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG);
-#line 3084 "SlideshowPage.c"
+#line 3044 "SlideshowPage.c"
}
static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self) {
gchar* selected = NULL;
- GtkComboBoxText* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ GtkComboBoxText* _tmp0_;
+ gchar* _tmp1_;
gboolean _tmp2_ = FALSE;
- const gchar* _tmp3_ = NULL;
+ const gchar* _tmp3_;
gboolean sensitive = FALSE;
- GtkScale* _tmp5_ = NULL;
- GtkSpinButton* _tmp6_ = NULL;
+ GtkScale* _tmp5_;
+ GtkSpinButton* _tmp6_;
#line 108 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self));
#line 109 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3107,17 +3067,17 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
_tmp3_ = selected;
#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp3_ != NULL) {
-#line 3109 "SlideshowPage.c"
- const gchar* _tmp4_ = NULL;
+#line 3069 "SlideshowPage.c"
+ const gchar* _tmp4_;
#line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp4_ = selected;
#line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = g_strcmp0 (_tmp4_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID) != 0;
-#line 3115 "SlideshowPage.c"
+#line 3075 "SlideshowPage.c"
} else {
#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp2_ = FALSE;
-#line 3119 "SlideshowPage.c"
+#line 3079 "SlideshowPage.c"
}
#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
sensitive = _tmp2_;
@@ -3131,14 +3091,14 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitive);
#line 108 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_g_free0 (selected);
-#line 3133 "SlideshowPage.c"
+#line 3093 "SlideshowPage.c"
}
static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDialog* self) {
gdouble result = 0.0;
- GtkSpinButton* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
+ GtkSpinButton* _tmp0_;
+ gdouble _tmp1_;
#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0);
#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3149,14 +3109,14 @@ static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDi
result = _tmp1_;
#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 3151 "SlideshowPage.c"
+#line 3111 "SlideshowPage.c"
}
static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPageSettingsDialog* self) {
gdouble result = 0.0;
- GtkSpinButton* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
+ GtkSpinButton* _tmp0_;
+ gdouble _tmp1_;
#line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0);
#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3167,25 +3127,25 @@ static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPag
result = _tmp1_;
#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 3169 "SlideshowPage.c"
+#line 3129 "SlideshowPage.c"
}
static gchar* slideshow_page_settings_dialog_get_transition_effect_id (SlideshowPageSettingsDialog* self) {
gchar* result = NULL;
gchar* active = NULL;
- GtkComboBoxText* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ GtkComboBoxText* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
gchar* id = NULL;
- TransitionEffectsManager* _tmp4_ = NULL;
- TransitionEffectsManager* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ TransitionEffectsManager* _tmp4_;
+ TransitionEffectsManager* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
const gchar* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
- gchar* _tmp12_ = NULL;
+ const gchar* _tmp10_;
+ gchar* _tmp12_;
#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), NULL);
#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3198,8 +3158,8 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
_tmp2_ = active;
#line 127 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp2_ == NULL) {
-#line 3200 "SlideshowPage.c"
- gchar* _tmp3_ = NULL;
+#line 3160 "SlideshowPage.c"
+ gchar* _tmp3_;
#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3208,7 +3168,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
_g_free0 (active);
#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 3210 "SlideshowPage.c"
+#line 3170 "SlideshowPage.c"
}
#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp4_ = transition_effects_manager_get_instance ();
@@ -3228,17 +3188,17 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
_tmp10_ = id;
#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
if (_tmp10_ != NULL) {
-#line 3230 "SlideshowPage.c"
- const gchar* _tmp11_ = NULL;
+#line 3190 "SlideshowPage.c"
+ const gchar* _tmp11_;
#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp11_ = id;
#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp9_ = _tmp11_;
-#line 3236 "SlideshowPage.c"
+#line 3196 "SlideshowPage.c"
} else {
#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID;
-#line 3240 "SlideshowPage.c"
+#line 3200 "SlideshowPage.c"
}
#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
_tmp12_ = g_strdup (_tmp9_);
@@ -3250,15 +3210,15 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
_g_free0 (active);
#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 3252 "SlideshowPage.c"
+#line 3212 "SlideshowPage.c"
}
static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSettingsDialog* self) {
gboolean result = FALSE;
- GtkCheckButton* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
+ GtkCheckButton* _tmp0_;
+ gboolean _tmp1_;
+ gboolean _tmp2_;
#line 135 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), FALSE);
#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3271,7 +3231,7 @@ static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSett
result = _tmp2_;
#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
return result;
-#line 3273 "SlideshowPage.c"
+#line 3233 "SlideshowPage.c"
}
@@ -3282,7 +3242,7 @@ static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDial
g_type_class_add_private (klass, sizeof (SlideshowPageSettingsDialogPrivate));
#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
G_OBJECT_CLASS (klass)->finalize = slideshow_page_settings_dialog_finalize;
-#line 3284 "SlideshowPage.c"
+#line 3244 "SlideshowPage.c"
}
@@ -3291,11 +3251,11 @@ static void slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsD
self->priv = SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE (self);
#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self->priv->builder = NULL;
-#line 3293 "SlideshowPage.c"
+#line 3253 "SlideshowPage.c"
}
-static void slideshow_page_settings_dialog_finalize (GObject* obj) {
+static void slideshow_page_settings_dialog_finalize (GObject * obj) {
SlideshowPageSettingsDialog * self;
#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialog);
@@ -3319,7 +3279,7 @@ static void slideshow_page_settings_dialog_finalize (GObject* obj) {
_g_object_unref0 (self->priv->pane);
#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
G_OBJECT_CLASS (slideshow_page_settings_dialog_parent_class)->finalize (obj);
-#line 3321 "SlideshowPage.c"
+#line 3281 "SlideshowPage.c"
}
@@ -3341,27 +3301,27 @@ static void slideshow_page_class_init (SlideshowPageClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
g_type_class_add_private (klass, sizeof (SlideshowPagePrivate));
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- ((PageClass *) klass)->switched_to = (void (*)(Page*)) slideshow_page_real_switched_to;
+ ((PageClass *) klass)->switched_to = (void (*) (Page *)) slideshow_page_real_switched_to;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- ((PageClass *) klass)->switching_from = (void (*)(Page*)) slideshow_page_real_switching_from;
+ ((PageClass *) klass)->switching_from = (void (*) (Page *)) slideshow_page_real_switching_from;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- ((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*)(SinglePhotoPage*)) slideshow_page_real_on_previous_photo;
+ ((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) slideshow_page_real_on_previous_photo;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- ((SinglePhotoPageClass *) klass)->on_next_photo = (void (*)(SinglePhotoPage*)) slideshow_page_real_on_next_photo;
+ ((SinglePhotoPageClass *) klass)->on_next_photo = (void (*) (SinglePhotoPage *)) slideshow_page_real_on_next_photo;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) slideshow_page_real_key_press_event;
+ ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) slideshow_page_real_key_press_event;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- ((SinglePhotoPageClass *) klass)->paint = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) slideshow_page_real_paint;
+ ((SinglePhotoPageClass *) klass)->paint = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) slideshow_page_real_paint;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
G_OBJECT_CLASS (klass)->finalize = slideshow_page_finalize;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
- g_signal_new ("hide_toolbar", TYPE_SLIDESHOW_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3358 "SlideshowPage.c"
+ slideshow_page_signals[SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL] = g_signal_new ("hide-toolbar", TYPE_SLIDESHOW_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3318 "SlideshowPage.c"
}
static void slideshow_page_instance_init (SlideshowPage * self) {
- GTimer* _tmp0_ = NULL;
+ GTimer* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self->priv = SLIDESHOW_PAGE_GET_PRIVATE (self);
#line 16 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -3374,11 +3334,11 @@ static void slideshow_page_instance_init (SlideshowPage * self) {
self->priv->playing = TRUE;
#line 19 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self->priv->exiting = FALSE;
-#line 3376 "SlideshowPage.c"
+#line 3336 "SlideshowPage.c"
}
-static void slideshow_page_finalize (GObject* obj) {
+static void slideshow_page_finalize (GObject * obj) {
SlideshowPage * self;
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SLIDESHOW_PAGE, SlideshowPage);
@@ -3402,7 +3362,7 @@ static void slideshow_page_finalize (GObject* obj) {
_screensaver_unref0 (self->priv->screensaver);
#line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
G_OBJECT_CLASS (slideshow_page_parent_class)->finalize (obj);
-#line 3404 "SlideshowPage.c"
+#line 3364 "SlideshowPage.c"
}