diff options
Diffstat (limited to 'src/SlideshowPage.c')
| -rw-r--r-- | src/SlideshowPage.c | 2390 | 
1 files changed, 1104 insertions, 1286 deletions
| diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c index 642fce7..a9b13ec 100644 --- a/src/SlideshowPage.c +++ b/src/SlideshowPage.c @@ -473,15 +473,13 @@ struct _SlideshowPageSettingsDialogClass {  };  struct _SlideshowPageSettingsDialogPrivate { -	GtkBuilder* builder; +	GtkAdjustment* delay_adjustment;  	GtkSpinButton* delay_entry; -	GtkScale* delay_hscale;  	GtkComboBoxText* transition_effect_selector;  	GtkScale* transition_effect_hscale;  	GtkSpinButton* transition_effect_entry;  	GtkAdjustment* transition_effect_adjustment;  	GtkCheckButton* show_title_button; -	GtkBox* pane;  }; @@ -634,12 +632,7 @@ gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self);  enum  {  	SLIDESHOW_PAGE_SETTINGS_DIALOG_DUMMY_PROPERTY  }; -GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);  FullscreenWindow* app_window_get_fullscreen (void); -#define RESOURCES_CANCEL_LABEL _ ("_Cancel") -#define RESOURCES_OK_LABEL _ ("_OK") -#define CONFIG_FACADE_SLIDESHOW_DELAY_MIN 1.0 -#define CONFIG_FACADE_SLIDESHOW_DELAY_MAX 30.0  gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, const gchar* effect_id);  GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, GCompareDataFunc comparator, void* comparator_target, GDestroyNotify comparator_target_destroy_notify);  gint utf8_ci_compare (void* a, void* b); @@ -647,8 +640,6 @@ static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer  gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, const gchar* effect_name);  static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self);  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 _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -656,44 +647,44 @@ 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" +#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return self ? data_collection_ref (self) : NULL; -#line 662 "SlideshowPage.c" +#line 653 "SlideshowPage.c"  }  static gpointer _g_object_ref0 (gpointer self) { -#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return self ? g_object_ref (self) : NULL; -#line 669 "SlideshowPage.c" +#line 660 "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" +#line 137 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 676 "SlideshowPage.c" +#line 667 "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" +#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_on_play_pause ((SlideshowPage*) self); -#line 683 "SlideshowPage.c" +#line 674 "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" +#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 690 "SlideshowPage.c" +#line 681 "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" +#line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_on_change_settings ((SlideshowPage*) self); -#line 697 "SlideshowPage.c" +#line 688 "SlideshowPage.c"  } @@ -733,195 +724,195 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so  	GtkToolButton* _tmp26_;  	GtkToolButton* _tmp27_;  	Screensaver* _tmp28_; -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/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" +#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (IS_VIEW_COLLECTION (controller), NULL); -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/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" +#line 115 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = (SlideshowPage*) single_photo_page_construct (object_type, _ ("Slideshow"), TRUE); -#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = sources; -#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = _data_collection_ref0 (_tmp0_); -#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_data_collection_unref0 (self->priv->sources); -#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->sources = _tmp1_; -#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = controller; -#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = _data_collection_ref0 (_tmp2_); -#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_data_collection_unref0 (self->priv->controller); -#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->controller = _tmp3_; -#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = transition_effects_manager_get_instance (); -#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = _tmp4_; -#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = transition_effects_manager_get_effect_ids (_tmp5_); -#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = _tmp6_; -#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_transition_effects_manager_unref0 (_tmp5_); -#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	pluggables = _tmp7_; -#line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_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" +#line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	a = _tmp8_; -#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gee_array_list_add_all (a, pluggables); -#line 149 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 123 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), NULL_TRANSITION_DESCRIPTOR_EFFECT_ID); -#line 150 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 124 "/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" +#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_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" +#line 125 "/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" +#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->transitions = _tmp10_; -#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->transitions_length1 = _tmp9_; -#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->_transitions_size_ = self->priv->transitions_length1; -#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp11_ = start; -#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp12_ = _g_object_ref0 (_tmp11_); -#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->current); -#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->current = _tmp12_; -#line 154 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_update_transition_effect (self); -#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 131 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp13_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 131 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	toolbar = _tmp13_; -#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp14_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Back")); -#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_object_ref_sink (_tmp14_); -#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	previous_button = _tmp14_; -#line 161 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 135 "/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" +#line 136 "/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), _ ("Go to the previous photo")); -#line 163 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 137 "/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" +#line 139 "/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" +#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp15_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Pause")); -#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_object_ref_sink (_tmp15_); -#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->play_pause_button); -#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->play_pause_button = _tmp15_; -#line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 142 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp16_ = self->priv->play_pause_button; -#line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 142 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gtk_tool_button_set_icon_name (_tmp16_, "media-playback-pause"); -#line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp17_ = self->priv->play_pause_button; -#line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp18_ = self->priv->play_pause_button; -#line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp19_ = self->priv->play_pause_button; -#line 172 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Next")); -#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_object_ref_sink (_tmp20_); -#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	next_button = _tmp20_; -#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 149 "/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" +#line 150 "/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), _ ("Go to the next photo")); -#line 177 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 151 "/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" +#line 153 "/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" +#line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp21_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); -#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_object_ref_sink (_tmp21_); -#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->settings_button); -#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->settings_button = _tmp21_; -#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 156 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp22_ = self->priv->settings_button; -#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 156 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gtk_tool_button_set_icon_name (_tmp22_, "preferences-system"); -#line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp23_ = self->priv->settings_button; -#line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gtk_tool_button_set_label (_tmp23_, _ ("Settings")); -#line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 158 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp24_ = self->priv->settings_button; -#line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 158 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp25_ = self->priv->settings_button; -#line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp26_ = self->priv->settings_button; -#line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp27_ = self->priv->settings_button; -#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp28_ = screensaver_new (); -#line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_screensaver_unref0 (self->priv->screensaver); -#line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->screensaver = _tmp28_; -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (next_button); -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (previous_button); -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (toolbar); -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (a); -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (pluggables); -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return self; -#line 909 "SlideshowPage.c" +#line 900 "SlideshowPage.c"  }  SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start) { -#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return slideshow_page_construct (TYPE_SLIDESHOW_PAGE, sources, controller, start); -#line 916 "SlideshowPage.c" +#line 907 "SlideshowPage.c"  }  static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self) {  	gboolean result;  	result = slideshow_page_auto_advance ((SlideshowPage*) self); -#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 179 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 925 "SlideshowPage.c" +#line 916 "SlideshowPage.c"  } @@ -937,81 +928,81 @@ static void slideshow_page_real_switched_to (Page* base) {  	gboolean _tmp6_;  	GTimer* _tmp11_;  	Screensaver* _tmp12_; -#line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 167 "/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" +#line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	PAGE_CLASS (slideshow_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); -#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->sources; -#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_); -#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = pixbuf_cache_new (_tmp0_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp1_, SLIDESHOW_PAGE_READAHEAD_COUNT, NULL, NULL); -#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->cache); -#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->cache = _tmp2_; -#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = self->priv->current; -#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = slideshow_page_get_next_photo (self, _tmp3_, DIRECTION_FORWARD, &_tmp4_, &_tmp5_); -#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->current); -#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->current = _tmp4_; -#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (pixbuf); -#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	pixbuf = _tmp5_; -#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp6_) { -#line 969 "SlideshowPage.c" +#line 960 "SlideshowPage.c"  		GdkPixbuf* _tmp7_;  		Photo* _tmp8_;  		Dimensions _tmp9_ = {0};  		Direction _tmp10_; -#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp7_ = pixbuf; -#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8_ = self->priv->current; -#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_); -#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp10_ = DIRECTION_FORWARD; -#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 176 "/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 984 "SlideshowPage.c" +#line 975 "SlideshowPage.c"  	} -#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 179 "/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); -#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 180 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp11_ = self->priv->timer; -#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 180 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_timer_start (_tmp11_); -#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp12_ = self->priv->screensaver; -#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	screensaver_inhibit (_tmp12_, "Playing slideshow"); -#line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (pixbuf); -#line 998 "SlideshowPage.c" +#line 989 "SlideshowPage.c"  }  static void slideshow_page_real_switching_from (Page* base) {  	SlideshowPage * self;  	Screensaver* _tmp0_; -#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 185 "/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" +#line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	PAGE_CLASS (slideshow_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); -#line 214 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->screensaver; -#line 214 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	screensaver_uninhibit (_tmp0_); -#line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 189 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->exiting = TRUE; -#line 1015 "SlideshowPage.c" +#line 1006 "SlideshowPage.c"  } @@ -1022,26 +1013,26 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start  	Photo* _tmp0_;  	Photo* _tmp1_;  	GError * _inner_error_ = NULL; -#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE); -#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (IS_PHOTO (start), FALSE); -#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = start; -#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = _g_object_ref0 (_tmp0_); -#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_vala_next); -#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_vala_next = _tmp1_; -#line 1038 "SlideshowPage.c" +#line 1029 "SlideshowPage.c"  	{  		gboolean _tmp2_ = FALSE; -#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = TRUE; -#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		while (TRUE) { -#line 1045 "SlideshowPage.c" +#line 1036 "SlideshowPage.c"  			DataSource* forward = NULL;  			DataSource* back = NULL;  			ViewCollection* _tmp40_; @@ -1062,46 +1053,46 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start  			DataSource* _tmp54_;  			PixbufCache* _tmp55_;  			GeeSet* _tmp56_; -#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			if (!_tmp2_) { -#line 1068 "SlideshowPage.c" +#line 1059 "SlideshowPage.c"  			} -#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp2_ = FALSE; -#line 1072 "SlideshowPage.c" +#line 1063 "SlideshowPage.c"  			{  				GdkPixbuf* _tmp3_ = NULL;  				PixbufCache* _tmp4_;  				Photo* _tmp5_;  				GdkPixbuf* _tmp6_;  				GdkPixbuf* _tmp7_; -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp4_ = self->priv->cache; -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp5_ = _vala_next; -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp6_ = pixbuf_cache_fetch (_tmp4_, _tmp5_, &_inner_error_); -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp3_ = _tmp6_; -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1089 "SlideshowPage.c" -					goto __catch462_g_error; +#line 1080 "SlideshowPage.c" +					goto __catch470_g_error;  				} -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp7_ = _tmp3_; -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp3_ = NULL; -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_vala_next_pixbuf); -#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_vala_next_pixbuf = _tmp7_; -#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_tmp3_); -#line 1102 "SlideshowPage.c" +#line 1093 "SlideshowPage.c"  			} -			goto __finally462; -			__catch462_g_error: +			goto __finally470; +			__catch470_g_error:  			{  				GError* err = NULL;  				Photo* _tmp8_; @@ -1122,308 +1113,308 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start  				gboolean _tmp28_ = FALSE;  				Photo* _tmp29_;  				Photo* _tmp30_; -#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				err = _inner_error_; -#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_inner_error_ = NULL; -#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp8_ = _vala_next; -#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); -#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp10_ = _tmp9_; -#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp11_ = err; -#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp12_ = _tmp11_->message; -#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				g_warning ("SlideshowPage.vala:227: Unable to fetch pixbuf for %s: %s", _tmp10_, _tmp12_); -#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +				g_warning ("SlideshowPage.vala:201: Unable to fetch pixbuf for %s: %s", _tmp10_, _tmp12_); +#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_free0 (_tmp10_); -#line 230 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp13_ = self->priv->controller; -#line 230 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp14_ = _vala_next; -#line 230 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp15_ = view_collection_get_view_for_source (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource)); -#line 230 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				view = _tmp15_; -#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp17_ = direction; -#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				if (_tmp17_ == DIRECTION_FORWARD) { -#line 1156 "SlideshowPage.c" +#line 1147 "SlideshowPage.c"  					ViewCollection* _tmp18_;  					DataView* _tmp19_;  					DataView* _tmp20_; -#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp18_ = self->priv->controller; -#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp19_ = view; -#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp20_ = view_collection_get_next (_tmp18_, _tmp19_); -#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (_tmp16_); -#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp16_ = _tmp20_; -#line 1170 "SlideshowPage.c" +#line 1161 "SlideshowPage.c"  				} else {  					ViewCollection* _tmp21_;  					DataView* _tmp22_;  					DataView* _tmp23_; -#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp21_ = self->priv->controller; -#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp22_ = view; -#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp23_ = view_collection_get_previous (_tmp21_, _tmp22_); -#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (_tmp16_); -#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp16_ = _tmp23_; -#line 1185 "SlideshowPage.c" +#line 1176 "SlideshowPage.c"  				} -#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp24_ = _g_object_ref0 (_tmp16_); -#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (view); -#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				view = _tmp24_; -#line 234 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp25_ = view; -#line 234 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp26_ = data_view_get_source (_tmp25_); -#line 234 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_vala_next); -#line 234 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_vala_next = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo); -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp29_ = _vala_next; -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_tmp30_ = start; -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				if (_tmp29_ == _tmp30_) { -#line 1207 "SlideshowPage.c" +#line 1198 "SlideshowPage.c"  					Photo* _tmp31_;  					Photo* _tmp32_; -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp31_ = _vala_next; -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp32_ = self->priv->current; -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp28_ = _tmp31_ != _tmp32_; -#line 1216 "SlideshowPage.c" +#line 1207 "SlideshowPage.c"  				} else { -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp28_ = FALSE; -#line 1220 "SlideshowPage.c" +#line 1211 "SlideshowPage.c"  				} -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				if (_tmp28_) { -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp27_ = TRUE; -#line 1226 "SlideshowPage.c" +#line 1217 "SlideshowPage.c"  				} else {  					Photo* _tmp33_;  					Photo* _tmp34_; -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp33_ = _vala_next; -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp34_ = self->priv->current; -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp27_ = _tmp33_ == _tmp34_; -#line 1236 "SlideshowPage.c" +#line 1227 "SlideshowPage.c"  				} -#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				if (_tmp27_) { -#line 1240 "SlideshowPage.c" +#line 1231 "SlideshowPage.c"  					GtkWindow* _tmp35_;  					GtkWindow* _tmp36_;  					AppWindow* _tmp37_;  					AppWindow* _tmp38_; -#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp36_ = _tmp35_; -#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					app_window_error_message (_ ("All photo source files are missing."), _tmp36_); -#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (_tmp36_); -#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp37_ = app_window_get_instance (); -#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_tmp38_ = _tmp37_; -#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					app_window_end_fullscreen (_tmp38_); -#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (_tmp38_); -#line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (_vala_next); -#line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_vala_next = NULL; -#line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 216 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (_vala_next_pixbuf); -#line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 216 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_vala_next_pixbuf = NULL; -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					result = FALSE; -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (_tmp16_); -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (view); -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_error_free0 (err); -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					if (next) { -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  						*next = _vala_next; -#line 1281 "SlideshowPage.c" +#line 1272 "SlideshowPage.c"  					} else { -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  						_g_object_unref0 (_vala_next); -#line 1285 "SlideshowPage.c" +#line 1276 "SlideshowPage.c"  					} -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					if (next_pixbuf) { -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  						*next_pixbuf = _vala_next_pixbuf; -#line 1291 "SlideshowPage.c" +#line 1282 "SlideshowPage.c"  					} else { -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  						_g_object_unref0 (_vala_next_pixbuf); -#line 1295 "SlideshowPage.c" +#line 1286 "SlideshowPage.c"  					} -#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					return result; -#line 1299 "SlideshowPage.c" +#line 1290 "SlideshowPage.c"  				} -#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_tmp16_); -#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (view); -#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_error_free0 (err); -#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				continue; -#line 1309 "SlideshowPage.c" +#line 1300 "SlideshowPage.c"  			} -			__finally462: -#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			__finally470: +#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1314 "SlideshowPage.c" +#line 1305 "SlideshowPage.c"  				gboolean _tmp39_ = FALSE; -#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 197 "/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" +#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				g_clear_error (&_inner_error_); -#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				return _tmp39_; -#line 1322 "SlideshowPage.c" +#line 1313 "SlideshowPage.c"  			} -#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp40_ = self->priv->controller; -#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp41_ = _vala_next; -#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			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" +#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (forward); -#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			forward = _tmp42_; -#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (back); -#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			back = _tmp43_; -#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp44_ = self->priv->cache; -#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp45_ = forward; -#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			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" +#line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp46_ = self->priv->cache; -#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp47_ = back; -#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			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" +#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp48_ = self->priv->controller; -#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp49_ = _vala_next; -#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_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" +#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			neighbors = _tmp50_; -#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp51_ = neighbors; -#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp52_ = forward; -#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_); -#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp53_ = neighbors; -#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp54_ = back; -#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_); -#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp55_ = self->priv->cache; -#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp56_ = neighbors; -#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			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" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			result = TRUE; -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (neighbors); -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (back); -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (forward); -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			if (next) { -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				*next = _vala_next; -#line 1388 "SlideshowPage.c" +#line 1379 "SlideshowPage.c"  			} else { -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_vala_next); -#line 1392 "SlideshowPage.c" +#line 1383 "SlideshowPage.c"  			} -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			if (next_pixbuf) { -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				*next_pixbuf = _vala_next_pixbuf; -#line 1398 "SlideshowPage.c" +#line 1389 "SlideshowPage.c"  			} else { -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_vala_next_pixbuf); -#line 1402 "SlideshowPage.c" +#line 1393 "SlideshowPage.c"  			} -#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			return result; -#line 1406 "SlideshowPage.c" +#line 1397 "SlideshowPage.c"  		}  	} -#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (next) { -#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		*next = _vala_next; -#line 1413 "SlideshowPage.c" +#line 1404 "SlideshowPage.c"  	} else { -#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_vala_next); -#line 1417 "SlideshowPage.c" +#line 1408 "SlideshowPage.c"  	} -#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (next_pixbuf) { -#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		*next_pixbuf = _vala_next_pixbuf; -#line 1423 "SlideshowPage.c" +#line 1414 "SlideshowPage.c"  	} else { -#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_vala_next_pixbuf); -#line 1427 "SlideshowPage.c" +#line 1418 "SlideshowPage.c"  	}  } @@ -1432,56 +1423,56 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {  	gboolean _tmp0_;  	gboolean _tmp7_;  	GTimer* _tmp8_; -#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self)); -#line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->playing; -#line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp0_) { -#line 1442 "SlideshowPage.c" +#line 1433 "SlideshowPage.c"  		GtkToolButton* _tmp1_;  		GtkToolButton* _tmp2_;  		GtkToolButton* _tmp3_; -#line 269 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 243 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp1_ = self->priv->play_pause_button; -#line 269 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 243 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		gtk_tool_button_set_icon_name (_tmp1_, "media-playback-start"); -#line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = self->priv->play_pause_button; -#line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		gtk_tool_button_set_label (_tmp2_, _ ("Play")); -#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 245 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp3_ = self->priv->play_pause_button; -#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 245 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		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" +#line 1449 "SlideshowPage.c"  	} else {  		GtkToolButton* _tmp4_;  		GtkToolButton* _tmp5_;  		GtkToolButton* _tmp6_; -#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp4_ = self->priv->play_pause_button; -#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		gtk_tool_button_set_icon_name (_tmp4_, "media-playback-pause"); -#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 248 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp5_ = self->priv->play_pause_button; -#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 248 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		gtk_tool_button_set_label (_tmp5_, _ ("Pause")); -#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 249 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp6_ = self->priv->play_pause_button; -#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 249 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		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 1466 "SlideshowPage.c"  	} -#line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 252 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = self->priv->playing; -#line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 252 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->playing = !_tmp7_; -#line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp8_ = self->priv->timer; -#line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_timer_start (_tmp8_); -#line 1485 "SlideshowPage.c" +#line 1476 "SlideshowPage.c"  } @@ -1500,35 +1491,35 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {  	DataView* _tmp6_;  	DataView* _tmp7_;  	Photo* _tmp20_; -#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 258 "/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" +#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->controller; -#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = self->priv->current; -#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	view = _tmp2_; -#line 287 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	prev_photo = NULL; -#line 288 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 262 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = self->priv->controller; -#line 288 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 262 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = view; -#line 288 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 262 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = view_collection_get_previous (_tmp3_, _tmp4_); -#line 288 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 262 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	start_view = _tmp5_; -#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = start_view; -#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = _g_object_ref0 (_tmp6_); -#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	prev_view = _tmp7_; -#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	while (TRUE) { -#line 1532 "SlideshowPage.c" +#line 1523 "SlideshowPage.c"  		DataView* _tmp8_;  		DataView* _tmp9_;  		DataSource* _tmp10_; @@ -1539,86 +1530,86 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {  		DataView* _tmp17_;  		DataView* _tmp18_;  		DataView* _tmp19_; -#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8_ = prev_view; -#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		if (!(_tmp8_ != NULL)) { -#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			break; -#line 1549 "SlideshowPage.c" +#line 1540 "SlideshowPage.c"  		} -#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = prev_view; -#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp10_ = data_view_get_source (_tmp9_); -#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp11_ = _tmp10_; -#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_PHOTO); -#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_tmp11_); -#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		if (_tmp12_) { -#line 1563 "SlideshowPage.c" +#line 1554 "SlideshowPage.c"  			DataView* _tmp13_;  			DataSource* _tmp14_; -#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp13_ = prev_view; -#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp14_ = data_view_get_source (_tmp13_); -#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (prev_photo); -#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			prev_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo); -#line 294 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			break; -#line 1576 "SlideshowPage.c" +#line 1567 "SlideshowPage.c"  		} -#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp15_ = self->priv->controller; -#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp16_ = prev_view; -#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp17_ = view_collection_get_previous (_tmp15_, _tmp16_); -#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (prev_view); -#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		prev_view = _tmp17_; -#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp18_ = prev_view; -#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp19_ = start_view; -#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		if (_tmp18_ == _tmp19_) { -#line 300 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			g_warning ("SlideshowPage.vala:300: on_previous( ): can't advance to previous phot" \ +#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			g_warning ("SlideshowPage.vala:274: on_previous( ): can't advance to previous phot" \  "o: collection has only videos"); -#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (prev_view); -#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (start_view); -#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (prev_photo); -#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (view); -#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			return; -#line 1606 "SlideshowPage.c" +#line 1597 "SlideshowPage.c"  		}  	} -#line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 279 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp20_ = prev_photo; -#line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 279 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_advance (self, _tmp20_, DIRECTION_BACKWARD); -#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (prev_view); -#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (start_view); -#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (prev_photo); -#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (view); -#line 1621 "SlideshowPage.c" +#line 1612 "SlideshowPage.c"  } @@ -1642,35 +1633,35 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  	gchar* _tmp23_;  	gboolean _tmp24_;  	Photo* _tmp25_; -#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 282 "/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" +#line 283 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->controller; -#line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 283 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = self->priv->current; -#line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 283 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 283 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	view = _tmp2_; -#line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	next_photo = NULL; -#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 286 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = self->priv->controller; -#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 286 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = view; -#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 286 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = view_collection_get_next (_tmp3_, _tmp4_); -#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 286 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	start_view = _tmp5_; -#line 313 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 287 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = start_view; -#line 313 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 287 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = _g_object_ref0 (_tmp6_); -#line 313 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 287 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	next_view = _tmp7_; -#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	while (TRUE) { -#line 1673 "SlideshowPage.c" +#line 1664 "SlideshowPage.c"  		DataView* _tmp8_;  		DataView* _tmp9_;  		DataSource* _tmp10_; @@ -1681,106 +1672,106 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  		DataView* _tmp17_;  		DataView* _tmp18_;  		DataView* _tmp19_; -#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8_ = next_view; -#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		if (!(_tmp8_ != NULL)) { -#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			break; -#line 1690 "SlideshowPage.c" +#line 1681 "SlideshowPage.c"  		} -#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = next_view; -#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp10_ = data_view_get_source (_tmp9_); -#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp11_ = _tmp10_; -#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_PHOTO); -#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_tmp11_); -#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		if (_tmp12_) { -#line 1704 "SlideshowPage.c" +#line 1695 "SlideshowPage.c"  			DataView* _tmp13_;  			DataSource* _tmp14_; -#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp13_ = next_view; -#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_tmp14_ = data_view_get_source (_tmp13_); -#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (next_photo); -#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			next_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo); -#line 318 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			break; -#line 1717 "SlideshowPage.c" +#line 1708 "SlideshowPage.c"  		} -#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp15_ = self->priv->controller; -#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp16_ = next_view; -#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp17_ = view_collection_get_next (_tmp15_, _tmp16_); -#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (next_view); -#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		next_view = _tmp17_; -#line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp18_ = next_view; -#line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp19_ = start_view; -#line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		if (_tmp18_ == _tmp19_) { -#line 324 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			g_warning ("SlideshowPage.vala:324: on_next( ): can't advance to next photo: colle" \ +#line 298 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			g_warning ("SlideshowPage.vala:298: on_next( ): can't advance to next photo: colle" \  "ction has only videos"); -#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (next_view); -#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (start_view); -#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (next_photo); -#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (view); -#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			return; -#line 1747 "SlideshowPage.c" +#line 1738 "SlideshowPage.c"  		}  	} -#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp20_ = config_facade_get_instance (); -#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp21_ = _tmp20_; -#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp22_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp23_ = _tmp22_; -#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp24_ = g_strcmp0 (_tmp23_, RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID) == 0; -#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (_tmp23_); -#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp21_); -#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp24_) { -#line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		slideshow_page_random_transition_effect (self); -#line 1768 "SlideshowPage.c" +#line 1759 "SlideshowPage.c"  	} -#line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp25_ = next_photo; -#line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	slideshow_page_advance (self, _tmp25_, DIRECTION_FORWARD);  #line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	slideshow_page_advance (self, _tmp25_, DIRECTION_FORWARD); +#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (next_view); -#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (start_view); -#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (next_photo); -#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (view); -#line 1782 "SlideshowPage.c" +#line 1773 "SlideshowPage.c"  } @@ -1794,58 +1785,58 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction  	GdkPixbuf* _tmp5_ = NULL;  	gboolean _tmp6_;  	GTimer* _tmp11_; -#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self)); -#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_PHOTO (photo)); -#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = photo; -#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = _g_object_ref0 (_tmp0_); -#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->current); -#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->current = _tmp1_; -#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = self->priv->current; -#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = direction; -#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = slideshow_page_get_next_photo (self, _tmp2_, _tmp3_, &_tmp4_, &_tmp5_); -#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->current); -#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->current = _tmp4_; -#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (next_pixbuf); -#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	next_pixbuf = _tmp5_; -#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp6_) { -#line 1824 "SlideshowPage.c" +#line 1815 "SlideshowPage.c"  		GdkPixbuf* _tmp7_;  		Photo* _tmp8_;  		Dimensions _tmp9_ = {0};  		Direction _tmp10_; -#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp7_ = next_pixbuf; -#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8_ = self->priv->current; -#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_); -#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp10_ = direction; -#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 317 "/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 1839 "SlideshowPage.c" +#line 1830 "SlideshowPage.c"  	} -#line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 320 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp11_ = self->priv->timer; -#line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 320 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_timer_start (_tmp11_); -#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (next_pixbuf); -#line 1847 "SlideshowPage.c" +#line 1838 "SlideshowPage.c"  } @@ -1859,57 +1850,57 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {  	ConfigFacade* _tmp5_;  	gdouble _tmp6_;  	gboolean _tmp7_; -#line 349 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 323 "/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" +#line 324 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->exiting; -#line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 324 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp0_) { -#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		result = FALSE; -#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 1871 "SlideshowPage.c" +#line 1862 "SlideshowPage.c"  	} -#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 327 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = self->priv->playing; -#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 327 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (!_tmp1_) { -#line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 328 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		result = TRUE; -#line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 328 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 1881 "SlideshowPage.c" +#line 1872 "SlideshowPage.c"  	} -#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = self->priv->timer; -#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = g_timer_elapsed (_tmp2_, NULL); -#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = config_facade_get_instance (); -#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = _tmp4_; -#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = _tmp3_ < _tmp6_; -#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp5_); -#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp7_) { -#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		result = TRUE; -#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 1903 "SlideshowPage.c" +#line 1894 "SlideshowPage.c"  	} -#line 359 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 333 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 335 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	result = TRUE; -#line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 335 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 1911 "SlideshowPage.c" +#line 1902 "SlideshowPage.c"  } @@ -1922,87 +1913,87 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe  	const gchar* _tmp2_;  	const gchar* _tmp3_;  	GQuark _tmp5_ = 0U; -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	static GQuark _tmp4_label0 = 0; -#line 1926 "SlideshowPage.c" +#line 1917 "SlideshowPage.c"  	gboolean _tmp6_;  	gboolean _tmp7_ = FALSE; -#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage); -#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (event != NULL, FALSE); -#line 365 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 339 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	handled = TRUE; -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = event; -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = _tmp0_->keyval; -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = gdk_keyval_name (_tmp1_); -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = _tmp2_; -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("space")))) { -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		switch (0) { -#line 1949 "SlideshowPage.c" +#line 1940 "SlideshowPage.c"  			default:  			{ -#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				slideshow_page_on_play_pause (self); -#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				break; -#line 1956 "SlideshowPage.c" +#line 1947 "SlideshowPage.c"  			}  		}  	} else { -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		switch (0) { -#line 1962 "SlideshowPage.c" +#line 1953 "SlideshowPage.c"  			default:  			{ -#line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				handled = FALSE; -#line 373 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 347 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				break; -#line 1969 "SlideshowPage.c" +#line 1960 "SlideshowPage.c"  			}  		}  	} -#line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = handled; -#line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp6_) { -#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		result = TRUE; -#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 1981 "SlideshowPage.c" +#line 1972 "SlideshowPage.c"  	} -#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) { -#line 1985 "SlideshowPage.c" +#line 1976 "SlideshowPage.c"  		GdkEventKey* _tmp8_;  		gboolean _tmp9_; -#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8_ = event; -#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 353 "/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" +#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp7_ = _tmp9_; -#line 1994 "SlideshowPage.c" +#line 1985 "SlideshowPage.c"  	} else { -#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp7_ = TRUE; -#line 1998 "SlideshowPage.c" +#line 1989 "SlideshowPage.c"  	} -#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	result = _tmp7_; -#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 2004 "SlideshowPage.c" +#line 1995 "SlideshowPage.c"  } @@ -2017,33 +2008,33 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {  	SlideshowPageSettingsDialog* _tmp22_;  	gboolean _tmp23_;  	GTimer* _tmp24_; -#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self)); -#line 383 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = slideshow_page_settings_dialog_new (); -#line 383 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_object_ref_sink (_tmp0_); -#line 383 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	settings_dialog = _tmp0_; -#line 384 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 358 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = settings_dialog; -#line 384 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 358 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 386 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 360 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = self->priv->playing; -#line 386 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 360 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_playing = _tmp2_; -#line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->playing = FALSE; -#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 362 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_signal_emit (self, slideshow_page_signals[SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL], 0); -#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = settings_dialog; -#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 364 "/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" +#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) { -#line 2045 "SlideshowPage.c" +#line 2036 "SlideshowPage.c"  		ConfigFacade* _tmp5_;  		ConfigFacade* _tmp6_;  		SlideshowPageSettingsDialog* _tmp7_; @@ -2061,77 +2052,77 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {  		ConfigFacade* _tmp19_;  		SlideshowPageSettingsDialog* _tmp20_;  		gboolean _tmp21_; -#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp5_ = config_facade_get_instance (); -#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp6_ = _tmp5_; -#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp7_ = settings_dialog; -#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8_ = slideshow_page_settings_dialog_get_delay (_tmp7_); -#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		configuration_facade_set_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_); -#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_tmp6_); -#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = config_facade_get_instance (); -#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp10_ = _tmp9_; -#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp11_ = settings_dialog; -#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp12_ = slideshow_page_settings_dialog_get_transition_delay (_tmp11_); -#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		configuration_facade_set_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); -#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_tmp10_); -#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp13_ = config_facade_get_instance (); -#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp14_ = _tmp13_; -#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp15_ = settings_dialog; -#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp16_ = slideshow_page_settings_dialog_get_transition_effect_id (_tmp15_); -#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp17_ = _tmp16_; -#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		configuration_facade_set_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp17_); -#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_free0 (_tmp17_); -#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_tmp14_); -#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp18_ = config_facade_get_instance (); -#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp19_ = _tmp18_; -#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp20_ = settings_dialog; -#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp21_ = slideshow_page_settings_dialog_get_show_title (_tmp20_); -#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		configuration_facade_set_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp21_); -#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_tmp19_); -#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		slideshow_page_update_transition_effect (self); -#line 2117 "SlideshowPage.c" +#line 2108 "SlideshowPage.c"  	} -#line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 375 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp22_ = settings_dialog; -#line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 375 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); -#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp23_ = slideshow_playing; -#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->playing = _tmp23_; -#line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp24_ = self->priv->timer; -#line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_timer_start (_tmp24_); -#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (settings_dialog); -#line 2133 "SlideshowPage.c" +#line 2124 "SlideshowPage.c"  } @@ -2146,37 +2137,37 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) {  	ConfigFacade* _tmp5_;  	gdouble _tmp6_;  	gdouble _tmp7_; -#line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 380 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self)); -#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = config_facade_get_instance (); -#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = _tmp0_; -#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = _tmp2_; -#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp1_); -#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	effect_id = _tmp3_; -#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = config_facade_get_instance (); -#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = _tmp4_; -#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = _tmp6_; -#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp5_); -#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	effect_delay = _tmp7_; -#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 384 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 380 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (effect_id); -#line 2178 "SlideshowPage.c" +#line 2169 "SlideshowPage.c"  } @@ -2192,31 +2183,31 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {  	gint _tmp5__length1;  	const gchar* _tmp12_;  	gdouble _tmp13_; -#line 413 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self)); -#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = config_facade_get_instance (); -#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = _tmp0_; -#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = _tmp2_; -#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp1_); -#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	effect_delay = _tmp3_; -#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 389 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); -#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 389 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	effect_id = _tmp4_; -#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = self->priv->transitions; -#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5__length1 = self->priv->transitions_length1; -#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (0 < _tmp5__length1) { -#line 2218 "SlideshowPage.c" +#line 2209 "SlideshowPage.c"  		gint random = 0;  		gchar** _tmp6_;  		gint _tmp6__length1; @@ -2226,39 +2217,39 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {  		gint _tmp9_;  		const gchar* _tmp10_;  		gchar* _tmp11_; -#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp6_ = self->priv->transitions; -#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp6__length1 = self->priv->transitions_length1; -#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp7_ = g_random_int_range ((gint32) 0, (gint32) _tmp6__length1); -#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		random = (gint) _tmp7_; -#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8_ = self->priv->transitions; -#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8__length1 = self->priv->transitions_length1; -#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = random; -#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp10_ = _tmp8_[_tmp9_]; -#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp11_ = g_strdup (_tmp10_); -#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_free0 (effect_id); -#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		effect_id = _tmp11_; -#line 2250 "SlideshowPage.c" +#line 2241 "SlideshowPage.c"  	} -#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp12_ = effect_id; -#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp13_ = effect_delay; -#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (effect_id); -#line 2260 "SlideshowPage.c" +#line 2251 "SlideshowPage.c"  } @@ -2313,190 +2304,190 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  	cairo_t* _tmp46_;  	cairo_t* _tmp47_;  	cairo_t* _tmp48_; -#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self)); -#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (ctx != NULL); -#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (ctx_dim != NULL); -#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 399 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->current; -#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 399 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 399 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	title = _tmp1_; -#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = title; -#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp3_ == NULL) { -#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = TRUE; -#line 2333 "SlideshowPage.c" +#line 2324 "SlideshowPage.c"  	} else {  		const gchar* _tmp4_; -#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp4_ = title; -#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0; -#line 2340 "SlideshowPage.c" +#line 2331 "SlideshowPage.c"  	} -#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp2_) { -#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_free0 (title); -#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return; -#line 2348 "SlideshowPage.c" +#line 2339 "SlideshowPage.c"  	} -#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 405 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = title; -#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 405 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp5_); -#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 405 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	layout = _tmp6_; -#line 432 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = pango_attr_list_new (); -#line 432 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	list = _tmp7_; -#line 433 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp8_ = pango_attr_scale_new ((gdouble) 3); -#line 433 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	size = _tmp8_; -#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp9_ = list; -#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp10_ = size; -#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp11_ = pango_attribute_copy (_tmp10_); -#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	pango_attr_list_insert (_tmp9_, _tmp11_); -#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 409 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp12_ = layout; -#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 409 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp13_ = list; -#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 409 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	pango_layout_set_attributes (_tmp12_, _tmp13_); -#line 436 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp14_ = layout; -#line 436 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp15_ = *ctx_dim; -#line 436 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp16_ = _tmp15_.width; -#line 436 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	pango_layout_set_width (_tmp14_, (gint) ((_tmp16_ * 0.9) * PANGO_SCALE)); -#line 440 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp17_ = layout; -#line 440 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	pango_layout_get_pixel_size (_tmp17_, &_tmp18_, &_tmp19_); -#line 440 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	title_width = _tmp18_; -#line 440 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	title_height = _tmp19_; -#line 441 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp20_ = *ctx_dim; -#line 441 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp21_ = _tmp20_.width; -#line 441 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	x = _tmp21_ * 0.2; -#line 442 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp22_ = *ctx_dim; -#line 442 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp23_ = _tmp22_.height; -#line 442 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	y = _tmp23_ * 0.90; -#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp24_ = y; -#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp25_ = title_height; -#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp26_ = *ctx_dim; -#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp27_ = _tmp26_.height; -#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if ((_tmp24_ + _tmp25_) >= (_tmp27_ * 0.95)) { -#line 2416 "SlideshowPage.c" +#line 2407 "SlideshowPage.c"  		Dimensions _tmp28_;  		gint _tmp29_;  		gint _tmp30_; -#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp28_ = *ctx_dim; -#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp29_ = _tmp28_.height; -#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp30_ = title_height; -#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		y = (_tmp29_ * 0.95) - _tmp30_; -#line 2428 "SlideshowPage.c" +#line 2419 "SlideshowPage.c"  	} -#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp31_ = x; -#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp32_ = title_width; -#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp33_ = *ctx_dim; -#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp34_ = _tmp33_.width; -#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if ((_tmp31_ + _tmp32_) >= (_tmp34_ * 0.95)) { -#line 2440 "SlideshowPage.c" +#line 2431 "SlideshowPage.c"  		Dimensions _tmp35_;  		gint _tmp36_;  		gint _tmp37_; -#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp35_ = *ctx_dim; -#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp36_ = _tmp35_.width; -#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp37_ = title_width; -#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		x = (gdouble) ((_tmp36_ / 2) - (_tmp37_ / 2)); -#line 2452 "SlideshowPage.c" +#line 2443 "SlideshowPage.c"  	} -#line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp38_ = ctx; -#line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	set_source_color_from_string (_tmp38_, "#fff"); -#line 452 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp39_ = ctx; -#line 452 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp40_ = x; -#line 452 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp41_ = y; -#line 452 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	cairo_move_to (_tmp39_, _tmp40_, _tmp41_); -#line 453 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp42_ = ctx; -#line 453 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp43_ = layout; -#line 453 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	pango_cairo_show_layout (_tmp42_, _tmp43_); -#line 454 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp44_ = ctx; -#line 454 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp45_ = layout; -#line 454 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	pango_cairo_layout_path (_tmp44_, _tmp45_); -#line 455 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp46_ = ctx; -#line 455 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	cairo_set_line_width (_tmp46_, 1.5); -#line 456 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 430 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp47_ = ctx; -#line 456 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 430 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	set_source_color_from_string (_tmp47_, "#000"); -#line 457 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp48_ = ctx; -#line 457 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	cairo_stroke (_tmp48_); -#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_pango_attribute_destroy0 (size); -#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_pango_attr_list_unref0 (list); -#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (layout); -#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (title); -#line 2498 "SlideshowPage.c" +#line 2489 "SlideshowPage.c"  } @@ -2509,54 +2500,54 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime  	ConfigFacade* _tmp4_;  	gboolean _tmp5_;  	gboolean _tmp6_; -#line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 434 "/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" +#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (ctx != NULL); -#line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (ctx_dim != NULL); -#line 461 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = ctx; -#line 461 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = *ctx_dim; -#line 461 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	SINGLE_PHOTO_PAGE_CLASS (slideshow_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp0_, &_tmp1_); -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = config_facade_get_instance (); -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = _tmp3_; -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = _tmp5_; -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp4_); -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp6_) { -#line 2535 "SlideshowPage.c" +#line 2526 "SlideshowPage.c"  		gboolean _tmp7_; -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/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" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = !_tmp7_; -#line 2541 "SlideshowPage.c" +#line 2532 "SlideshowPage.c"  	} else { -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = FALSE; -#line 2545 "SlideshowPage.c" +#line 2536 "SlideshowPage.c"  	} -#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp2_) { -#line 2549 "SlideshowPage.c" +#line 2540 "SlideshowPage.c"  		cairo_t* _tmp8_;  		Dimensions _tmp9_; -#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp8_ = ctx; -#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = *ctx_dim; -#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		slideshow_page_paint_title (self, _tmp8_, &_tmp9_); -#line 2558 "SlideshowPage.c" +#line 2549 "SlideshowPage.c"  	}  } @@ -2564,485 +2555,297 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime  static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {  	gint result;  	result = utf8_ci_compare (a, b); -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 2568 "SlideshowPage.c" +#line 2559 "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" +#line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_settings_dialog_on_transition_changed ((SlideshowPageSettingsDialog*) self); -#line 2575 "SlideshowPage.c" +#line 2566 "SlideshowPage.c"  }  static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GType object_type) {  	SlideshowPageSettingsDialog * self = NULL; -	GtkBuilder* _tmp0_; -	GtkBuilder* _tmp1_; -	GObject* _tmp2_; -	GtkBox* _tmp3_; -	GtkBox* _tmp4_; -	GtkBox* _tmp5_;  	gdouble delay = 0.0; -	ConfigFacade* _tmp6_; -	ConfigFacade* _tmp7_; -	gdouble _tmp8_; -	gdouble _tmp9_; -	FullscreenWindow* _tmp10_; -	FullscreenWindow* _tmp11_; -	GtkAdjustment* adjustment = 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_; +	ConfigFacade* _tmp0_; +	ConfigFacade* _tmp1_; +	gdouble _tmp2_; +	gdouble _tmp3_; +	FullscreenWindow* _tmp4_; +	FullscreenWindow* _tmp5_; +	GtkAdjustment* _tmp6_; +	gdouble _tmp7_;  	gchar* effect_id = NULL; -	ConfigFacade* _tmp31_; -	ConfigFacade* _tmp32_; -	gchar* _tmp33_; -	gchar* _tmp34_; +	ConfigFacade* _tmp8_; +	ConfigFacade* _tmp9_; +	gchar* _tmp10_; +	gchar* _tmp11_;  	gchar* null_display_name = NULL; -	TransitionEffectsManager* _tmp35_; -	TransitionEffectsManager* _tmp36_; -	gchar* _tmp37_; -	gchar* _tmp38_; -	GtkComboBoxText* _tmp39_; -	const gchar* _tmp40_; -	GtkComboBoxText* _tmp41_; +	TransitionEffectsManager* _tmp12_; +	TransitionEffectsManager* _tmp13_; +	gchar* _tmp14_; +	gchar* _tmp15_; +	GtkComboBoxText* _tmp16_; +	const gchar* _tmp17_; +	GtkComboBoxText* _tmp18_;  	gint i = 0; -	GtkComboBoxText* _tmp66_; +	GtkComboBoxText* _tmp43_;  	gdouble transition_delay = 0.0; -	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_; +	ConfigFacade* _tmp44_; +	ConfigFacade* _tmp45_; +	gdouble _tmp46_; +	gdouble _tmp47_; +	GtkAdjustment* _tmp48_;  	gboolean show_title = FALSE; -	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" +	ConfigFacade* _tmp49_; +	ConfigFacade* _tmp50_; +	gboolean _tmp51_; +	gboolean _tmp52_; +	GtkCheckButton* _tmp53_; +#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = (SlideshowPageSettingsDialog*) g_object_new (object_type, NULL); -#line 38 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL); -#line 38 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (self->priv->builder); -#line 38 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->builder = _tmp0_; -#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp1_ = self->priv->builder; -#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp2_ = gtk_builder_get_object (_tmp1_, "slideshow_settings_pane"); -#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_box_get_type ()) ? ((GtkBox*) _tmp2_) : NULL); -#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (self->priv->pane); -#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->pane = _tmp3_; -#line 40 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp4_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 40 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp5_ = self->priv->pane; -#line 40 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp6_ = config_facade_get_instance (); -#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp7_ = _tmp6_; -#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp8_ = configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp9_ = _tmp8_; -#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp7_); -#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	delay = _tmp9_;  #line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); -#line 45 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp10_ = app_window_get_fullscreen (); -#line 45 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp11_ = _tmp10_; -#line 45 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow)); -#line 45 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp11_); -#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" -	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Settings")); +	_tmp0_ = config_facade_get_instance (); +#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp1_ = _tmp0_; +#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp2_ = configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp3_ = _tmp2_; +#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_g_object_unref0 (_tmp1_); +#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	delay = _tmp3_; +#line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp4_ = app_window_get_fullscreen (); +#line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp5_ = _tmp4_; +#line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow)); +#line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_g_object_unref0 (_tmp5_); +#line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp6_ = self->priv->delay_adjustment; +#line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp7_ = delay; +#line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_adjustment_set_value (_tmp6_, _tmp7_);  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp12_ = delay; +	_tmp8_ = config_facade_get_instance ();  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp13_ = gtk_adjustment_new (_tmp12_, CONFIG_FACADE_SLIDESHOW_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0); +	_tmp9_ = _tmp8_;  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	g_object_ref_sink (_tmp13_); +	_tmp10_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	adjustment = _tmp13_; -#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp14_ = self->priv->builder; -#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp15_ = gtk_builder_get_object (_tmp14_, "delay_hscale"); -#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 = _tmp16_; -#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp17_ = self->priv->delay_hscale; -#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp18_ = adjustment; -#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	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" -	_tmp19_ = self->priv->builder; -#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp20_ = gtk_builder_get_object (_tmp19_, "delay_entry"); -#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 = _tmp21_; +	_tmp11_ = _tmp10_; +#line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_g_object_unref0 (_tmp9_); +#line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	effect_id = _tmp11_; +#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp12_ = transition_effects_manager_get_instance (); +#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp13_ = _tmp12_; +#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp14_ = transition_effects_manager_get_effect_name (_tmp13_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); +#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp15_ = _tmp14_; +#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_transition_effects_manager_unref0 (_tmp13_); +#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	null_display_name = _tmp15_;  #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp22_ = self->priv->delay_entry; +	_tmp16_ = self->priv->transition_effect_selector;  #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp23_ = adjustment; +	_tmp17_ = null_display_name;  #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_spin_button_set_adjustment (_tmp22_, _tmp23_); -#line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp24_ = self->priv->delay_entry; +	gtk_combo_box_text_append_text (_tmp16_, _tmp17_);  #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp25_ = delay; +	_tmp18_ = self->priv->transition_effect_selector;  #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_spin_button_set_value (_tmp24_, _tmp25_); -#line 58 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp26_ = self->priv->delay_entry; -#line 58 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_spin_button_set_numeric (_tmp26_, TRUE); -#line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp27_ = self->priv->delay_entry; +	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), 0);  #line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	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" -	_tmp28_ = self->priv->builder; -#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp29_ = gtk_builder_get_object (_tmp28_, "transition_effect_selector"); -#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 = _tmp30_; -#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp31_ = config_facade_get_instance (); -#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp32_ = _tmp31_; -#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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" -	_tmp34_ = _tmp33_; -#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp32_); -#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	effect_id = _tmp34_; -#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp35_ = transition_effects_manager_get_instance (); -#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp36_ = _tmp35_; -#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp37_ = transition_effects_manager_get_effect_name (_tmp36_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); -#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp38_ = _tmp37_; -#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_transition_effects_manager_unref0 (_tmp36_); -#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	null_display_name = _tmp38_; -#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp39_ = self->priv->transition_effect_selector; -#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp40_ = null_display_name; -#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_combo_box_text_append_text (_tmp39_, _tmp40_); -#line 70 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 72 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	i = 1; -#line 2807 "SlideshowPage.c" +#line 2672 "SlideshowPage.c"  	{  		GeeIterator* _display_name_it = NULL; -		TransitionEffectsManager* _tmp42_; -		TransitionEffectsManager* _tmp43_; -		GeeCollection* _tmp44_; -		GeeCollection* _tmp45_; -		GeeIterator* _tmp46_; -		GeeIterator* _tmp47_; -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp42_ = transition_effects_manager_get_instance (); -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp43_ = _tmp42_; -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_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" -		_tmp45_ = _tmp44_; -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp47_ = _tmp46_; -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_g_object_unref0 (_tmp45_); -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_transition_effects_manager_unref0 (_tmp43_); -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_display_name_it = _tmp47_; -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		TransitionEffectsManager* _tmp19_; +		TransitionEffectsManager* _tmp20_; +		GeeCollection* _tmp21_; +		GeeCollection* _tmp22_; +		GeeIterator* _tmp23_; +		GeeIterator* _tmp24_; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_tmp19_ = transition_effects_manager_get_instance (); +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_tmp20_ = _tmp19_; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_tmp21_ = transition_effects_manager_get_effect_names (_tmp20_, _utf8_ci_compare_gcompare_data_func, NULL, NULL); +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_tmp22_ = _tmp21_; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_tmp23_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_tmp24_ = _tmp23_; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_g_object_unref0 (_tmp22_); +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_transition_effects_manager_unref0 (_tmp20_); +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +		_display_name_it = _tmp24_; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		while (TRUE) { -#line 2836 "SlideshowPage.c" -			GeeIterator* _tmp48_; -			gboolean _tmp49_; +#line 2701 "SlideshowPage.c" +			GeeIterator* _tmp25_; +			gboolean _tmp26_;  			gchar* display_name = NULL; -			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" -			_tmp48_ = _display_name_it; -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp49_ = gee_iterator_next (_tmp48_); -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			if (!_tmp49_) { -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			GeeIterator* _tmp27_; +			gpointer _tmp28_; +			const gchar* _tmp29_; +			const gchar* _tmp30_; +			GtkComboBoxText* _tmp31_; +			const gchar* _tmp32_; +			const gchar* _tmp33_; +			TransitionEffectsManager* _tmp34_; +			TransitionEffectsManager* _tmp35_; +			const gchar* _tmp36_; +			gchar* _tmp37_; +			gchar* _tmp38_; +			gboolean _tmp39_; +			gint _tmp42_; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp25_ = _display_name_it; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp26_ = gee_iterator_next (_tmp25_); +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			if (!_tmp26_) { +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				break; -#line 2862 "SlideshowPage.c" +#line 2727 "SlideshowPage.c"  			} -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp50_ = _display_name_it; -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp51_ = gee_iterator_get (_tmp50_); -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			display_name = (gchar*) _tmp51_; -#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp52_ = display_name; -#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp53_ = null_display_name; -#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			if (g_strcmp0 (_tmp52_, _tmp53_) == 0) { -#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp27_ = _display_name_it; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp28_ = gee_iterator_get (_tmp27_); +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			display_name = (gchar*) _tmp28_; +#line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp29_ = display_name; +#line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp30_ = null_display_name; +#line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			if (g_strcmp0 (_tmp29_, _tmp30_) == 0) { +#line 63 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_free0 (display_name); -#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 63 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				continue; -#line 2880 "SlideshowPage.c" +#line 2745 "SlideshowPage.c"  			} -#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp54_ = self->priv->transition_effect_selector; -#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp55_ = display_name; -#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			gtk_combo_box_text_append_text (_tmp54_, _tmp55_); -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp56_ = effect_id; -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp57_ = transition_effects_manager_get_instance (); -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp58_ = _tmp57_; -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp59_ = display_name; -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp60_ = transition_effects_manager_get_id_for_effect_name (_tmp58_, _tmp59_); -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp61_ = _tmp60_; -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp62_ = g_strcmp0 (_tmp56_, _tmp61_) == 0; -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_g_free0 (_tmp61_); -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_transition_effects_manager_unref0 (_tmp58_); -#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			if (_tmp62_) { -#line 2908 "SlideshowPage.c" -				GtkComboBoxText* _tmp63_; -				gint _tmp64_; -#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp63_ = self->priv->transition_effect_selector; -#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp64_ = i; -#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_combo_box_get_type (), GtkComboBox), _tmp64_); -#line 2917 "SlideshowPage.c" +#line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp31_ = self->priv->transition_effect_selector; +#line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp32_ = display_name; +#line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			gtk_combo_box_text_append_text (_tmp31_, _tmp32_); +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp33_ = effect_id; +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp34_ = transition_effects_manager_get_instance (); +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp35_ = _tmp34_; +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp36_ = display_name; +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp37_ = transition_effects_manager_get_id_for_effect_name (_tmp35_, _tmp36_); +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp38_ = _tmp37_; +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp39_ = g_strcmp0 (_tmp33_, _tmp38_) == 0; +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_g_free0 (_tmp38_); +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_transition_effects_manager_unref0 (_tmp35_); +#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			if (_tmp39_) { +#line 2773 "SlideshowPage.c" +				GtkComboBoxText* _tmp40_; +				gint _tmp41_; +#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +				_tmp40_ = self->priv->transition_effect_selector; +#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +				_tmp41_ = i; +#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), _tmp41_); +#line 2782 "SlideshowPage.c"  			} -#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp65_ = i; -#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			i = _tmp65_ + 1; -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			_tmp42_ = i; +#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +			i = _tmp42_ + 1; +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_free0 (display_name); -#line 2925 "SlideshowPage.c" +#line 2790 "SlideshowPage.c"  		} -#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_display_name_it); -#line 2929 "SlideshowPage.c" +#line 2794 "SlideshowPage.c"  	} -#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp66_ = self->priv->transition_effect_selector; -#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	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" -	_tmp67_ = config_facade_get_instance (); -#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp68_ = _tmp67_; -#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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" -	_tmp70_ = _tmp69_; -#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp68_); -#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	transition_delay = _tmp70_; -#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 (_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 = _tmp71_; -#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp72_ = self->priv->builder; -#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp73_ = gtk_builder_get_object (_tmp72_, "transition_effect_hscale"); -#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 = _tmp74_; -#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp75_ = self->priv->transition_effect_hscale; -#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp76_ = self->priv->transition_effect_adjustment; -#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	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" -	_tmp77_ = self->priv->builder; -#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp78_ = gtk_builder_get_object (_tmp77_, "transition_effect_entry"); -#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 = _tmp79_; -#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp80_ = self->priv->transition_effect_entry; -#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp81_ = self->priv->transition_effect_adjustment; -#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_spin_button_set_adjustment (_tmp80_, _tmp81_); -#line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp82_ = self->priv->transition_effect_entry; -#line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_spin_button_set_value (_tmp82_, transition_delay); -#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp83_ = self->priv->transition_effect_entry; -#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_spin_button_set_numeric (_tmp83_, TRUE); -#line 97 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 (_tmp84_, gtk_entry_get_type (), GtkEntry), TRUE); -#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp85_ = config_facade_get_instance (); -#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp86_ = _tmp85_; -#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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" -	_tmp88_ = _tmp87_; -#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp86_); -#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	show_title = _tmp88_; -#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp89_ = self->priv->builder; -#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp90_ = gtk_builder_get_object (_tmp89_, "show_title_button"); -#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 = _tmp91_; -#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_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 (_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" +#line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp43_ = self->priv->transition_effect_selector; +#line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0); +#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp44_ = config_facade_get_instance (); +#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp45_ = _tmp44_; +#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp46_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp47_ = _tmp46_; +#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_g_object_unref0 (_tmp45_); +#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	transition_delay = _tmp47_; +#line 74 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp48_ = self->priv->transition_effect_adjustment; +#line 74 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_adjustment_set_value (_tmp48_, transition_delay); +#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp49_ = config_facade_get_instance (); +#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp50_ = _tmp49_; +#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp51_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp52_ = _tmp51_; +#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_g_object_unref0 (_tmp50_); +#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	show_title = _tmp52_; +#line 77 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_tmp53_ = self->priv->show_title_button; +#line 77 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), show_title); +#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_settings_dialog_on_transition_changed (self); -#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (null_display_name); -#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (effect_id); -#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (adjustment); -#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return self; -#line 3037 "SlideshowPage.c" +#line 2840 "SlideshowPage.c"  }  static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void) { -#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return slideshow_page_settings_dialog_construct (SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG); -#line 3044 "SlideshowPage.c" +#line 2847 "SlideshowPage.c"  } @@ -3055,43 +2858,43 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS  	gboolean sensitive = FALSE;  	GtkScale* _tmp5_;  	GtkSpinButton* _tmp6_; -#line 108 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 82 "/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" +#line 83 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->transition_effect_selector; -#line 109 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 83 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_); -#line 109 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 83 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	selected = _tmp1_; -#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = selected; -#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp3_ != NULL) { -#line 3069 "SlideshowPage.c" +#line 2872 "SlideshowPage.c"  		const gchar* _tmp4_; -#line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 85 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp4_ = selected; -#line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 85 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = g_strcmp0 (_tmp4_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID) != 0; -#line 3075 "SlideshowPage.c" +#line 2878 "SlideshowPage.c"  	} else { -#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = FALSE; -#line 3079 "SlideshowPage.c" +#line 2882 "SlideshowPage.c"  	} -#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	sensitive = _tmp2_; -#line 113 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = self->priv->transition_effect_hscale; -#line 113 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitive); -#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 88 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = self->priv->transition_effect_entry; -#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 88 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (selected); -#line 3093 "SlideshowPage.c" +#line 2896 "SlideshowPage.c"  } @@ -3099,17 +2902,17 @@ static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDi  	gdouble result = 0.0;  	GtkSpinButton* _tmp0_;  	gdouble _tmp1_; -#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 91 "/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" +#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->delay_entry; -#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = gtk_spin_button_get_value (_tmp0_); -#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	result = _tmp1_; -#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 3111 "SlideshowPage.c" +#line 2914 "SlideshowPage.c"  } @@ -3117,17 +2920,17 @@ static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPag  	gdouble result = 0.0;  	GtkSpinButton* _tmp0_;  	gdouble _tmp1_; -#line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 95 "/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" +#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->transition_effect_entry; -#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = gtk_spin_button_get_value (_tmp0_); -#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	result = _tmp1_; -#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 3129 "SlideshowPage.c" +#line 2932 "SlideshowPage.c"  } @@ -3146,71 +2949,71 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow  	const gchar* _tmp9_ = NULL;  	const gchar* _tmp10_;  	gchar* _tmp12_; -#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 99 "/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" +#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->transition_effect_selector; -#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_); -#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	active = _tmp1_; -#line 127 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = active; -#line 127 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp2_ == NULL) { -#line 3160 "SlideshowPage.c" +#line 2963 "SlideshowPage.c"  		gchar* _tmp3_; -#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 102 "/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" +#line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		result = _tmp3_; -#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_free0 (active); -#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 3170 "SlideshowPage.c" +#line 2973 "SlideshowPage.c"  	} -#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = transition_effects_manager_get_instance (); -#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = _tmp4_; -#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp6_ = active; -#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = transition_effects_manager_get_id_for_effect_name (_tmp5_, _tmp6_); -#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp8_ = _tmp7_; -#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_transition_effects_manager_unref0 (_tmp5_); -#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	id = _tmp8_; -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp10_ = id; -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp10_ != NULL) { -#line 3190 "SlideshowPage.c" +#line 2993 "SlideshowPage.c"  		const gchar* _tmp11_; -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp11_ = id; -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = _tmp11_; -#line 3196 "SlideshowPage.c" +#line 2999 "SlideshowPage.c"  	} else { -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID; -#line 3200 "SlideshowPage.c" +#line 3003 "SlideshowPage.c"  	} -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp12_ = g_strdup (_tmp9_); -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	result = _tmp12_; -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (id); -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (active); -#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 3212 "SlideshowPage.c" +#line 3015 "SlideshowPage.c"  } @@ -3219,67 +3022,82 @@ static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSett  	GtkCheckButton* _tmp0_;  	gboolean _tmp1_;  	gboolean _tmp2_; -#line 135 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 109 "/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" +#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->show_title_button; -#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = _tmp1_; -#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	result = _tmp2_; -#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 3233 "SlideshowPage.c" +#line 3036 "SlideshowPage.c"  }  static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDialogClass * klass) { -#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gint SlideshowPageSettingsDialog_private_offset; +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_settings_dialog_parent_class = g_type_class_peek_parent (klass); -#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_type_class_add_private (klass, sizeof (SlideshowPageSettingsDialogPrivate)); -#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	G_OBJECT_CLASS (klass)->finalize = slideshow_page_settings_dialog_finalize; -#line 3244 "SlideshowPage.c" +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	SlideshowPageSettingsDialog_private_offset = g_type_class_get_instance_private_offset (klass); +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/slideshow_settings.ui"); +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_adjustment", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, delay_adjustment)); +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_entry", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, delay_entry)); +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_selector", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_selector)); +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_hscale", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_hscale)); +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_entry", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_entry)); +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_adjustment", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_adjustment)); +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "show_title_button", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, show_title_button)); +#line 3066 "SlideshowPage.c"  }  static void slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsDialog * self) { -#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv = SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE (self);  #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->builder = NULL; -#line 3253 "SlideshowPage.c" +	gtk_widget_init_template (GTK_WIDGET (self)); +#line 3075 "SlideshowPage.c"  }  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);  #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (self->priv->builder); -#line 28 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (self->priv->delay_entry); +	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialog);  #line 29 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (self->priv->delay_hscale); -#line 30 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (self->priv->transition_effect_selector); +	_g_object_unref0 (self->priv->delay_adjustment);  #line 31 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_g_object_unref0 (self->priv->delay_entry); +#line 33 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +	_g_object_unref0 (self->priv->transition_effect_selector); +#line 35 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->transition_effect_hscale); -#line 32 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->transition_effect_entry); -#line 33 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->transition_effect_adjustment); -#line 34 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 41 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->show_title_button); -#line 35 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (self->priv->pane); -#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala" +#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	G_OBJECT_CLASS (slideshow_page_settings_dialog_parent_class)->finalize (obj); -#line 3281 "SlideshowPage.c" +#line 3099 "SlideshowPage.c"  } @@ -3316,7 +3134,7 @@ static void slideshow_page_class_init (SlideshowPageClass * klass) {  	G_OBJECT_CLASS (klass)->finalize = slideshow_page_finalize;  #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	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" +#line 3136 "SlideshowPage.c"  } @@ -3334,7 +3152,7 @@ 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 3336 "SlideshowPage.c" +#line 3154 "SlideshowPage.c"  } @@ -3362,7 +3180,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 3364 "SlideshowPage.c" +#line 3182 "SlideshowPage.c"  } | 
