diff options
Diffstat (limited to 'src/SlideshowPage.c')
| -rw-r--r-- | src/SlideshowPage.c | 1731 | 
1 files changed, 919 insertions, 812 deletions
| diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c index a9b13ec..e19ca76 100644 --- a/src/SlideshowPage.c +++ b/src/SlideshowPage.c @@ -1,4 +1,4 @@ -/* SlideshowPage.c generated by valac 0.36.6, the Vala compiler +/* SlideshowPage.c generated by valac 0.40.4, the Vala compiler   * generated from SlideshowPage.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@   * See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <gtk/gtk.h> @@ -211,6 +212,11 @@ typedef struct _PixbufCacheClass PixbufCacheClass;  typedef struct _Screensaver Screensaver;  typedef struct _ScreensaverClass ScreensaverClass; +enum  { +	SLIDESHOW_PAGE_0_PROPERTY, +	SLIDESHOW_PAGE_NUM_PROPERTIES +}; +static GParamSpec* slideshow_page_properties[SLIDESHOW_PAGE_NUM_PROPERTIES];  #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))  #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))  #define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL))) @@ -295,10 +301,15 @@ typedef struct _SlideshowPageSettingsDialogClass SlideshowPageSettingsDialogClas  #define _pango_attr_list_unref0(var) ((var == NULL) ? NULL : (var = (pango_attr_list_unref (var), NULL)))  typedef struct _SlideshowPageSettingsDialogPrivate SlideshowPageSettingsDialogPrivate;  enum  { +	SLIDESHOW_PAGE_SETTINGS_DIALOG_0_PROPERTY, +	SLIDESHOW_PAGE_SETTINGS_DIALOG_NUM_PROPERTIES +}; +static GParamSpec* slideshow_page_settings_dialog_properties[SLIDESHOW_PAGE_SETTINGS_DIALOG_NUM_PROPERTIES]; +enum  {  	SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL, -	SLIDESHOW_PAGE_LAST_SIGNAL +	SLIDESHOW_PAGE_NUM_SIGNALS  }; -static guint slideshow_page_signals[SLIDESHOW_PAGE_LAST_SIGNAL] = {0}; +static guint slideshow_page_signals[SLIDESHOW_PAGE_NUM_SIGNALS] = {0};  struct _Page {  	GtkScrolledWindow parent_instance; @@ -491,9 +502,15 @@ GType page_window_get_type (void) G_GNUC_CONST;  GType fullscreen_window_get_type (void) G_GNUC_CONST;  gpointer injection_group_ref (gpointer instance);  void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, +                                        const gchar* nick, +                                        const gchar* blurb, +                                        GType object_type, +                                        GParamFlags flags); +void value_set_injection_group (GValue* value, +                                gpointer v_object); +void value_take_injection_group (GValue* value, +                                 gpointer v_object);  gpointer value_get_injection_group (const GValue* value);  GType injection_group_get_type (void) G_GNUC_CONST;  GType single_photo_page_get_type (void) G_GNUC_CONST; @@ -505,9 +522,15 @@ GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST;  GType slideshow_page_get_type (void) G_GNUC_CONST;  gpointer data_collection_ref (gpointer instance);  void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, +                                        const gchar* nick, +                                        const gchar* blurb, +                                        GType object_type, +                                        GParamFlags flags); +void value_set_data_collection (GValue* value, +                                gpointer v_object); +void value_take_data_collection (GValue* value, +                                 gpointer v_object);  gpointer value_get_data_collection (const GValue* value);  GType data_collection_get_type (void) G_GNUC_CONST;  GType source_collection_get_type (void) G_GNUC_CONST; @@ -521,25 +544,41 @@ GType photo_get_type (void) G_GNUC_CONST;  GType pixbuf_cache_get_type (void) G_GNUC_CONST;  gpointer screensaver_ref (gpointer instance);  void screensaver_unref (gpointer instance); -GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_screensaver (GValue* value, gpointer v_object); -void value_take_screensaver (GValue* value, gpointer v_object); +GParamSpec* param_spec_screensaver (const gchar* name, +                                    const gchar* nick, +                                    const gchar* blurb, +                                    GType object_type, +                                    GParamFlags flags); +void value_set_screensaver (GValue* value, +                            gpointer v_object); +void value_take_screensaver (GValue* value, +                             gpointer v_object);  gpointer value_get_screensaver (const GValue* value);  GType screensaver_get_type (void) G_GNUC_CONST;  #define SLIDESHOW_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SLIDESHOW_PAGE, SlideshowPagePrivate)) -enum  { -	SLIDESHOW_PAGE_DUMMY_PROPERTY -};  #define SLIDESHOW_PAGE_READAHEAD_COUNT 5  #define SLIDESHOW_PAGE_CHECK_ADVANCE_MSEC 250 -SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start); -SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start); -SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport); +SlideshowPage* slideshow_page_new (SourceCollection* sources, +                                   ViewCollection* controller, +                                   Photo* start); +SlideshowPage* slideshow_page_construct (GType object_type, +                                         SourceCollection* sources, +                                         ViewCollection* controller, +                                         Photo* start); +SinglePhotoPage* single_photo_page_construct (GType object_type, +                                              const gchar* page_name, +                                              gboolean scale_up_to_viewport);  gpointer transition_effects_manager_ref (gpointer instance);  void transition_effects_manager_unref (gpointer instance); -GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transition_effects_manager (GValue* value, gpointer v_object); -void value_take_transition_effects_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_transition_effects_manager (const gchar* name, +                                                   const gchar* nick, +                                                   const gchar* blurb, +                                                   GType object_type, +                                                   GParamFlags flags); +void value_set_transition_effects_manager (GValue* value, +                                           gpointer v_object); +void value_take_transition_effects_manager (GValue* value, +                                            gpointer v_object);  gpointer value_get_transition_effects_manager (const GValue* value);  GType transition_effects_manager_get_type (void) G_GNUC_CONST;  TransitionEffectsManager* transition_effects_manager_get_instance (void); @@ -549,13 +588,17 @@ GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManag  static void slideshow_page_update_transition_effect (SlideshowPage* self);  GtkToolbar* page_get_toolbar (Page* self);  void single_photo_page_on_previous_photo (SinglePhotoPage* self); -static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, +                                                                   gpointer self);  static void slideshow_page_on_play_pause (SlideshowPage* self); -static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, +                                                            gpointer self);  void single_photo_page_on_next_photo (SinglePhotoPage* self); -static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, +                                                               gpointer self);  static void slideshow_page_on_change_settings (SlideshowPage* self); -static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self); +static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, +                                                                 gpointer self);  Screensaver* screensaver_new (void);  Screensaver* screensaver_construct (GType object_type);  static void slideshow_page_real_switched_to (Page* base); @@ -565,40 +608,82 @@ GType scaling_get_type (void) G_GNUC_CONST;  GType scale_constraint_get_type (void) G_GNUC_CONST;  Scaling* scaling_dup (const Scaling* self);  void scaling_free (Scaling* self); -void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* result); -PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target); -PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target); +void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, +                                           Scaling* result); +PixbufCache* pixbuf_cache_new (SourceCollection* sources, +                               PixbufCachePhotoType type, +                               Scaling* scaling, +                               gint max_count, +                               PixbufCacheCacheFilter filter, +                               void* filter_target); +PixbufCache* pixbuf_cache_construct (GType object_type, +                                     SourceCollection* sources, +                                     PixbufCachePhotoType type, +                                     Scaling* scaling, +                                     gint max_count, +                                     PixbufCacheCacheFilter filter, +                                     void* filter_target);  GType direction_get_type (void) G_GNUC_CONST; -static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo* * next, GdkPixbuf* * next_pixbuf); -void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction); +static gboolean slideshow_page_get_next_photo (SlideshowPage* self, +                                        Photo* start, +                                        Direction direction, +                                        Photo* * next, +                                        GdkPixbuf* * next_pixbuf); +void single_photo_page_set_pixbuf (SinglePhotoPage* self, +                                   GdkPixbuf* unscaled, +                                   Dimensions* max_dim, +                                   Direction* direction);  GType photo_exception_get_type (void) G_GNUC_CONST; -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); +void media_source_get_dimensions (MediaSource* self, +                                  PhotoException disallowed_steps, +                                  Dimensions* result);  static gboolean slideshow_page_auto_advance (SlideshowPage* self);  static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self); -void screensaver_inhibit (Screensaver* self, const gchar* reason); +void screensaver_inhibit (Screensaver* self, +                          const gchar* reason);  static void slideshow_page_real_switching_from (Page* base);  void page_switching_from (Page* self);  void screensaver_uninhibit (Screensaver* self); -GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error); +GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, +                               Photo* photo, +                               GError** error);  gchar* data_object_to_string (DataObject* self);  GType data_view_get_type (void) G_GNUC_CONST; -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -DataView* view_collection_get_next (ViewCollection* self, DataView* view); -DataView* view_collection_get_previous (ViewCollection* self, DataView* view); +DataView* view_collection_get_view_for_source (ViewCollection* self, +                                               DataSource* source); +DataView* view_collection_get_next (ViewCollection* self, +                                    DataView* view); +DataView* view_collection_get_previous (ViewCollection* self, +                                        DataView* view);  DataSource* data_view_get_source (DataView* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, +                               GtkWindow* parent);  GtkWindow* page_get_container (Page* self);  GType app_window_get_type (void) G_GNUC_CONST;  AppWindow* app_window_get_instance (void);  void app_window_end_fullscreen (AppWindow* self); -gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector); +gboolean view_collection_get_immediate_neighbors (ViewCollection* self, +                                                  DataSource* home, +                                                  DataSource* * next, +                                                  DataSource* * prev, +                                                  const gchar* type_selector);  #define PHOTO_TYPENAME "thumb"  GType background_job_job_priority_get_type (void) G_GNUC_CONST; -void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force); -GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename); -void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, BackgroundJobJobPriority priority, gboolean force); +void pixbuf_cache_prefetch (PixbufCache* self, +                            Photo* photo, +                            BackgroundJobJobPriority priority, +                            gboolean force); +GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, +                                                DataSource* home, +                                                const gchar* typename); +void pixbuf_cache_prefetch_many (PixbufCache* self, +                                 GeeCollection* photos, +                                 BackgroundJobJobPriority priority, +                                 gboolean force);  static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base); -static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction direction); +static void slideshow_page_advance (SlideshowPage* self, +                             Photo* photo, +                             Direction direction);  static void slideshow_page_real_on_next_photo (SinglePhotoPage* base);  GType configuration_facade_get_type (void) G_GNUC_CONST;  GType config_facade_get_type (void) G_GNUC_CONST; @@ -606,124 +691,166 @@ ConfigFacade* config_facade_get_instance (void);  gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self);  static void slideshow_page_random_transition_effect (SlideshowPage* self);  gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self); -static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKey* event); +static gboolean slideshow_page_real_key_press_event (GtkWidget* base, +                                              GdkEventKey* event);  static GType slideshow_page_settings_dialog_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;  static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void);  static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GType object_type); -void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdouble delay); +void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, +                                               gdouble delay);  static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDialog* self); -void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay); +void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, +                                                          gdouble delay);  static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPageSettingsDialog* self); -void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id); +void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, +                                                              const gchar* id);  static gchar* slideshow_page_settings_dialog_get_transition_effect_id (SlideshowPageSettingsDialog* self); -void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title); +void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, +                                                    gboolean show_title);  static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSettingsDialog* self);  gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self); -void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effect_id, gint duration_msec); +void single_photo_page_set_transition (SinglePhotoPage* self, +                                       const gchar* effect_id, +                                       gint duration_msec);  #define TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID NULL_TRANSITION_DESCRIPTOR_EFFECT_ID -static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimensions* ctx_dim); +static void slideshow_page_paint_title (SlideshowPage* self, +                                 cairo_t* ctx, +                                 Dimensions* ctx_dim);  gchar* media_source_get_title (MediaSource* self); -void set_source_color_from_string (cairo_t* ctx, const gchar* spec); -static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim); -void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim); +void set_source_color_from_string (cairo_t* ctx, +                                   const gchar* spec); +static void slideshow_page_real_paint (SinglePhotoPage* base, +                                cairo_t* ctx, +                                Dimensions* ctx_dim); +void single_photo_page_paint (SinglePhotoPage* self, +                              cairo_t* ctx, +                              Dimensions* ctx_dim);  gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* self);  gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self);  #define SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialogPrivate)) -enum  { -	SLIDESHOW_PAGE_SETTINGS_DIALOG_DUMMY_PROPERTY -};  FullscreenWindow* app_window_get_fullscreen (void); -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); -static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, const gchar* effect_name); +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); +static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, +                                          gconstpointer b, +                                          gpointer self); +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); +static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, +                                                                                  gpointer self);  static void slideshow_page_settings_dialog_finalize (GObject * obj);  static void slideshow_page_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, +                          gint array_length, +                          GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, +                       gint array_length, +                       GDestroyNotify destroy_func); -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{  #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return self ? data_collection_ref (self) : NULL; -#line 653 "SlideshowPage.c" +#line 764 "SlideshowPage.c"  } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{  #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return self ? g_object_ref (self) : NULL; -#line 660 "SlideshowPage.c" +#line 773 "SlideshowPage.c"  } -static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, +                                                              gpointer self) +{  #line 137 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	single_photo_page_on_previous_photo ((SinglePhotoPage*) self); -#line 667 "SlideshowPage.c" +#line 783 "SlideshowPage.c"  } -static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, +                                                       gpointer self) +{  #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_on_play_pause ((SlideshowPage*) self); -#line 674 "SlideshowPage.c" +#line 793 "SlideshowPage.c"  } -static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, +                                                          gpointer self) +{  #line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	single_photo_page_on_next_photo ((SinglePhotoPage*) self); -#line 681 "SlideshowPage.c" +#line 803 "SlideshowPage.c"  } -static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) { +static void +_slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, +                                                            gpointer self) +{  #line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_on_change_settings ((SlideshowPage*) self); -#line 688 "SlideshowPage.c" +#line 813 "SlideshowPage.c"  } -SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start) { +SlideshowPage* +slideshow_page_construct (GType object_type, +                          SourceCollection* sources, +                          ViewCollection* controller, +                          Photo* start) +{  	SlideshowPage * self = NULL;  	SourceCollection* _tmp0_; -	SourceCollection* _tmp1_; -	ViewCollection* _tmp2_; -	ViewCollection* _tmp3_; +	ViewCollection* _tmp1_;  	GeeCollection* pluggables = NULL; -	TransitionEffectsManager* _tmp4_; -	TransitionEffectsManager* _tmp5_; -	GeeCollection* _tmp6_; -	GeeCollection* _tmp7_; +	TransitionEffectsManager* _tmp2_; +	TransitionEffectsManager* _tmp3_; +	GeeCollection* _tmp4_; +	GeeCollection* _tmp5_;  	GeeArrayList* a = NULL; -	GeeArrayList* _tmp8_; -	gint _tmp9_; -	gpointer* _tmp10_; -	Photo* _tmp11_; -	Photo* _tmp12_; +	GeeArrayList* _tmp6_; +	gint _tmp7_; +	gpointer* _tmp8_; +	Photo* _tmp9_;  	GtkToolbar* toolbar = NULL; -	GtkToolbar* _tmp13_; +	GtkToolbar* _tmp10_;  	GtkToolButton* previous_button = NULL; +	GtkToolButton* _tmp11_; +	GtkToolButton* _tmp12_; +	GtkToolButton* _tmp13_;  	GtkToolButton* _tmp14_;  	GtkToolButton* _tmp15_;  	GtkToolButton* _tmp16_; +	GtkToolButton* next_button = NULL;  	GtkToolButton* _tmp17_;  	GtkToolButton* _tmp18_;  	GtkToolButton* _tmp19_; -	GtkToolButton* next_button = NULL;  	GtkToolButton* _tmp20_;  	GtkToolButton* _tmp21_;  	GtkToolButton* _tmp22_;  	GtkToolButton* _tmp23_;  	GtkToolButton* _tmp24_; -	GtkToolButton* _tmp25_; -	GtkToolButton* _tmp26_; -	GtkToolButton* _tmp27_; -	Screensaver* _tmp28_; +	Screensaver* _tmp25_;  #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);  #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -733,37 +860,33 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so  #line 115 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = (SlideshowPage*) single_photo_page_construct (object_type, _ ("Slideshow"), TRUE);  #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp0_ = sources; -#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp1_ = _data_collection_ref0 (_tmp0_); +	_tmp0_ = _data_collection_ref0 (sources);  #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_data_collection_unref0 (self->priv->sources);  #line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->sources = _tmp1_; +	self->priv->sources = _tmp0_;  #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp2_ = controller; -#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp3_ = _data_collection_ref0 (_tmp2_); +	_tmp1_ = _data_collection_ref0 (controller);  #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_data_collection_unref0 (self->priv->controller);  #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->controller = _tmp3_; +	self->priv->controller = _tmp1_;  #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp4_ = transition_effects_manager_get_instance (); +	_tmp2_ = transition_effects_manager_get_instance ();  #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp5_ = _tmp4_; +	_tmp3_ = _tmp2_;  #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp6_ = transition_effects_manager_get_effect_ids (_tmp5_); +	_tmp4_ = transition_effects_manager_get_effect_ids (_tmp3_);  #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp7_ = _tmp6_; +	_tmp5_ = _tmp4_;  #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_transition_effects_manager_unref0 (_tmp5_); +	_transition_effects_manager_unref0 (_tmp3_);  #line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	pluggables = _tmp7_; +	pluggables = _tmp5_;  #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); +	_tmp6_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);  #line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	a = _tmp8_; +	a = _tmp6_;  #line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gee_array_list_add_all (a, pluggables);  #line 123 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -771,35 +894,33 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so  #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 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp10_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp9_); +	_tmp8_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp7_);  #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 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->transitions = _tmp10_; +	self->priv->transitions = _tmp8_;  #line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->transitions_length1 = _tmp9_; +	self->priv->transitions_length1 = _tmp7_;  #line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->_transitions_size_ = self->priv->transitions_length1;  #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp11_ = start; -#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp12_ = _g_object_ref0 (_tmp11_); +	_tmp9_ = _g_object_ref0 (start);  #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->current);  #line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->current = _tmp12_; +	self->priv->current = _tmp9_;  #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_update_transition_effect (self);  #line 131 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp13_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +	_tmp10_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));  #line 131 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	toolbar = _tmp13_; +	toolbar = _tmp10_;  #line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp14_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Back")); +	_tmp11_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Back"));  #line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	g_object_ref_sink (_tmp14_); +	g_object_ref_sink (_tmp11_);  #line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	previous_button = _tmp14_; +	previous_button = _tmp11_;  #line 135 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gtk_tool_button_set_icon_name (previous_button, "go-previous");  #line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -809,35 +930,35 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so  #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 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp15_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Pause")); +	_tmp12_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Pause"));  #line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	g_object_ref_sink (_tmp15_); +	g_object_ref_sink (_tmp12_);  #line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->play_pause_button);  #line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->play_pause_button = _tmp15_; +	self->priv->play_pause_button = _tmp12_;  #line 142 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp16_ = self->priv->play_pause_button; +	_tmp13_ = self->priv->play_pause_button;  #line 142 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_tool_button_set_icon_name (_tmp16_, "media-playback-pause"); +	gtk_tool_button_set_icon_name (_tmp13_, "media-playback-pause");  #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp17_ = self->priv->play_pause_button; +	_tmp14_ = self->priv->play_pause_button;  #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")); +	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow"));  #line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp18_ = self->priv->play_pause_button; +	_tmp15_ = self->priv->play_pause_button;  #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); +	g_signal_connect_object (_tmp15_, "clicked", (GCallback) _slideshow_page_on_play_pause_gtk_tool_button_clicked, self, 0);  #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp19_ = self->priv->play_pause_button; +	_tmp16_ = self->priv->play_pause_button;  #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); +	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_tool_item_get_type (), GtkToolItem), -1);  #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Next")); +	_tmp17_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Next"));  #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	g_object_ref_sink (_tmp20_); +	g_object_ref_sink (_tmp17_);  #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	next_button = _tmp20_; +	next_button = _tmp17_;  #line 149 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	gtk_tool_button_set_icon_name (next_button, "go-next");  #line 150 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -847,43 +968,43 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so  #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 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp21_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL); +	_tmp18_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);  #line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	g_object_ref_sink (_tmp21_); +	g_object_ref_sink (_tmp18_);  #line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->settings_button);  #line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->settings_button = _tmp21_; +	self->priv->settings_button = _tmp18_;  #line 156 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp22_ = self->priv->settings_button; +	_tmp19_ = self->priv->settings_button;  #line 156 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_tool_button_set_icon_name (_tmp22_, "preferences-system"); +	gtk_tool_button_set_icon_name (_tmp19_, "preferences-system");  #line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp23_ = self->priv->settings_button; +	_tmp20_ = self->priv->settings_button;  #line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_tool_button_set_label (_tmp23_, _ ("Settings")); +	gtk_tool_button_set_label (_tmp20_, _ ("Settings"));  #line 158 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp24_ = self->priv->settings_button; +	_tmp21_ = self->priv->settings_button;  #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")); +	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), _ ("Change slideshow settings"));  #line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp25_ = self->priv->settings_button; +	_tmp22_ = self->priv->settings_button;  #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); +	g_signal_connect_object (_tmp22_, "clicked", (GCallback) _slideshow_page_on_change_settings_gtk_tool_button_clicked, self, 0);  #line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp26_ = self->priv->settings_button; +	_tmp23_ = self->priv->settings_button;  #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); +	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_tool_item_get_type (), GtkToolItem), TRUE);  #line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp27_ = self->priv->settings_button; +	_tmp24_ = self->priv->settings_button;  #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); +	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), -1);  #line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp28_ = screensaver_new (); +	_tmp25_ = screensaver_new ();  #line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_screensaver_unref0 (self->priv->screensaver);  #line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->screensaver = _tmp28_; +	self->priv->screensaver = _tmp25_;  #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (next_button);  #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -896,27 +1017,35 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so  	_g_object_unref0 (pluggables);  #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return self; -#line 900 "SlideshowPage.c" +#line 1021 "SlideshowPage.c"  } -SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start) { +SlideshowPage* +slideshow_page_new (SourceCollection* sources, +                    ViewCollection* controller, +                    Photo* start) +{  #line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return slideshow_page_construct (TYPE_SLIDESHOW_PAGE, sources, controller, start); -#line 907 "SlideshowPage.c" +#line 1032 "SlideshowPage.c"  } -static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self) { +static gboolean +_slideshow_page_auto_advance_gsource_func (gpointer self) +{  	gboolean result;  	result = slideshow_page_auto_advance ((SlideshowPage*) self);  #line 179 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 916 "SlideshowPage.c" +#line 1043 "SlideshowPage.c"  } -static void slideshow_page_real_switched_to (Page* base) { +static void +slideshow_page_real_switched_to (Page* base) +{  	SlideshowPage * self;  	SourceCollection* _tmp0_;  	Scaling _tmp1_ = {0}; @@ -956,7 +1085,7 @@ static void slideshow_page_real_switched_to (Page* base) {  	pixbuf = _tmp5_;  #line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp6_) { -#line 960 "SlideshowPage.c" +#line 1089 "SlideshowPage.c"  		GdkPixbuf* _tmp7_;  		Photo* _tmp8_;  		Dimensions _tmp9_ = {0}; @@ -971,7 +1100,7 @@ static void slideshow_page_real_switched_to (Page* base) {  		_tmp10_ = DIRECTION_FORWARD;  #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 975 "SlideshowPage.c" +#line 1104 "SlideshowPage.c"  	}  #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); @@ -985,11 +1114,13 @@ static void slideshow_page_real_switched_to (Page* base) {  	screensaver_inhibit (_tmp12_, "Playing slideshow");  #line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (pixbuf); -#line 989 "SlideshowPage.c" +#line 1118 "SlideshowPage.c"  } -static void slideshow_page_real_switching_from (Page* base) { +static void +slideshow_page_real_switching_from (Page* base) +{  	SlideshowPage * self;  	Screensaver* _tmp0_;  #line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1002,252 +1133,249 @@ static void slideshow_page_real_switching_from (Page* base) {  	screensaver_uninhibit (_tmp0_);  #line 189 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv->exiting = TRUE; -#line 1006 "SlideshowPage.c" +#line 1137 "SlideshowPage.c"  } -static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start, Direction direction, Photo* * next, GdkPixbuf* * next_pixbuf) { +static gboolean +slideshow_page_get_next_photo (SlideshowPage* self, +                               Photo* start, +                               Direction direction, +                               Photo* * next, +                               GdkPixbuf* * next_pixbuf) +{  	Photo* _vala_next = NULL;  	GdkPixbuf* _vala_next_pixbuf = NULL;  	gboolean result = FALSE;  	Photo* _tmp0_; -	Photo* _tmp1_;  	GError * _inner_error_ = NULL;  #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE);  #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (IS_PHOTO (start), FALSE);  #line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp0_ = start; -#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp1_ = _g_object_ref0 (_tmp0_); +	_tmp0_ = _g_object_ref0 (start);  #line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_vala_next);  #line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_vala_next = _tmp1_; -#line 1029 "SlideshowPage.c" +	_vala_next = _tmp0_; +#line 1163 "SlideshowPage.c"  	{ -		gboolean _tmp2_ = FALSE; +		gboolean _tmp1_ = FALSE;  #line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp2_ = TRUE; +		_tmp1_ = TRUE;  #line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		while (TRUE) { -#line 1036 "SlideshowPage.c" +#line 1170 "SlideshowPage.c"  			DataSource* forward = NULL;  			DataSource* back = NULL; -			ViewCollection* _tmp40_; -			Photo* _tmp41_; -			DataSource* _tmp42_ = NULL; -			DataSource* _tmp43_ = NULL; -			PixbufCache* _tmp44_; -			DataSource* _tmp45_; -			PixbufCache* _tmp46_; -			DataSource* _tmp47_; +			ViewCollection* _tmp37_; +			Photo* _tmp38_; +			DataSource* _tmp39_ = NULL; +			DataSource* _tmp40_ = NULL; +			PixbufCache* _tmp41_; +			DataSource* _tmp42_; +			PixbufCache* _tmp43_; +			DataSource* _tmp44_;  			GeeSet* neighbors = NULL; -			ViewCollection* _tmp48_; -			Photo* _tmp49_; +			ViewCollection* _tmp45_; +			Photo* _tmp46_; +			GeeSet* _tmp47_; +			GeeSet* _tmp48_; +			DataSource* _tmp49_;  			GeeSet* _tmp50_; -			GeeSet* _tmp51_; -			DataSource* _tmp52_; +			DataSource* _tmp51_; +			PixbufCache* _tmp52_;  			GeeSet* _tmp53_; -			DataSource* _tmp54_; -			PixbufCache* _tmp55_; -			GeeSet* _tmp56_;  #line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			if (!_tmp2_) { -#line 1059 "SlideshowPage.c" +			if (!_tmp1_) { +#line 1193 "SlideshowPage.c"  			}  #line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp2_ = FALSE; -#line 1063 "SlideshowPage.c" +			_tmp1_ = FALSE; +#line 1197 "SlideshowPage.c"  			{ -				GdkPixbuf* _tmp3_ = NULL; -				PixbufCache* _tmp4_; -				Photo* _tmp5_; +				GdkPixbuf* _tmp2_ = NULL; +				PixbufCache* _tmp3_; +				Photo* _tmp4_; +				GdkPixbuf* _tmp5_;  				GdkPixbuf* _tmp6_; -				GdkPixbuf* _tmp7_;  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp4_ = self->priv->cache; +				_tmp3_ = self->priv->cache;  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp5_ = _vala_next; +				_tmp4_ = _vala_next;  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp6_ = pixbuf_cache_fetch (_tmp4_, _tmp5_, &_inner_error_); +				_tmp5_ = pixbuf_cache_fetch (_tmp3_, _tmp4_, &_inner_error_);  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp3_ = _tmp6_; +				_tmp2_ = _tmp5_;  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1080 "SlideshowPage.c" +#line 1214 "SlideshowPage.c"  					goto __catch470_g_error;  				}  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp7_ = _tmp3_; +				_tmp6_ = _tmp2_;  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp3_ = NULL; +				_tmp2_ = NULL;  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_vala_next_pixbuf);  #line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_vala_next_pixbuf = _tmp7_; +				_vala_next_pixbuf = _tmp6_;  #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_g_object_unref0 (_tmp3_); -#line 1093 "SlideshowPage.c" +				_g_object_unref0 (_tmp2_); +#line 1227 "SlideshowPage.c"  			}  			goto __finally470;  			__catch470_g_error:  			{  				GError* err = NULL; -				Photo* _tmp8_; +				Photo* _tmp7_; +				gchar* _tmp8_;  				gchar* _tmp9_; -				gchar* _tmp10_; -				GError* _tmp11_; -				const gchar* _tmp12_; +				GError* _tmp10_; +				const gchar* _tmp11_;  				DataView* view = NULL; -				ViewCollection* _tmp13_; -				Photo* _tmp14_; -				DataView* _tmp15_; -				DataView* _tmp16_ = NULL; -				Direction _tmp17_; -				DataView* _tmp24_; -				DataView* _tmp25_; -				DataSource* _tmp26_; -				gboolean _tmp27_ = FALSE; -				gboolean _tmp28_ = FALSE; -				Photo* _tmp29_; -				Photo* _tmp30_; +				ViewCollection* _tmp12_; +				Photo* _tmp13_; +				DataView* _tmp14_; +				DataView* _tmp15_ = NULL; +				DataView* _tmp22_; +				DataView* _tmp23_; +				DataSource* _tmp24_; +				gboolean _tmp25_ = FALSE; +				gboolean _tmp26_ = FALSE; +				Photo* _tmp27_;  #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				err = _inner_error_;  #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_inner_error_ = NULL;  #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp8_ = _vala_next; +				_tmp7_ = _vala_next;  #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); +				_tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));  #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp10_ = _tmp9_; +				_tmp9_ = _tmp8_;  #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp11_ = err; +				_tmp10_ = err;  #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp12_ = _tmp11_->message; +				_tmp11_ = _tmp10_->message;  #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				g_warning ("SlideshowPage.vala:201: Unable to fetch pixbuf for %s: %s", _tmp10_, _tmp12_); +				g_warning ("SlideshowPage.vala:201: Unable to fetch pixbuf for %s: %s", _tmp9_, _tmp11_);  #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_g_free0 (_tmp10_); +				_g_free0 (_tmp9_);  #line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp13_ = self->priv->controller; +				_tmp12_ = self->priv->controller;  #line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp14_ = _vala_next; +				_tmp13_ = _vala_next;  #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)); +				_tmp14_ = view_collection_get_view_for_source (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource));  #line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				view = _tmp15_; -#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp17_ = direction; +				view = _tmp14_;  #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				if (_tmp17_ == DIRECTION_FORWARD) { -#line 1147 "SlideshowPage.c" -					ViewCollection* _tmp18_; -					DataView* _tmp19_; -					DataView* _tmp20_; +				if (direction == DIRECTION_FORWARD) { +#line 1277 "SlideshowPage.c" +					ViewCollection* _tmp16_; +					DataView* _tmp17_; +					DataView* _tmp18_;  #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp18_ = self->priv->controller; +					_tmp16_ = self->priv->controller;  #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp19_ = view; +					_tmp17_ = view;  #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp20_ = view_collection_get_next (_tmp18_, _tmp19_); +					_tmp18_ = view_collection_get_next (_tmp16_, _tmp17_);  #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_g_object_unref0 (_tmp16_); +					_g_object_unref0 (_tmp15_);  #line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp16_ = _tmp20_; -#line 1161 "SlideshowPage.c" +					_tmp15_ = _tmp18_; +#line 1291 "SlideshowPage.c"  				} else { -					ViewCollection* _tmp21_; -					DataView* _tmp22_; -					DataView* _tmp23_; +					ViewCollection* _tmp19_; +					DataView* _tmp20_; +					DataView* _tmp21_;  #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp21_ = self->priv->controller; +					_tmp19_ = self->priv->controller;  #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp22_ = view; +					_tmp20_ = view;  #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp23_ = view_collection_get_previous (_tmp21_, _tmp22_); +					_tmp21_ = view_collection_get_previous (_tmp19_, _tmp20_);  #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_g_object_unref0 (_tmp16_); +					_g_object_unref0 (_tmp15_);  #line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp16_ = _tmp23_; -#line 1176 "SlideshowPage.c" +					_tmp15_ = _tmp21_; +#line 1306 "SlideshowPage.c"  				}  #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp24_ = _g_object_ref0 (_tmp16_); +				_tmp22_ = _g_object_ref0 (_tmp15_);  #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (view);  #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				view = _tmp24_; +				view = _tmp22_;  #line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp25_ = view; +				_tmp23_ = view;  #line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp26_ = data_view_get_source (_tmp25_); +				_tmp24_ = data_view_get_source (_tmp23_);  #line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_vala_next);  #line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_vala_next = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo); +				_vala_next = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO, Photo);  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp29_ = _vala_next; +				_tmp27_ = _vala_next;  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp30_ = start; +				if (_tmp27_ == start) { +#line 1326 "SlideshowPage.c" +					Photo* _tmp28_; +					Photo* _tmp29_;  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				if (_tmp29_ == _tmp30_) { -#line 1198 "SlideshowPage.c" -					Photo* _tmp31_; -					Photo* _tmp32_; +					_tmp28_ = _vala_next;  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp31_ = _vala_next; +					_tmp29_ = self->priv->current;  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp32_ = self->priv->current; -#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp28_ = _tmp31_ != _tmp32_; -#line 1207 "SlideshowPage.c" +					_tmp26_ = _tmp28_ != _tmp29_; +#line 1335 "SlideshowPage.c"  				} else {  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp28_ = FALSE; -#line 1211 "SlideshowPage.c" +					_tmp26_ = FALSE; +#line 1339 "SlideshowPage.c"  				}  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				if (_tmp28_) { +				if (_tmp26_) {  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp27_ = TRUE; -#line 1217 "SlideshowPage.c" +					_tmp25_ = TRUE; +#line 1345 "SlideshowPage.c"  				} else { -					Photo* _tmp33_; -					Photo* _tmp34_; +					Photo* _tmp30_; +					Photo* _tmp31_;  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp33_ = _vala_next; +					_tmp30_ = _vala_next;  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp34_ = self->priv->current; +					_tmp31_ = self->priv->current;  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp27_ = _tmp33_ == _tmp34_; -#line 1227 "SlideshowPage.c" +					_tmp25_ = _tmp30_ == _tmp31_; +#line 1355 "SlideshowPage.c"  				}  #line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				if (_tmp27_) { -#line 1231 "SlideshowPage.c" -					GtkWindow* _tmp35_; -					GtkWindow* _tmp36_; -					AppWindow* _tmp37_; -					AppWindow* _tmp38_; +				if (_tmp25_) { +#line 1359 "SlideshowPage.c" +					GtkWindow* _tmp32_; +					GtkWindow* _tmp33_; +					AppWindow* _tmp34_; +					AppWindow* _tmp35_;  #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +					_tmp32_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));  #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp36_ = _tmp35_; +					_tmp33_ = _tmp32_;  #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					app_window_error_message (_ ("All photo source files are missing."), _tmp36_); +					app_window_error_message (_ ("All photo source files are missing."), _tmp33_);  #line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_g_object_unref0 (_tmp36_); +					_g_object_unref0 (_tmp33_);  #line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp37_ = app_window_get_instance (); +					_tmp34_ = app_window_get_instance ();  #line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_tmp38_ = _tmp37_; +					_tmp35_ = _tmp34_;  #line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					app_window_end_fullscreen (_tmp38_); +					app_window_end_fullscreen (_tmp35_);  #line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_g_object_unref0 (_tmp38_); +					_g_object_unref0 (_tmp35_);  #line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (_vala_next);  #line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1259,7 +1387,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					result = FALSE;  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -					_g_object_unref0 (_tmp16_); +					_g_object_unref0 (_tmp15_);  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					_g_object_unref0 (view);  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1268,101 +1396,101 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start  					if (next) {  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  						*next = _vala_next; -#line 1272 "SlideshowPage.c" +#line 1400 "SlideshowPage.c"  					} else {  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  						_g_object_unref0 (_vala_next); -#line 1276 "SlideshowPage.c" +#line 1404 "SlideshowPage.c"  					}  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					if (next_pixbuf) {  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  						*next_pixbuf = _vala_next_pixbuf; -#line 1282 "SlideshowPage.c" +#line 1410 "SlideshowPage.c"  					} else {  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  						_g_object_unref0 (_vala_next_pixbuf); -#line 1286 "SlideshowPage.c" +#line 1414 "SlideshowPage.c"  					}  #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  					return result; -#line 1290 "SlideshowPage.c" +#line 1418 "SlideshowPage.c"  				}  #line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_g_object_unref0 (_tmp16_); +				_g_object_unref0 (_tmp15_);  #line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (view);  #line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_error_free0 (err);  #line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				continue; -#line 1300 "SlideshowPage.c" +#line 1428 "SlideshowPage.c"  			}  			__finally470:  #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1305 "SlideshowPage.c" -				gboolean _tmp39_ = FALSE; +#line 1433 "SlideshowPage.c" +				gboolean _tmp36_ = FALSE;  #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 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				g_clear_error (&_inner_error_);  #line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				return _tmp39_; -#line 1313 "SlideshowPage.c" +				return _tmp36_; +#line 1441 "SlideshowPage.c"  			}  #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp40_ = self->priv->controller; +			_tmp37_ = self->priv->controller;  #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp41_ = _vala_next; +			_tmp38_ = _vala_next;  #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); +			view_collection_get_immediate_neighbors (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_SOURCE, DataSource), &_tmp39_, &_tmp40_, PHOTO_TYPENAME);  #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (forward);  #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			forward = _tmp42_; +			forward = _tmp39_;  #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_object_unref0 (back);  #line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			back = _tmp43_; +			back = _tmp40_;  #line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp44_ = self->priv->cache; +			_tmp41_ = self->priv->cache;  #line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp45_ = forward; +			_tmp42_ = forward;  #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); +			pixbuf_cache_prefetch (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);  #line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp46_ = self->priv->cache; +			_tmp43_ = self->priv->cache;  #line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp47_ = back; +			_tmp44_ = back;  #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); +			pixbuf_cache_prefetch (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);  #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp48_ = self->priv->controller; +			_tmp45_ = self->priv->controller;  #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp49_ = _vala_next; +			_tmp46_ = _vala_next;  #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); +			_tmp47_ = view_collection_get_extended_neighbors (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);  #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			neighbors = _tmp50_; +			neighbors = _tmp47_;  #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp51_ = neighbors; +			_tmp48_ = neighbors;  #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp52_ = forward; +			_tmp49_ = forward;  #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_); +			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp49_);  #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp53_ = neighbors; +			_tmp50_ = neighbors;  #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp54_ = back; +			_tmp51_ = back;  #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_); +			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_);  #line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp55_ = self->priv->cache; +			_tmp52_ = self->priv->cache;  #line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp56_ = neighbors; +			_tmp53_ = neighbors;  #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); +			pixbuf_cache_prefetch_many (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE);  #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			result = TRUE;  #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1375,51 +1503,53 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start  			if (next) {  #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				*next = _vala_next; -#line 1379 "SlideshowPage.c" +#line 1507 "SlideshowPage.c"  			} else {  #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_vala_next); -#line 1383 "SlideshowPage.c" +#line 1511 "SlideshowPage.c"  			}  #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			if (next_pixbuf) {  #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				*next_pixbuf = _vala_next_pixbuf; -#line 1389 "SlideshowPage.c" +#line 1517 "SlideshowPage.c"  			} else {  #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_object_unref0 (_vala_next_pixbuf); -#line 1393 "SlideshowPage.c" +#line 1521 "SlideshowPage.c"  			}  #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			return result; -#line 1397 "SlideshowPage.c" +#line 1525 "SlideshowPage.c"  		}  	}  #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (next) {  #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		*next = _vala_next; -#line 1404 "SlideshowPage.c" +#line 1532 "SlideshowPage.c"  	} else {  #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_vala_next); -#line 1408 "SlideshowPage.c" +#line 1536 "SlideshowPage.c"  	}  #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (next_pixbuf) {  #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		*next_pixbuf = _vala_next_pixbuf; -#line 1414 "SlideshowPage.c" +#line 1542 "SlideshowPage.c"  	} else {  #line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_vala_next_pixbuf); -#line 1418 "SlideshowPage.c" +#line 1546 "SlideshowPage.c"  	}  } -static void slideshow_page_on_play_pause (SlideshowPage* self) { +static void +slideshow_page_on_play_pause (SlideshowPage* self) +{  	gboolean _tmp0_;  	gboolean _tmp7_;  	GTimer* _tmp8_; @@ -1429,7 +1559,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {  	_tmp0_ = self->priv->playing;  #line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp0_) { -#line 1433 "SlideshowPage.c" +#line 1563 "SlideshowPage.c"  		GtkToolButton* _tmp1_;  		GtkToolButton* _tmp2_;  		GtkToolButton* _tmp3_; @@ -1445,7 +1575,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {  		_tmp3_ = self->priv->play_pause_button;  #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 1449 "SlideshowPage.c" +#line 1579 "SlideshowPage.c"  	} else {  		GtkToolButton* _tmp4_;  		GtkToolButton* _tmp5_; @@ -1462,7 +1592,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {  		_tmp6_ = self->priv->play_pause_button;  #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 1466 "SlideshowPage.c" +#line 1596 "SlideshowPage.c"  	}  #line 252 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp7_ = self->priv->playing; @@ -1472,11 +1602,13 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {  	_tmp8_ = self->priv->timer;  #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_timer_start (_tmp8_); -#line 1476 "SlideshowPage.c" +#line 1606 "SlideshowPage.c"  } -static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { +static void +slideshow_page_real_on_previous_photo (SinglePhotoPage* base) +{  	SlideshowPage * self;  	DataView* view = NULL;  	ViewCollection* _tmp0_; @@ -1519,7 +1651,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {  	prev_view = _tmp7_;  #line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	while (TRUE) { -#line 1523 "SlideshowPage.c" +#line 1655 "SlideshowPage.c"  		DataView* _tmp8_;  		DataView* _tmp9_;  		DataSource* _tmp10_; @@ -1536,7 +1668,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {  		if (!(_tmp8_ != NULL)) {  #line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			break; -#line 1540 "SlideshowPage.c" +#line 1672 "SlideshowPage.c"  		}  #line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = prev_view; @@ -1550,7 +1682,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {  		_g_object_unref0 (_tmp11_);  #line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		if (_tmp12_) { -#line 1554 "SlideshowPage.c" +#line 1686 "SlideshowPage.c"  			DataView* _tmp13_;  			DataSource* _tmp14_;  #line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1563,7 +1695,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {  			prev_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);  #line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			break; -#line 1567 "SlideshowPage.c" +#line 1699 "SlideshowPage.c"  		}  #line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp15_ = self->priv->controller; @@ -1594,7 +1726,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {  			_g_object_unref0 (view);  #line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			return; -#line 1597 "SlideshowPage.c" +#line 1729 "SlideshowPage.c"  		}  	}  #line 279 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1609,11 +1741,13 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {  	_g_object_unref0 (prev_photo);  #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (view); -#line 1612 "SlideshowPage.c" +#line 1744 "SlideshowPage.c"  } -static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { +static void +slideshow_page_real_on_next_photo (SinglePhotoPage* base) +{  	SlideshowPage * self;  	DataView* view = NULL;  	ViewCollection* _tmp0_; @@ -1661,7 +1795,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  	next_view = _tmp7_;  #line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	while (TRUE) { -#line 1664 "SlideshowPage.c" +#line 1798 "SlideshowPage.c"  		DataView* _tmp8_;  		DataView* _tmp9_;  		DataSource* _tmp10_; @@ -1678,7 +1812,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  		if (!(_tmp8_ != NULL)) {  #line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			break; -#line 1681 "SlideshowPage.c" +#line 1815 "SlideshowPage.c"  		}  #line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = next_view; @@ -1692,7 +1826,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  		_g_object_unref0 (_tmp11_);  #line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		if (_tmp12_) { -#line 1695 "SlideshowPage.c" +#line 1829 "SlideshowPage.c"  			DataView* _tmp13_;  			DataSource* _tmp14_;  #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1705,7 +1839,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  			next_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);  #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			break; -#line 1708 "SlideshowPage.c" +#line 1842 "SlideshowPage.c"  		}  #line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp15_ = self->priv->controller; @@ -1736,7 +1870,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  			_g_object_unref0 (view);  #line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			return; -#line 1738 "SlideshowPage.c" +#line 1872 "SlideshowPage.c"  		}  	}  #line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1757,7 +1891,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  	if (_tmp24_) {  #line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		slideshow_page_random_transition_effect (self); -#line 1759 "SlideshowPage.c" +#line 1893 "SlideshowPage.c"  	}  #line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp25_ = next_photo; @@ -1771,76 +1905,73 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {  	_g_object_unref0 (next_photo);  #line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (view); -#line 1773 "SlideshowPage.c" +#line 1907 "SlideshowPage.c"  } -static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction direction) { +static void +slideshow_page_advance (SlideshowPage* self, +                        Photo* photo, +                        Direction direction) +{  	Photo* _tmp0_; -	Photo* _tmp1_;  	GdkPixbuf* next_pixbuf = NULL; -	Photo* _tmp2_; -	Direction _tmp3_; -	Photo* _tmp4_ = NULL; -	GdkPixbuf* _tmp5_ = NULL; -	gboolean _tmp6_; -	GTimer* _tmp11_; +	Photo* _tmp1_; +	Photo* _tmp2_ = NULL; +	GdkPixbuf* _tmp3_ = NULL; +	gboolean _tmp4_; +	GTimer* _tmp8_;  #line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self));  #line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_PHOTO (photo));  #line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp0_ = photo; -#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp1_ = _g_object_ref0 (_tmp0_); +	_tmp0_ = _g_object_ref0 (photo);  #line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->current);  #line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->current = _tmp1_; -#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp2_ = self->priv->current; +	self->priv->current = _tmp0_;  #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp3_ = direction; +	_tmp1_ = self->priv->current;  #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp6_ = slideshow_page_get_next_photo (self, _tmp2_, _tmp3_, &_tmp4_, &_tmp5_); +	_tmp4_ = slideshow_page_get_next_photo (self, _tmp1_, direction, &_tmp2_, &_tmp3_);  #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (self->priv->current);  #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->current = _tmp4_; +	self->priv->current = _tmp2_;  #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (next_pixbuf);  #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	next_pixbuf = _tmp5_; +	next_pixbuf = _tmp3_;  #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	if (_tmp6_) { -#line 1815 "SlideshowPage.c" -		GdkPixbuf* _tmp7_; -		Photo* _tmp8_; -		Dimensions _tmp9_ = {0}; -		Direction _tmp10_; +	if (_tmp4_) { +#line 1947 "SlideshowPage.c" +		GdkPixbuf* _tmp5_; +		Photo* _tmp6_; +		Dimensions _tmp7_ = {0};  #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp7_ = next_pixbuf; +		_tmp5_ = next_pixbuf;  #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp8_ = self->priv->current; +		_tmp6_ = self->priv->current;  #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_); +		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp7_);  #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp10_ = direction; -#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 1830 "SlideshowPage.c" +		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp5_, &_tmp7_, &direction); +#line 1959 "SlideshowPage.c"  	}  #line 320 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp11_ = self->priv->timer; +	_tmp8_ = self->priv->timer;  #line 320 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	g_timer_start (_tmp11_); +	g_timer_start (_tmp8_);  #line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (next_pixbuf); -#line 1838 "SlideshowPage.c" +#line 1967 "SlideshowPage.c"  } -static gboolean slideshow_page_auto_advance (SlideshowPage* self) { +static gboolean +slideshow_page_auto_advance (SlideshowPage* self) +{  	gboolean result = FALSE;  	gboolean _tmp0_;  	gboolean _tmp1_; @@ -1848,8 +1979,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {  	gdouble _tmp3_;  	ConfigFacade* _tmp4_;  	ConfigFacade* _tmp5_; -	gdouble _tmp6_; -	gboolean _tmp7_; +	gboolean _tmp6_;  #line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE);  #line 324 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1860,7 +1990,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {  		result = FALSE;  #line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 1862 "SlideshowPage.c" +#line 1992 "SlideshowPage.c"  	}  #line 327 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp1_ = self->priv->playing; @@ -1870,7 +2000,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {  		result = TRUE;  #line 328 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 1872 "SlideshowPage.c" +#line 2002 "SlideshowPage.c"  	}  #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp2_ = self->priv->timer; @@ -1881,18 +2011,16 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {  #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = _tmp4_;  #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 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp7_ = _tmp3_ < _tmp6_; +	_tmp6_ = _tmp3_ < configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));  #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp5_);  #line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	if (_tmp7_) { +	if (_tmp6_) {  #line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		result = TRUE;  #line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 1894 "SlideshowPage.c" +#line 2022 "SlideshowPage.c"  	}  #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)); @@ -1900,24 +2028,26 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {  	result = TRUE;  #line 335 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 1902 "SlideshowPage.c" +#line 2030 "SlideshowPage.c"  } -static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) { +static gboolean +slideshow_page_real_key_press_event (GtkWidget* base, +                                     GdkEventKey* event) +{  	SlideshowPage * self;  	gboolean result = FALSE;  	gboolean handled = FALSE; -	GdkEventKey* _tmp0_; -	guint _tmp1_; +	guint _tmp0_; +	const gchar* _tmp1_;  	const gchar* _tmp2_; -	const gchar* _tmp3_; -	GQuark _tmp5_ = 0U; +	GQuark _tmp4_ = 0U;  #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	static GQuark _tmp4_label0 = 0; -#line 1917 "SlideshowPage.c" -	gboolean _tmp6_; -	gboolean _tmp7_ = FALSE; +	static GQuark _tmp3_label0 = 0; +#line 2047 "SlideshowPage.c" +	gboolean _tmp5_; +	gboolean _tmp6_ = FALSE;  #line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);  #line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1925,89 +2055,81 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe  #line 339 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	handled = TRUE;  #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp0_ = event; +	_tmp0_ = event->keyval;  #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp1_ = _tmp0_->keyval; +	_tmp1_ = gdk_keyval_name (_tmp0_);  #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp2_ = gdk_keyval_name (_tmp1_); -#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp3_ = _tmp2_; +	_tmp2_ = _tmp1_;  #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); +	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);  #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("space")))) { +	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("space")))) {  #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		switch (0) { -#line 1940 "SlideshowPage.c" +#line 2068 "SlideshowPage.c"  			default:  			{  #line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				slideshow_page_on_play_pause (self);  #line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				break; -#line 1947 "SlideshowPage.c" +#line 2075 "SlideshowPage.c"  			}  		}  	} else {  #line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		switch (0) { -#line 1953 "SlideshowPage.c" +#line 2081 "SlideshowPage.c"  			default:  			{  #line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				handled = FALSE;  #line 347 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				break; -#line 1960 "SlideshowPage.c" +#line 2088 "SlideshowPage.c"  			}  		}  	}  #line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp6_ = handled; +	_tmp5_ = handled;  #line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	if (_tmp6_) { +	if (_tmp5_) {  #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		result = TRUE;  #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 1972 "SlideshowPage.c" +#line 2100 "SlideshowPage.c"  	}  #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) { -#line 1976 "SlideshowPage.c" -		GdkEventKey* _tmp8_; -		gboolean _tmp9_; -#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp8_ = event; -#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 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp7_ = _tmp9_; -#line 1985 "SlideshowPage.c" +		_tmp6_ = 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), event); +#line 2106 "SlideshowPage.c"  	} else {  #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp7_ = TRUE; -#line 1989 "SlideshowPage.c" +		_tmp6_ = TRUE; +#line 2110 "SlideshowPage.c"  	}  #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	result = _tmp7_; +	result = _tmp6_;  #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 1995 "SlideshowPage.c" +#line 2116 "SlideshowPage.c"  } -static void slideshow_page_on_change_settings (SlideshowPage* self) { +static void +slideshow_page_on_change_settings (SlideshowPage* self) +{  	SlideshowPageSettingsDialog* settings_dialog = NULL;  	SlideshowPageSettingsDialog* _tmp0_;  	SlideshowPageSettingsDialog* _tmp1_;  	gboolean slideshow_playing = FALSE;  	gboolean _tmp2_;  	SlideshowPageSettingsDialog* _tmp3_; -	gint _tmp4_; -	SlideshowPageSettingsDialog* _tmp22_; -	gboolean _tmp23_; -	GTimer* _tmp24_; +	SlideshowPageSettingsDialog* _tmp18_; +	gboolean _tmp19_; +	GTimer* _tmp20_;  #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self));  #line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2031,102 +2153,93 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {  #line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp3_ = settings_dialog;  #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 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) { -#line 2036 "SlideshowPage.c" +	if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK)) { +#line 2156 "SlideshowPage.c" +		ConfigFacade* _tmp4_;  		ConfigFacade* _tmp5_; -		ConfigFacade* _tmp6_; -		SlideshowPageSettingsDialog* _tmp7_; -		gdouble _tmp8_; -		ConfigFacade* _tmp9_; +		SlideshowPageSettingsDialog* _tmp6_; +		ConfigFacade* _tmp7_; +		ConfigFacade* _tmp8_; +		SlideshowPageSettingsDialog* _tmp9_;  		ConfigFacade* _tmp10_; -		SlideshowPageSettingsDialog* _tmp11_; -		gdouble _tmp12_; -		ConfigFacade* _tmp13_; -		ConfigFacade* _tmp14_; -		SlideshowPageSettingsDialog* _tmp15_; -		gchar* _tmp16_; -		gchar* _tmp17_; -		ConfigFacade* _tmp18_; -		ConfigFacade* _tmp19_; -		SlideshowPageSettingsDialog* _tmp20_; -		gboolean _tmp21_; -#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp5_ = config_facade_get_instance (); +		ConfigFacade* _tmp11_; +		SlideshowPageSettingsDialog* _tmp12_; +		gchar* _tmp13_; +		gchar* _tmp14_; +		ConfigFacade* _tmp15_; +		ConfigFacade* _tmp16_; +		SlideshowPageSettingsDialog* _tmp17_;  #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp6_ = _tmp5_; +		_tmp4_ = config_facade_get_instance ();  #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp7_ = settings_dialog; +		_tmp5_ = _tmp4_;  #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp8_ = slideshow_page_settings_dialog_get_delay (_tmp7_); +		_tmp6_ = settings_dialog;  #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_); +		configuration_facade_set_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), slideshow_page_settings_dialog_get_delay (_tmp6_));  #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_g_object_unref0 (_tmp6_); -#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp9_ = config_facade_get_instance (); +		_g_object_unref0 (_tmp5_);  #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp10_ = _tmp9_; +		_tmp7_ = config_facade_get_instance ();  #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp11_ = settings_dialog; +		_tmp8_ = _tmp7_;  #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp12_ = slideshow_page_settings_dialog_get_transition_delay (_tmp11_); +		_tmp9_ = settings_dialog;  #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_); +		configuration_facade_set_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), slideshow_page_settings_dialog_get_transition_delay (_tmp9_));  #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_g_object_unref0 (_tmp10_); +		_g_object_unref0 (_tmp8_);  #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp13_ = config_facade_get_instance (); +		_tmp10_ = config_facade_get_instance ();  #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp14_ = _tmp13_; +		_tmp11_ = _tmp10_;  #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp15_ = settings_dialog; +		_tmp12_ = settings_dialog;  #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp16_ = slideshow_page_settings_dialog_get_transition_effect_id (_tmp15_); +		_tmp13_ = slideshow_page_settings_dialog_get_transition_effect_id (_tmp12_);  #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp17_ = _tmp16_; +		_tmp14_ = _tmp13_;  #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_); +		configuration_facade_set_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp14_);  #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_g_free0 (_tmp17_); +		_g_free0 (_tmp14_);  #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_g_object_unref0 (_tmp14_); +		_g_object_unref0 (_tmp11_);  #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp18_ = config_facade_get_instance (); +		_tmp15_ = config_facade_get_instance ();  #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp19_ = _tmp18_; +		_tmp16_ = _tmp15_;  #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp20_ = settings_dialog; +		_tmp17_ = settings_dialog;  #line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp21_ = slideshow_page_settings_dialog_get_show_title (_tmp20_); +		configuration_facade_set_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), slideshow_page_settings_dialog_get_show_title (_tmp17_));  #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 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_g_object_unref0 (_tmp19_); +		_g_object_unref0 (_tmp16_);  #line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		slideshow_page_update_transition_effect (self); -#line 2108 "SlideshowPage.c" +#line 2219 "SlideshowPage.c"  	}  #line 375 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp22_ = settings_dialog; +	_tmp18_ = settings_dialog;  #line 375 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); +	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));  #line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp23_ = slideshow_playing; +	_tmp19_ = slideshow_playing;  #line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	self->priv->playing = _tmp23_; +	self->priv->playing = _tmp19_;  #line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp24_ = self->priv->timer; +	_tmp20_ = self->priv->timer;  #line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	g_timer_start (_tmp24_); +	g_timer_start (_tmp20_);  #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (settings_dialog); -#line 2124 "SlideshowPage.c" +#line 2235 "SlideshowPage.c"  } -static void slideshow_page_update_transition_effect (SlideshowPage* self) { +static void +slideshow_page_update_transition_effect (SlideshowPage* self) +{  	gchar* effect_id = NULL;  	ConfigFacade* _tmp0_;  	ConfigFacade* _tmp1_; @@ -2136,7 +2249,6 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) {  	ConfigFacade* _tmp4_;  	ConfigFacade* _tmp5_;  	gdouble _tmp6_; -	gdouble _tmp7_;  #line 380 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self));  #line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2158,31 +2270,30 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) {  #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 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp7_ = _tmp6_; -#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp5_);  #line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	effect_delay = _tmp7_; +	effect_delay = _tmp6_;  #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 380 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (effect_id); -#line 2169 "SlideshowPage.c" +#line 2279 "SlideshowPage.c"  } -static void slideshow_page_random_transition_effect (SlideshowPage* self) { +static void +slideshow_page_random_transition_effect (SlideshowPage* self) +{  	gdouble effect_delay = 0.0;  	ConfigFacade* _tmp0_;  	ConfigFacade* _tmp1_;  	gdouble _tmp2_; -	gdouble _tmp3_;  	gchar* effect_id = NULL; -	gchar* _tmp4_; -	gchar** _tmp5_; -	gint _tmp5__length1; -	const gchar* _tmp12_; -	gdouble _tmp13_; +	gchar* _tmp3_; +	gchar** _tmp4_; +	gint _tmp4__length1; +	const gchar* _tmp10_; +	gdouble _tmp11_;  #line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self));  #line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2192,68 +2303,67 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {  #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 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp3_ = _tmp2_; -#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_object_unref0 (_tmp1_);  #line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	effect_delay = _tmp3_; +	effect_delay = _tmp2_;  #line 389 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp4_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); +	_tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);  #line 389 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	effect_id = _tmp4_; +	effect_id = _tmp3_;  #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp5_ = self->priv->transitions; +	_tmp4_ = self->priv->transitions;  #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp5__length1 = self->priv->transitions_length1; +	_tmp4__length1 = self->priv->transitions_length1;  #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	if (0 < _tmp5__length1) { -#line 2209 "SlideshowPage.c" +	if (0 < _tmp4__length1) { +#line 2318 "SlideshowPage.c"  		gint random = 0; +		gchar** _tmp5_; +		gint _tmp5__length1;  		gchar** _tmp6_;  		gint _tmp6__length1; -		gint32 _tmp7_; -		gchar** _tmp8_; -		gint _tmp8__length1; -		gint _tmp9_; -		const gchar* _tmp10_; -		gchar* _tmp11_; +		gint _tmp7_; +		const gchar* _tmp8_; +		gchar* _tmp9_;  #line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp6_ = self->priv->transitions; +		_tmp5_ = self->priv->transitions;  #line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp6__length1 = self->priv->transitions_length1; +		_tmp5__length1 = self->priv->transitions_length1;  #line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp7_ = g_random_int_range ((gint32) 0, (gint32) _tmp6__length1); -#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		random = (gint) _tmp7_; +		random = (gint) g_random_int_range ((gint32) 0, (gint32) _tmp5__length1);  #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp8_ = self->priv->transitions; +		_tmp6_ = self->priv->transitions;  #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp8__length1 = self->priv->transitions_length1; +		_tmp6__length1 = self->priv->transitions_length1;  #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp9_ = random; +		_tmp7_ = random;  #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp10_ = _tmp8_[_tmp9_]; +		_tmp8_ = _tmp6_[_tmp7_];  #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp11_ = g_strdup (_tmp10_); +		_tmp9_ = g_strdup (_tmp8_);  #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_free0 (effect_id);  #line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		effect_id = _tmp11_; -#line 2241 "SlideshowPage.c" +		effect_id = _tmp9_; +#line 2347 "SlideshowPage.c"  	}  #line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp12_ = effect_id; +	_tmp10_ = effect_id;  #line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp13_ = effect_delay; +	_tmp11_ = effect_delay;  #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)); +	single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp10_, (gint) (_tmp11_ * 1000.0));  #line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (effect_id); -#line 2251 "SlideshowPage.c" +#line 2357 "SlideshowPage.c"  } -static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimensions* ctx_dim) { +static void +slideshow_page_paint_title (SlideshowPage* self, +                            cairo_t* ctx, +                            Dimensions* ctx_dim) +{  	gchar* title = NULL;  	Photo* _tmp0_;  	gchar* _tmp1_; @@ -2293,17 +2403,10 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  	gint _tmp32_;  	Dimensions _tmp33_;  	gint _tmp34_; -	cairo_t* _tmp38_; -	cairo_t* _tmp39_; -	gdouble _tmp40_; -	gdouble _tmp41_; -	cairo_t* _tmp42_; -	PangoLayout* _tmp43_; -	cairo_t* _tmp44_; -	PangoLayout* _tmp45_; -	cairo_t* _tmp46_; -	cairo_t* _tmp47_; -	cairo_t* _tmp48_; +	gdouble _tmp38_; +	gdouble _tmp39_; +	PangoLayout* _tmp40_; +	PangoLayout* _tmp41_;  #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (IS_SLIDESHOW_PAGE (self));  #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2322,14 +2425,14 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  	if (_tmp3_ == NULL) {  #line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = TRUE; -#line 2324 "SlideshowPage.c" +#line 2427 "SlideshowPage.c"  	} else {  		const gchar* _tmp4_;  #line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp4_ = title;  #line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0; -#line 2331 "SlideshowPage.c" +#line 2434 "SlideshowPage.c"  	}  #line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp2_) { @@ -2337,7 +2440,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  		_g_free0 (title);  #line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return; -#line 2339 "SlideshowPage.c" +#line 2442 "SlideshowPage.c"  	}  #line 405 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp5_ = title; @@ -2405,7 +2508,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  	_tmp27_ = _tmp26_.height;  #line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if ((_tmp24_ + _tmp25_) >= (_tmp27_ * 0.95)) { -#line 2407 "SlideshowPage.c" +#line 2510 "SlideshowPage.c"  		Dimensions _tmp28_;  		gint _tmp29_;  		gint _tmp30_; @@ -2417,7 +2520,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  		_tmp30_ = title_height;  #line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		y = (_tmp29_ * 0.95) - _tmp30_; -#line 2419 "SlideshowPage.c" +#line 2522 "SlideshowPage.c"  	}  #line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp31_ = x; @@ -2429,7 +2532,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  	_tmp34_ = _tmp33_.width;  #line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if ((_tmp31_ + _tmp32_) >= (_tmp34_ * 0.95)) { -#line 2431 "SlideshowPage.c" +#line 2534 "SlideshowPage.c"  		Dimensions _tmp35_;  		gint _tmp36_;  		gint _tmp37_; @@ -2441,44 +2544,30 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  		_tmp37_ = title_width;  #line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		x = (gdouble) ((_tmp36_ / 2) - (_tmp37_ / 2)); -#line 2443 "SlideshowPage.c" +#line 2546 "SlideshowPage.c"  	}  #line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp38_ = ctx; -#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	set_source_color_from_string (_tmp38_, "#fff"); -#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp39_ = ctx; +	set_source_color_from_string (ctx, "#fff");  #line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp40_ = x; +	_tmp38_ = x;  #line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp41_ = y; +	_tmp39_ = y;  #line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	cairo_move_to (_tmp39_, _tmp40_, _tmp41_); +	cairo_move_to (ctx, _tmp38_, _tmp39_);  #line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp42_ = ctx; +	_tmp40_ = layout;  #line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp43_ = layout; -#line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	pango_cairo_show_layout (_tmp42_, _tmp43_); -#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp44_ = ctx; +	pango_cairo_show_layout (ctx, _tmp40_);  #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp45_ = layout; +	_tmp41_ = layout;  #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	pango_cairo_layout_path (_tmp44_, _tmp45_); +	pango_cairo_layout_path (ctx, _tmp41_);  #line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp46_ = ctx; -#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	cairo_set_line_width (_tmp46_, 1.5); -#line 430 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp47_ = ctx; +	cairo_set_line_width (ctx, 1.5);  #line 430 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	set_source_color_from_string (_tmp47_, "#000"); -#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp48_ = ctx; +	set_source_color_from_string (ctx, "#000");  #line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	cairo_stroke (_tmp48_); +	cairo_stroke (ctx);  #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_pango_attribute_destroy0 (size);  #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2487,19 +2576,21 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen  	_g_object_unref0 (layout);  #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (title); -#line 2489 "SlideshowPage.c" +#line 2578 "SlideshowPage.c"  } -static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim) { +static void +slideshow_page_real_paint (SinglePhotoPage* base, +                           cairo_t* ctx, +                           Dimensions* ctx_dim) +{  	SlideshowPage * self; -	cairo_t* _tmp0_; -	Dimensions _tmp1_; -	gboolean _tmp2_ = FALSE; +	Dimensions _tmp0_; +	gboolean _tmp1_ = FALSE; +	ConfigFacade* _tmp2_;  	ConfigFacade* _tmp3_; -	ConfigFacade* _tmp4_; -	gboolean _tmp5_; -	gboolean _tmp6_; +	gboolean _tmp4_;  #line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);  #line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2507,105 +2598,100 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime  #line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_if_fail (ctx_dim != NULL);  #line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp0_ = ctx; -#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp1_ = *ctx_dim; +	_tmp0_ = *ctx_dim;  #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 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp3_ = config_facade_get_instance (); -#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp4_ = _tmp3_; +	SINGLE_PHOTO_PAGE_CLASS (slideshow_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), ctx, &_tmp0_);  #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)); +	_tmp2_ = config_facade_get_instance ();  #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp6_ = _tmp5_; +	_tmp3_ = _tmp2_;  #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp4_); +	_tmp4_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));  #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	if (_tmp6_) { -#line 2526 "SlideshowPage.c" -		gboolean _tmp7_; +	_g_object_unref0 (_tmp3_);  #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)); +	if (_tmp4_) {  #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp2_ = !_tmp7_; -#line 2532 "SlideshowPage.c" +		_tmp1_ = !single_photo_page_is_transition_in_progress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); +#line 2615 "SlideshowPage.c"  	} else {  #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp2_ = FALSE; -#line 2536 "SlideshowPage.c" +		_tmp1_ = FALSE; +#line 2619 "SlideshowPage.c"  	}  #line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	if (_tmp2_) { -#line 2540 "SlideshowPage.c" -		cairo_t* _tmp8_; -		Dimensions _tmp9_; -#line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp8_ = ctx; +	if (_tmp1_) { +#line 2623 "SlideshowPage.c" +		Dimensions _tmp5_;  #line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp9_ = *ctx_dim; +		_tmp5_ = *ctx_dim;  #line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		slideshow_page_paint_title (self, _tmp8_, &_tmp9_); -#line 2549 "SlideshowPage.c" +		slideshow_page_paint_title (self, ctx, &_tmp5_); +#line 2629 "SlideshowPage.c"  	}  } -static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_utf8_ci_compare_gcompare_data_func (gconstpointer a, +                                     gconstpointer b, +                                     gpointer self) +{  	gint result;  	result = utf8_ci_compare (a, b);  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 2559 "SlideshowPage.c" +#line 2643 "SlideshowPage.c"  } -static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void +_slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, +                                                                             gpointer self) +{  #line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_settings_dialog_on_transition_changed ((SlideshowPageSettingsDialog*) self); -#line 2566 "SlideshowPage.c" +#line 2653 "SlideshowPage.c"  } -static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GType object_type) { +static SlideshowPageSettingsDialog* +slideshow_page_settings_dialog_construct (GType object_type) +{  	SlideshowPageSettingsDialog * self = NULL;  	gdouble delay = 0.0;  	ConfigFacade* _tmp0_;  	ConfigFacade* _tmp1_;  	gdouble _tmp2_; -	gdouble _tmp3_; +	FullscreenWindow* _tmp3_;  	FullscreenWindow* _tmp4_; -	FullscreenWindow* _tmp5_; -	GtkAdjustment* _tmp6_; -	gdouble _tmp7_; +	GtkAdjustment* _tmp5_; +	gdouble _tmp6_;  	gchar* effect_id = NULL; +	ConfigFacade* _tmp7_;  	ConfigFacade* _tmp8_; -	ConfigFacade* _tmp9_; +	gchar* _tmp9_;  	gchar* _tmp10_; -	gchar* _tmp11_;  	gchar* null_display_name = NULL; +	TransitionEffectsManager* _tmp11_;  	TransitionEffectsManager* _tmp12_; -	TransitionEffectsManager* _tmp13_; +	gchar* _tmp13_;  	gchar* _tmp14_; -	gchar* _tmp15_; -	GtkComboBoxText* _tmp16_; -	const gchar* _tmp17_; -	GtkComboBoxText* _tmp18_; +	GtkComboBoxText* _tmp15_; +	const gchar* _tmp16_; +	GtkComboBoxText* _tmp17_;  	gint i = 0; -	GtkComboBoxText* _tmp43_; +	GtkComboBoxText* _tmp41_;  	gdouble transition_delay = 0.0; -	ConfigFacade* _tmp44_; -	ConfigFacade* _tmp45_; -	gdouble _tmp46_; -	gdouble _tmp47_; -	GtkAdjustment* _tmp48_; +	ConfigFacade* _tmp42_; +	ConfigFacade* _tmp43_; +	gdouble _tmp44_; +	GtkAdjustment* _tmp45_;  	gboolean show_title = FALSE; -	ConfigFacade* _tmp49_; -	ConfigFacade* _tmp50_; -	gboolean _tmp51_; -	gboolean _tmp52_; -	GtkCheckButton* _tmp53_; +	ConfigFacade* _tmp46_; +	ConfigFacade* _tmp47_; +	gboolean _tmp48_; +	GtkCheckButton* _tmp49_;  #line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = (SlideshowPageSettingsDialog*) g_object_new (object_type, NULL);  #line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2615,221 +2701,212 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT  #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_; +	delay = _tmp2_;  #line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp4_ = app_window_get_fullscreen (); +	_tmp3_ = app_window_get_fullscreen ();  #line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp5_ = _tmp4_; +	_tmp4_ = _tmp3_;  #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)); +	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));  #line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp5_); +	_g_object_unref0 (_tmp4_);  #line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp6_ = self->priv->delay_adjustment; +	_tmp5_ = self->priv->delay_adjustment;  #line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp7_ = delay; +	_tmp6_ = delay;  #line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_adjustment_set_value (_tmp6_, _tmp7_); +	gtk_adjustment_set_value (_tmp5_, _tmp6_);  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp8_ = config_facade_get_instance (); +	_tmp7_ = config_facade_get_instance ();  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp9_ = _tmp8_; +	_tmp8_ = _tmp7_;  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp10_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +	_tmp9_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp11_ = _tmp10_; +	_tmp10_ = _tmp9_;  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp9_); +	_g_object_unref0 (_tmp8_);  #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	effect_id = _tmp11_; +	effect_id = _tmp10_;  #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp12_ = transition_effects_manager_get_instance (); +	_tmp11_ = transition_effects_manager_get_instance ();  #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp13_ = _tmp12_; +	_tmp12_ = _tmp11_;  #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp14_ = transition_effects_manager_get_effect_name (_tmp13_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); +	_tmp13_ = transition_effects_manager_get_effect_name (_tmp12_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);  #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp15_ = _tmp14_; +	_tmp14_ = _tmp13_;  #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_transition_effects_manager_unref0 (_tmp13_); +	_transition_effects_manager_unref0 (_tmp12_);  #line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	null_display_name = _tmp15_; +	null_display_name = _tmp14_;  #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp16_ = self->priv->transition_effect_selector; +	_tmp15_ = self->priv->transition_effect_selector;  #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp17_ = null_display_name; +	_tmp16_ = null_display_name;  #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_combo_box_text_append_text (_tmp16_, _tmp17_); +	gtk_combo_box_text_append_text (_tmp15_, _tmp16_);  #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp18_ = self->priv->transition_effect_selector; +	_tmp17_ = self->priv->transition_effect_selector;  #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), 0); +	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0);  #line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	i = 1; -#line 2672 "SlideshowPage.c" +#line 2756 "SlideshowPage.c"  	{  		GeeIterator* _display_name_it = NULL; +		TransitionEffectsManager* _tmp18_;  		TransitionEffectsManager* _tmp19_; -		TransitionEffectsManager* _tmp20_; +		GeeCollection* _tmp20_;  		GeeCollection* _tmp21_; -		GeeCollection* _tmp22_; +		GeeIterator* _tmp22_;  		GeeIterator* _tmp23_; -		GeeIterator* _tmp24_;  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp19_ = transition_effects_manager_get_instance (); +		_tmp18_ = transition_effects_manager_get_instance ();  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp20_ = _tmp19_; +		_tmp19_ = _tmp18_;  #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); +		_tmp20_ = transition_effects_manager_get_effect_names (_tmp19_, _utf8_ci_compare_gcompare_data_func, NULL, NULL);  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp22_ = _tmp21_; +		_tmp21_ = _tmp20_;  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp23_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ITERABLE, GeeIterable)); +		_tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable));  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_tmp24_ = _tmp23_; +		_tmp23_ = _tmp22_;  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_g_object_unref0 (_tmp22_); +		_g_object_unref0 (_tmp21_);  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_transition_effects_manager_unref0 (_tmp20_); +		_transition_effects_manager_unref0 (_tmp19_);  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -		_display_name_it = _tmp24_; +		_display_name_it = _tmp23_;  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		while (TRUE) { -#line 2701 "SlideshowPage.c" -			GeeIterator* _tmp25_; -			gboolean _tmp26_; +#line 2785 "SlideshowPage.c" +			GeeIterator* _tmp24_;  			gchar* display_name = NULL; -			GeeIterator* _tmp27_; -			gpointer _tmp28_; -			const gchar* _tmp29_; +			GeeIterator* _tmp25_; +			gpointer _tmp26_; +			const gchar* _tmp27_; +			const gchar* _tmp28_; +			GtkComboBoxText* _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; +			const gchar* _tmp31_; +			TransitionEffectsManager* _tmp32_; +			TransitionEffectsManager* _tmp33_; +			const gchar* _tmp34_; +			gchar* _tmp35_; +			gchar* _tmp36_; +			gboolean _tmp37_; +			gint _tmp40_;  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp26_ = gee_iterator_next (_tmp25_); +			_tmp24_ = _display_name_it;  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			if (!_tmp26_) { +			if (!gee_iterator_next (_tmp24_)) {  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				break; -#line 2727 "SlideshowPage.c" +#line 2808 "SlideshowPage.c"  			}  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp27_ = _display_name_it; +			_tmp25_ = _display_name_it;  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp28_ = gee_iterator_get (_tmp27_); +			_tmp26_ = gee_iterator_get (_tmp25_);  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			display_name = (gchar*) _tmp28_; +			display_name = (gchar*) _tmp26_;  #line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp29_ = display_name; +			_tmp27_ = display_name;  #line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp30_ = null_display_name; +			_tmp28_ = null_display_name;  #line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			if (g_strcmp0 (_tmp29_, _tmp30_) == 0) { +			if (g_strcmp0 (_tmp27_, _tmp28_) == 0) {  #line 63 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				_g_free0 (display_name);  #line 63 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  				continue; -#line 2745 "SlideshowPage.c" +#line 2826 "SlideshowPage.c"  			}  #line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp31_ = self->priv->transition_effect_selector; +			_tmp29_ = self->priv->transition_effect_selector;  #line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp32_ = display_name; +			_tmp30_ = display_name;  #line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			gtk_combo_box_text_append_text (_tmp31_, _tmp32_); +			gtk_combo_box_text_append_text (_tmp29_, _tmp30_);  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp33_ = effect_id; +			_tmp31_ = effect_id;  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp34_ = transition_effects_manager_get_instance (); +			_tmp32_ = transition_effects_manager_get_instance ();  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp35_ = _tmp34_; +			_tmp33_ = _tmp32_;  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp36_ = display_name; +			_tmp34_ = display_name;  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp37_ = transition_effects_manager_get_id_for_effect_name (_tmp35_, _tmp36_); +			_tmp35_ = transition_effects_manager_get_id_for_effect_name (_tmp33_, _tmp34_);  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp38_ = _tmp37_; +			_tmp36_ = _tmp35_;  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp39_ = g_strcmp0 (_tmp33_, _tmp38_) == 0; +			_tmp37_ = g_strcmp0 (_tmp31_, _tmp36_) == 0;  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_g_free0 (_tmp38_); +			_g_free0 (_tmp36_);  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_transition_effects_manager_unref0 (_tmp35_); +			_transition_effects_manager_unref0 (_tmp33_);  #line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			if (_tmp39_) { -#line 2773 "SlideshowPage.c" -				GtkComboBoxText* _tmp40_; -				gint _tmp41_; +			if (_tmp37_) { +#line 2854 "SlideshowPage.c" +				GtkComboBoxText* _tmp38_; +				gint _tmp39_;  #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp40_ = self->priv->transition_effect_selector; +				_tmp38_ = self->priv->transition_effect_selector;  #line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -				_tmp41_ = i; +				_tmp39_ = 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" +				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_combo_box_get_type (), GtkComboBox), _tmp39_); +#line 2863 "SlideshowPage.c"  			}  #line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			_tmp42_ = i; +			_tmp40_ = i;  #line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -			i = _tmp42_ + 1; +			i = _tmp40_ + 1;  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  			_g_free0 (display_name); -#line 2790 "SlideshowPage.c" +#line 2871 "SlideshowPage.c"  		}  #line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_g_object_unref0 (_display_name_it); -#line 2794 "SlideshowPage.c" +#line 2875 "SlideshowPage.c"  	}  #line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp43_ = self->priv->transition_effect_selector; +	_tmp41_ = 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); +	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, 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 (); +	_tmp42_ = config_facade_get_instance ();  #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp45_ = _tmp44_; +	_tmp43_ = _tmp42_;  #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)); +	_tmp44_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));  #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp47_ = _tmp46_; +	_g_object_unref0 (_tmp43_);  #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_; +	transition_delay = _tmp44_;  #line 74 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp48_ = self->priv->transition_effect_adjustment; +	_tmp45_ = 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 (); +	gtk_adjustment_set_value (_tmp45_, transition_delay);  #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp50_ = _tmp49_; +	_tmp46_ = config_facade_get_instance ();  #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)); +	_tmp47_ = _tmp46_;  #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp52_ = _tmp51_; +	_tmp48_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));  #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_g_object_unref0 (_tmp50_); +	_g_object_unref0 (_tmp47_);  #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	show_title = _tmp52_; +	show_title = _tmp48_;  #line 77 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp53_ = self->priv->show_title_button; +	_tmp49_ = 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); +	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, 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 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2838,18 +2915,22 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT  	_g_free0 (effect_id);  #line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return self; -#line 2840 "SlideshowPage.c" +#line 2917 "SlideshowPage.c"  } -static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void) { +static SlideshowPageSettingsDialog* +slideshow_page_settings_dialog_new (void) +{  #line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return slideshow_page_settings_dialog_construct (SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG); -#line 2847 "SlideshowPage.c" +#line 2926 "SlideshowPage.c"  } -static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self) { +static void +slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self) +{  	gchar* selected = NULL;  	GtkComboBoxText* _tmp0_;  	gchar* _tmp1_; @@ -2870,17 +2951,17 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS  	_tmp3_ = selected;  #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp3_ != NULL) { -#line 2872 "SlideshowPage.c" +#line 2953 "SlideshowPage.c"  		const gchar* _tmp4_;  #line 85 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp4_ = selected;  #line 85 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = g_strcmp0 (_tmp4_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID) != 0; -#line 2878 "SlideshowPage.c" +#line 2959 "SlideshowPage.c"  	} else {  #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp2_ = FALSE; -#line 2882 "SlideshowPage.c" +#line 2963 "SlideshowPage.c"  	}  #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	sensitive = _tmp2_; @@ -2894,47 +2975,47 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS  	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitive);  #line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_g_free0 (selected); -#line 2896 "SlideshowPage.c" +#line 2977 "SlideshowPage.c"  } -static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDialog* self) { +static gdouble +slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDialog* self) +{  	gdouble result = 0.0;  	GtkSpinButton* _tmp0_; -	gdouble _tmp1_;  #line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0);  #line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->delay_entry;  #line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp1_ = gtk_spin_button_get_value (_tmp0_); -#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	result = _tmp1_; +	result = gtk_spin_button_get_value (_tmp0_);  #line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 2914 "SlideshowPage.c" +#line 2994 "SlideshowPage.c"  } -static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPageSettingsDialog* self) { +static gdouble +slideshow_page_settings_dialog_get_transition_delay (SlideshowPageSettingsDialog* self) +{  	gdouble result = 0.0;  	GtkSpinButton* _tmp0_; -	gdouble _tmp1_;  #line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0);  #line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp0_ = self->priv->transition_effect_entry;  #line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	_tmp1_ = gtk_spin_button_get_value (_tmp0_); -#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala" -	result = _tmp1_; +	result = gtk_spin_button_get_value (_tmp0_);  #line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 2932 "SlideshowPage.c" +#line 3011 "SlideshowPage.c"  } -static gchar* slideshow_page_settings_dialog_get_transition_effect_id (SlideshowPageSettingsDialog* self) { +static gchar* +slideshow_page_settings_dialog_get_transition_effect_id (SlideshowPageSettingsDialog* self) +{  	gchar* result = NULL;  	gchar* active = NULL;  	GtkComboBoxText* _tmp0_; @@ -2961,7 +3042,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow  	_tmp2_ = active;  #line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp2_ == NULL) { -#line 2963 "SlideshowPage.c" +#line 3044 "SlideshowPage.c"  		gchar* _tmp3_;  #line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); @@ -2971,7 +3052,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow  		_g_free0 (active);  #line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		return result; -#line 2973 "SlideshowPage.c" +#line 3054 "SlideshowPage.c"  	}  #line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp4_ = transition_effects_manager_get_instance (); @@ -2991,17 +3072,17 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow  	_tmp10_ = id;  #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	if (_tmp10_ != NULL) { -#line 2993 "SlideshowPage.c" +#line 3074 "SlideshowPage.c"  		const gchar* _tmp11_;  #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp11_ = id;  #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = _tmp11_; -#line 2999 "SlideshowPage.c" +#line 3080 "SlideshowPage.c"  	} else {  #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  		_tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID; -#line 3003 "SlideshowPage.c" +#line 3084 "SlideshowPage.c"  	}  #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	_tmp12_ = g_strdup (_tmp9_); @@ -3013,11 +3094,13 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow  	_g_free0 (active);  #line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 3015 "SlideshowPage.c" +#line 3096 "SlideshowPage.c"  } -static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSettingsDialog* self) { +static gboolean +slideshow_page_settings_dialog_get_show_title (SlideshowPageSettingsDialog* self) +{  	gboolean result = FALSE;  	GtkCheckButton* _tmp0_;  	gboolean _tmp1_; @@ -3034,11 +3117,13 @@ static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSett  	result = _tmp2_;  #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	return result; -#line 3036 "SlideshowPage.c" +#line 3119 "SlideshowPage.c"  } -static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDialogClass * klass) { +static void +slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDialogClass * klass) +{  	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); @@ -3064,20 +3149,24 @@ static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDial  	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" +#line 3151 "SlideshowPage.c"  } -static void slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsDialog * self) { +static void +slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsDialog * self) +{  #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"  	gtk_widget_init_template (GTK_WIDGET (self)); -#line 3075 "SlideshowPage.c" +#line 3162 "SlideshowPage.c"  } -static void slideshow_page_settings_dialog_finalize (GObject * obj) { +static void +slideshow_page_settings_dialog_finalize (GObject * obj) +{  	SlideshowPageSettingsDialog * self;  #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialog); @@ -3097,11 +3186,13 @@ static void slideshow_page_settings_dialog_finalize (GObject * obj) {  	_g_object_unref0 (self->priv->show_title_button);  #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	G_OBJECT_CLASS (slideshow_page_settings_dialog_parent_class)->finalize (obj); -#line 3099 "SlideshowPage.c" +#line 3188 "SlideshowPage.c"  } -static GType slideshow_page_settings_dialog_get_type (void) { +static GType +slideshow_page_settings_dialog_get_type (void) +{  	static volatile gsize slideshow_page_settings_dialog_type_id__volatile = 0;  	if (g_once_init_enter (&slideshow_page_settings_dialog_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (SlideshowPageSettingsDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slideshow_page_settings_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideshowPageSettingsDialog), 0, (GInstanceInitFunc) slideshow_page_settings_dialog_instance_init, NULL }; @@ -3113,7 +3204,9 @@ static GType slideshow_page_settings_dialog_get_type (void) {  } -static void slideshow_page_class_init (SlideshowPageClass * klass) { +static void +slideshow_page_class_init (SlideshowPageClass * klass) +{  #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	slideshow_page_parent_class = g_type_class_peek_parent (klass);  #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -3134,11 +3227,13 @@ 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 3136 "SlideshowPage.c" +#line 3229 "SlideshowPage.c"  } -static void slideshow_page_instance_init (SlideshowPage * self) { +static void +slideshow_page_instance_init (SlideshowPage * self) +{  	GTimer* _tmp0_;  #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self->priv = SLIDESHOW_PAGE_GET_PRIVATE (self); @@ -3152,11 +3247,13 @@ 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 3154 "SlideshowPage.c" +#line 3249 "SlideshowPage.c"  } -static void slideshow_page_finalize (GObject * obj) { +static void +slideshow_page_finalize (GObject * obj) +{  	SlideshowPage * self;  #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SLIDESHOW_PAGE, SlideshowPage); @@ -3180,11 +3277,13 @@ 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 3182 "SlideshowPage.c" +#line 3279 "SlideshowPage.c"  } -GType slideshow_page_get_type (void) { +GType +slideshow_page_get_type (void) +{  	static volatile gsize slideshow_page_type_id__volatile = 0;  	if (g_once_init_enter (&slideshow_page_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (SlideshowPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slideshow_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideshowPage), 0, (GInstanceInitFunc) slideshow_page_instance_init, NULL }; @@ -3196,7 +3295,11 @@ GType slideshow_page_get_type (void) {  } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, +                     gint array_length, +                     GDestroyNotify destroy_func) +{  	if ((array != NULL) && (destroy_func != NULL)) {  		int i;  		for (i = 0; i < array_length; i = i + 1) { @@ -3208,7 +3311,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti  } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, +                  gint array_length, +                  GDestroyNotify destroy_func) +{  	_vala_array_destroy (array, array_length, destroy_func);  	g_free (array);  } | 
