From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/CollectionPage.c | 2475 ++++++++++++++++++++++++-------------------------- 1 file changed, 1190 insertions(+), 1285 deletions(-) (limited to 'src/CollectionPage.c') diff --git a/src/CollectionPage.c b/src/CollectionPage.c index d44af2c..87f07c8 100644 --- a/src/CollectionPage.c +++ b/src/CollectionPage.c @@ -1,4 +1,4 @@ -/* CollectionPage.c generated by valac 0.34.7, the Vala compiler +/* CollectionPage.c generated by valac 0.36.6, the Vala compiler * generated from CollectionPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1035,7 +1035,7 @@ CollectionViewManager* collection_view_manager_construct (GType object_type, Col ViewManager* view_manager_construct (GType object_type); static DataView* collection_view_manager_real_create_view (ViewManager* base, DataSource* source); DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source); -static void collection_view_manager_finalize (ViewManager* obj); +static void collection_view_manager_finalize (ViewManager * obj); GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); @@ -1167,12 +1167,12 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map); void page_remove_actions (Page* self, GActionMap* map); static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base, int* result_length1); InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1); -static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add76 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add77 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add78 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add79 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); static gboolean collection_page_selection_has_video (CollectionPage* self); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; @@ -1377,7 +1377,7 @@ enum { static guint collection_page_collection_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); -static void collection_page_finalize (GObject* obj); +static void collection_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); @@ -1392,8 +1392,8 @@ static gpointer _g_object_ref0 (gpointer self) { CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page) { CollectionViewManager* self = NULL; - CollectionPage* _tmp0_ = NULL; - CollectionPage* _tmp1_ = NULL; + CollectionPage* _tmp0_; + CollectionPage* _tmp1_; #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL); #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1422,9 +1422,9 @@ CollectionViewManager* collection_view_manager_new (CollectionPage* page) { static DataView* collection_view_manager_real_create_view (ViewManager* base, DataSource* source) { CollectionViewManager * self; DataView* result = NULL; - CollectionPage* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - DataView* _tmp2_ = NULL; + CollectionPage* _tmp0_; + DataSource* _tmp1_; + DataView* _tmp2_; #line 14 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager); #line 14 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1451,7 +1451,7 @@ static void collection_view_manager_class_init (CollectionViewManagerClass * kla #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_type_class_add_private (klass, sizeof (CollectionViewManagerPrivate)); #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) collection_view_manager_real_create_view; + ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) collection_view_manager_real_create_view; #line 1456 "CollectionPage.c" } @@ -1463,7 +1463,7 @@ static void collection_view_manager_instance_init (CollectionViewManager * self) } -static void collection_view_manager_finalize (ViewManager* obj) { +static void collection_view_manager_finalize (ViewManager * obj) { CollectionViewManager * self; #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager); @@ -1615,11 +1615,11 @@ static void _collection_page_on_external_app_changed_configuration_facade_extern CollectionPage* collection_page_construct (GType object_type, const gchar* page_name) { CollectionPage * self = NULL; - const gchar* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - ConfigFacade* _tmp3_ = NULL; - ConfigFacade* _tmp4_ = NULL; + const gchar* _tmp0_; + ViewCollection* _tmp1_; + ViewCollection* _tmp2_; + ConfigFacade* _tmp3_; + ConfigFacade* _tmp4_; #line 32 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (page_name != NULL, NULL); #line 33 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1657,9 +1657,9 @@ CollectionPage* collection_page_construct (GType object_type, const gchar* page_ static GtkToolbar* collection_page_real_get_toolbar (Page* base) { CollectionPage * self; GtkToolbar* result = NULL; - GtkToolbar* _tmp0_ = NULL; - GtkToolbar* _tmp28_ = NULL; - GtkToolbar* _tmp29_ = NULL; + GtkToolbar* _tmp0_; + GtkToolbar* _tmp28_; + GtkToolbar* _tmp29_; #line 46 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1667,38 +1667,38 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) { #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp0_ == NULL) { #line 1670 "CollectionPage.c" - GtkToolbar* _tmp1_ = NULL; - GtkToolbar* _tmp2_ = NULL; + GtkToolbar* _tmp1_; + GtkToolbar* _tmp2_; GtkSeparatorToolItem* separator = NULL; - GtkSeparatorToolItem* _tmp3_ = NULL; - GtkSeparatorToolItem* _tmp4_ = NULL; - GtkSeparatorToolItem* _tmp5_ = NULL; - GtkToolbar* _tmp6_ = NULL; - GtkToolbar* _tmp7_ = NULL; - GtkSeparatorToolItem* _tmp8_ = NULL; + GtkSeparatorToolItem* _tmp3_; + GtkSeparatorToolItem* _tmp4_; + GtkSeparatorToolItem* _tmp5_; + GtkToolbar* _tmp6_; + GtkToolbar* _tmp7_; + GtkSeparatorToolItem* _tmp8_; GtkSeparatorToolItem* drawn_separator = NULL; - GtkSeparatorToolItem* _tmp9_ = NULL; - GtkSeparatorToolItem* _tmp10_ = NULL; - GtkSeparatorToolItem* _tmp11_ = NULL; - GtkToolbar* _tmp12_ = NULL; - GtkToolbar* _tmp13_ = NULL; - GtkSeparatorToolItem* _tmp14_ = NULL; + GtkSeparatorToolItem* _tmp9_; + GtkSeparatorToolItem* _tmp10_; + GtkSeparatorToolItem* _tmp11_; + GtkToolbar* _tmp12_; + GtkToolbar* _tmp13_; + GtkSeparatorToolItem* _tmp14_; MediaPageZoomSliderAssembly* zoom_slider_assembly = NULL; - MediaPageZoomSliderAssembly* _tmp15_ = NULL; - MediaPageZoomSliderAssembly* _tmp16_ = NULL; - GtkToolbar* _tmp17_ = NULL; - GtkToolbar* _tmp18_ = NULL; - MediaPageZoomSliderAssembly* _tmp19_ = NULL; + MediaPageZoomSliderAssembly* _tmp15_; + MediaPageZoomSliderAssembly* _tmp16_; + GtkToolbar* _tmp17_; + GtkToolbar* _tmp18_; + MediaPageZoomSliderAssembly* _tmp19_; GtkToolButton* rotate_button = NULL; - GtkBuilder* _tmp20_ = NULL; - GObject* _tmp21_ = NULL; - GtkToolButton* _tmp22_ = NULL; + GtkBuilder* _tmp20_; + GObject* _tmp21_; + GtkToolButton* _tmp22_; GtkBindingSet* binding_set = NULL; - GtkToolButton* _tmp23_ = NULL; - GObjectClass* _tmp24_ = NULL; - GtkBindingSet* _tmp25_ = NULL; - GtkBindingSet* _tmp26_ = NULL; - GtkBindingSet* _tmp27_ = NULL; + GtkToolButton* _tmp23_; + GObjectClass* _tmp24_; + GtkBindingSet* _tmp25_; + GtkBindingSet* _tmp26_; + GtkBindingSet* _tmp27_; #line 48 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = PAGE_CLASS (collection_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page)); #line 48 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -1820,206 +1820,149 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) { static InjectionGroup* collection_page_create_file_menu_injectables (void) { InjectionGroup* result = NULL; InjectionGroup* group = NULL; - InjectionGroup* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + InjectionGroup* _tmp0_; #line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = injection_group_new ("FileExtrasPlaceholder"); #line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala" group = _tmp0_; #line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _ ("_Print"); -#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp1_, "Print", "p"); + injection_group_add_menu_item (group, _ ("_Print"), "Print", "p"); #line 81 "/home/jens/Source/shotwell/src/CollectionPage.vala" injection_group_add_separator (group); #line 82 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = _ ("_Publish"); -#line 82 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp2_, "Publish", "p"); -#line 83 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _ ("Send _To…"); + injection_group_add_menu_item (group, _ ("_Publish"), "Publish", "p"); #line 83 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp3_, "SendTo", NULL); + injection_group_add_menu_item (group, _ ("Send _To…"), "SendTo", NULL); #line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = _ ("Set as _Desktop Background"); -#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp4_, "SetBackground", "b"); + injection_group_add_menu_item (group, _ ("Set as _Desktop Background"), "SetBackground", "b"); #line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = group; #line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1855 "CollectionPage.c" +#line 1843 "CollectionPage.c" } static InjectionGroup* collection_page_create_edit_menu_injectables (void) { InjectionGroup* result = NULL; InjectionGroup* group = NULL; - InjectionGroup* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + InjectionGroup* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = injection_group_new ("EditExtrasPlaceholder"); #line 90 "/home/jens/Source/shotwell/src/CollectionPage.vala" group = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _ ("_Duplicate"); -#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp1_, "Duplicate", "D"); + injection_group_add_menu_item (group, _ ("_Duplicate"), "Duplicate", "D"); #line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = group; #line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1876 "CollectionPage.c" +#line 1861 "CollectionPage.c" } static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (void) { InjectionGroup* result = NULL; InjectionGroup* group = NULL; - InjectionGroup* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + InjectionGroup* _tmp0_; #line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = injection_group_new ("ViewExtrasFullscreenSlideshowPlaceholder"); #line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala" group = _tmp0_; #line 100 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _ ("Fullscreen"); -#line 100 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp1_, "CommonFullscreen", "F11"); + injection_group_add_menu_item (group, _ ("Fullscreen"), "CommonFullscreen", "F11"); #line 101 "/home/jens/Source/shotwell/src/CollectionPage.vala" injection_group_add_separator (group); #line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = _ ("S_lideshow"); -#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp2_, "Slideshow", "F5"); + injection_group_add_menu_item (group, _ ("S_lideshow"), "Slideshow", "F5"); #line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = group; #line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1904 "CollectionPage.c" +#line 1883 "CollectionPage.c" } static InjectionGroup* collection_page_create_photos_menu_edits_injectables (void) { InjectionGroup* result = NULL; InjectionGroup* group = NULL; - InjectionGroup* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; + InjectionGroup* _tmp0_; #line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = injection_group_new ("PhotosExtrasEditsPlaceholder"); #line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala" group = _tmp0_; #line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _ ("Rotate _Right"); -#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp1_, "RotateClockwise", "r"); -#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = _ ("Rotate _Left"); + injection_group_add_menu_item (group, _ ("Rotate _Right"), "RotateClockwise", "r"); #line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp2_, "RotateCounterclockwise", "r"); + injection_group_add_menu_item (group, _ ("Rotate _Left"), "RotateCounterclockwise", "r"); #line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _ ("Flip Hori_zontally"); -#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp3_, "FlipHorizontally", NULL); -#line 117 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp4_ = _ ("Flip Verti_cally"); + injection_group_add_menu_item (group, _ ("Flip Hori_zontally"), "FlipHorizontally", NULL); #line 117 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp4_, "FlipVertically", NULL); + injection_group_add_menu_item (group, _ ("Flip Verti_cally"), "FlipVertically", NULL); #line 118 "/home/jens/Source/shotwell/src/CollectionPage.vala" injection_group_add_separator (group); #line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp5_ = _ ("_Enhance"); -#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp5_, "Enhance", NULL); -#line 120 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp6_ = _ ("Re_vert to Original"); + injection_group_add_menu_item (group, _ ("_Enhance"), "Enhance", NULL); #line 120 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp6_, "Revert", NULL); + injection_group_add_menu_item (group, _ ("Re_vert to Original"), "Revert", NULL); #line 121 "/home/jens/Source/shotwell/src/CollectionPage.vala" injection_group_add_separator (group); #line 122 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = _ ("_Copy Color Adjustments"); -#line 122 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp7_, "CopyColorAdjustments", "c"); -#line 125 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _ ("_Paste Color Adjustments"); + injection_group_add_menu_item (group, _ ("_Copy Color Adjustments"), "CopyColorAdjustments", "c"); #line 125 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp8_, "PasteColorAdjustments", "v"); + injection_group_add_menu_item (group, _ ("_Paste Color Adjustments"), "PasteColorAdjustments", "v"); #line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = group; #line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1964 "CollectionPage.c" +#line 1919 "CollectionPage.c" } static InjectionGroup* collection_page_create_photos_menu_date_injectables (void) { InjectionGroup* result = NULL; InjectionGroup* group = NULL; - InjectionGroup* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + InjectionGroup* _tmp0_; #line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = injection_group_new ("PhotosExtrasDateTimePlaceholder"); #line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala" group = _tmp0_; #line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _ ("Adjust Date and Time…"); -#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp1_, "AdjustDateTime", NULL); + injection_group_add_menu_item (group, _ ("Adjust Date and Time…"), "AdjustDateTime", NULL); #line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = group; #line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 1985 "CollectionPage.c" +#line 1937 "CollectionPage.c" } static InjectionGroup* collection_page_create_photos_menu_externals_injectables (void) { InjectionGroup* result = NULL; InjectionGroup* group = NULL; - InjectionGroup* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + InjectionGroup* _tmp0_; #line 141 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = injection_group_new ("PhotosExtrasExternalsPlaceholder"); #line 141 "/home/jens/Source/shotwell/src/CollectionPage.vala" group = _tmp0_; #line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp1_ = _ ("Open With E_xternal Editor"); -#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp1_, "ExternalEdit", "Return"); + injection_group_add_menu_item (group, _ ("Open With E_xternal Editor"), "ExternalEdit", "Return"); #line 146 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp2_ = _ ("Open With RA_W Editor"); -#line 146 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp2_, "ExternalEditRAW", "Return"); -#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp3_ = _ ("_Play"); + injection_group_add_menu_item (group, _ ("Open With RA_W Editor"), "ExternalEditRAW", "Return"); #line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala" - injection_group_add_menu_item (group, _tmp3_, "PlayVideo", "Y"); + injection_group_add_menu_item (group, _ ("_Play"), "PlayVideo", "Y"); #line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = group; #line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2016 "CollectionPage.c" +#line 1959 "CollectionPage.c" } static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { CollectionPage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2032,14 +1975,14 @@ static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList* _tmp1_ = ui_filenames; #line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui"); -#line 2036 "CollectionPage.c" +#line 1979 "CollectionPage.c" } static void collection_page_real_add_actions (Page* base, GActionMap* map) { CollectionPage * self; - GActionMap* _tmp0_ = NULL; - GActionMap* _tmp1_ = NULL; + GActionMap* _tmp0_; + GActionMap* _tmp1_; #line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2052,13 +1995,13 @@ static void collection_page_real_add_actions (Page* base, GActionMap* map) { _tmp1_ = map; #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_action_map_add_action_entries (_tmp1_, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self); -#line 2056 "CollectionPage.c" +#line 1999 "CollectionPage.c" } static void collection_page_real_remove_actions (Page* base, GActionMap* map) { CollectionPage * self; - GActionMap* _tmp0_ = NULL; + GActionMap* _tmp0_; #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2067,7 +2010,7 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) { _tmp0_ = map; #line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala" PAGE_CLASS (collection_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_); -#line 2071 "CollectionPage.c" +#line 2014 "CollectionPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -2079,15 +2022,15 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (COLLECTION_PAGE_entries); #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (COLLECTION_PAGE_entries); entry_it = entry_it + 1) { -#line 2083 "CollectionPage.c" +#line 2026 "CollectionPage.c" GActionEntry entry = {0}; #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala" entry = entry_collection[entry_it]; -#line 2087 "CollectionPage.c" +#line 2030 "CollectionPage.c" { - GActionMap* _tmp1_ = NULL; - GActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; + GActionMap* _tmp1_; + GActionEntry _tmp2_; + const gchar* _tmp3_; #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = map; #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2096,112 +2039,112 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) { _tmp3_ = _tmp2_.name; #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_action_map_remove_action (_tmp1_, _tmp3_); -#line 2100 "CollectionPage.c" +#line 2043 "CollectionPage.c" } } } } -static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add76 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2114 "CollectionPage.c" +#line 2057 "CollectionPage.c" } #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2120 "CollectionPage.c" +#line 2063 "CollectionPage.c" } -static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add77 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2131 "CollectionPage.c" +#line 2074 "CollectionPage.c" } #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2137 "CollectionPage.c" +#line 2080 "CollectionPage.c" } -static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add78 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2148 "CollectionPage.c" +#line 2091 "CollectionPage.c" } #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2154 "CollectionPage.c" +#line 2097 "CollectionPage.c" } -static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add79 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2165 "CollectionPage.c" +#line 2108 "CollectionPage.c" } #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2171 "CollectionPage.c" +#line 2114 "CollectionPage.c" } -static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2182 "CollectionPage.c" +#line 2125 "CollectionPage.c" } #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2188 "CollectionPage.c" +#line 2131 "CollectionPage.c" } -static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" if ((*length) == (*size)) { #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" *size = (*size) ? (2 * (*size)) : 4; #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 2199 "CollectionPage.c" +#line 2142 "CollectionPage.c" } #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[(*length)++] = value; #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala" (*array)[*length] = NULL; -#line 2205 "CollectionPage.c" +#line 2148 "CollectionPage.c" } @@ -2209,30 +2152,30 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page CollectionPage * self; InjectionGroup** result = NULL; InjectionGroup** groups = NULL; - gint _tmp0_ = 0; - InjectionGroup** _tmp1_ = NULL; - gint groups_length1 = 0; - gint _groups_size_ = 0; - InjectionGroup** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - InjectionGroup* _tmp3_ = NULL; - InjectionGroup** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - InjectionGroup* _tmp5_ = NULL; - InjectionGroup** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - InjectionGroup* _tmp7_ = NULL; - InjectionGroup** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - InjectionGroup* _tmp9_ = NULL; - InjectionGroup** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - InjectionGroup* _tmp11_ = NULL; - InjectionGroup** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - InjectionGroup* _tmp13_ = NULL; - InjectionGroup** _tmp14_ = NULL; - gint _tmp14__length1 = 0; + gint _tmp0_; + InjectionGroup** _tmp1_; + gint groups_length1; + gint _groups_size_; + InjectionGroup** _tmp2_; + gint _tmp2__length1; + InjectionGroup* _tmp3_; + InjectionGroup** _tmp4_; + gint _tmp4__length1; + InjectionGroup* _tmp5_; + InjectionGroup** _tmp6_; + gint _tmp6__length1; + InjectionGroup* _tmp7_; + InjectionGroup** _tmp8_; + gint _tmp8__length1; + InjectionGroup* _tmp9_; + InjectionGroup** _tmp10_; + gint _tmp10__length1; + InjectionGroup* _tmp11_; + InjectionGroup** _tmp12_; + gint _tmp12__length1; + InjectionGroup* _tmp13_; + InjectionGroup** _tmp14_; + gint _tmp14__length1; #line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2299,24 +2242,24 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page if (result_length1) { #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala" *result_length1 = _tmp14__length1; -#line 2303 "CollectionPage.c" +#line 2246 "CollectionPage.c" } #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = _tmp14_; #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2309 "CollectionPage.c" +#line 2252 "CollectionPage.c" } static gboolean collection_page_selection_has_video (CollectionPage* self) { gboolean result = FALSE; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + GeeList* _tmp2_; + GeeCollection* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; #line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2339,18 +2282,18 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) { result = _tmp5_; #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2343 "CollectionPage.c" +#line 2286 "CollectionPage.c" } static gboolean collection_page_page_has_photo (CollectionPage* self) { gboolean result = FALSE; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; #line 209 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2373,18 +2316,18 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) { result = _tmp5_; #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2377 "CollectionPage.c" +#line 2320 "CollectionPage.c" } static gboolean collection_page_selection_has_photo (CollectionPage* self) { gboolean result = FALSE; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + GeeList* _tmp2_; + GeeCollection* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; #line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2407,14 +2350,14 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) { result = _tmp5_; #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 2411 "CollectionPage.c" +#line 2354 "CollectionPage.c" } static void collection_page_real_init_actions (Page* base, gint selected_count, gint count) { CollectionPage * self; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; #line 217 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2437,68 +2380,68 @@ static void collection_page_real_init_actions (Page* base, gint selected_count, page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE); #line 227 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE); -#line 2441 "CollectionPage.c" +#line 2384 "CollectionPage.c" } static void collection_page_real_update_actions (Page* base, gint selected_count, gint count) { CollectionPage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; - Page* _tmp2_ = NULL; - Page* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + AppWindow* _tmp0_; + AppWindow* _tmp1_; + Page* _tmp2_; + Page* _tmp3_; + gboolean _tmp4_; + gint _tmp5_; + gint _tmp6_; gboolean one_selected = FALSE; - gint _tmp7_ = 0; + gint _tmp7_; gboolean has_selected = FALSE; - gint _tmp8_ = 0; + gint _tmp8_; gboolean primary_is_video = FALSE; - gboolean _tmp9_ = FALSE; + gboolean _tmp9_; gboolean selection_has_videos = FALSE; - gboolean _tmp17_ = FALSE; + gboolean _tmp17_; gboolean page_has_photos = FALSE; - gboolean _tmp18_ = FALSE; + gboolean _tmp18_; gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - gboolean _tmp22_ = FALSE; + gboolean _tmp20_; + gboolean _tmp22_; gboolean _tmp23_ = FALSE; - gboolean _tmp24_ = FALSE; + gboolean _tmp24_; gboolean _tmp30_ = FALSE; gboolean _tmp31_ = FALSE; gboolean _tmp32_ = FALSE; - gboolean _tmp33_ = FALSE; + gboolean _tmp33_; gboolean _tmp47_ = FALSE; - gboolean _tmp48_ = FALSE; + gboolean _tmp48_; gboolean _tmp50_ = FALSE; - gboolean _tmp51_ = FALSE; + gboolean _tmp51_; gboolean _tmp53_ = FALSE; gboolean _tmp54_ = FALSE; - gboolean _tmp55_ = FALSE; + gboolean _tmp55_; gboolean _tmp64_ = FALSE; gboolean _tmp65_ = FALSE; - gboolean _tmp66_ = FALSE; + gboolean _tmp66_; gboolean _tmp69_ = FALSE; - gboolean _tmp70_ = FALSE; + gboolean _tmp70_; gboolean _tmp72_ = FALSE; - gboolean _tmp73_ = FALSE; + gboolean _tmp73_; gboolean _tmp75_ = FALSE; - gboolean _tmp76_ = FALSE; + gboolean _tmp76_; gboolean _tmp78_ = FALSE; - gboolean _tmp79_ = FALSE; - gboolean _tmp81_ = FALSE; - gboolean _tmp82_ = FALSE; - gboolean _tmp83_ = FALSE; - gboolean _tmp84_ = FALSE; + gboolean _tmp79_; + gboolean _tmp81_; + gboolean _tmp82_; + gboolean _tmp83_; + gboolean _tmp84_; gboolean _tmp85_ = FALSE; - gboolean _tmp86_ = FALSE; + gboolean _tmp86_; gboolean _tmp88_ = FALSE; - gboolean _tmp89_ = FALSE; - gboolean _tmp91_ = FALSE; + gboolean _tmp89_; + gboolean _tmp91_; gboolean _tmp92_ = FALSE; - gboolean _tmp93_ = FALSE; - gboolean _tmp95_ = FALSE; + gboolean _tmp93_; + gboolean _tmp95_; #line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2519,7 +2462,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count if (_tmp4_) { #line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 2523 "CollectionPage.c" +#line 2466 "CollectionPage.c" } #line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp5_ = selected_count; @@ -2541,14 +2484,14 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp9_ = has_selected; #line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp9_) { -#line 2545 "CollectionPage.c" - ViewCollection* _tmp10_ = NULL; - ViewCollection* _tmp11_ = NULL; - DataView* _tmp12_ = NULL; - DataView* _tmp13_ = NULL; - DataSource* _tmp14_ = NULL; - DataSource* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; +#line 2488 "CollectionPage.c" + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + DataView* _tmp12_; + DataView* _tmp13_; + DataSource* _tmp14_; + DataSource* _tmp15_; + gboolean _tmp16_; #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2573,7 +2516,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count if (_tmp16_) { #line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala" primary_is_video = TRUE; -#line 2577 "CollectionPage.c" +#line 2520 "CollectionPage.c" } } #line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2588,17 +2531,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp20_ = has_selected; #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp20_) { -#line 2592 "CollectionPage.c" - gboolean _tmp21_ = FALSE; +#line 2535 "CollectionPage.c" + gboolean _tmp21_; #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp21_ = selection_has_videos; #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp19_ = !_tmp21_; -#line 2598 "CollectionPage.c" +#line 2541 "CollectionPage.c" } else { #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp19_ = FALSE; -#line 2602 "CollectionPage.c" +#line 2545 "CollectionPage.c" } #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp19_); @@ -2610,12 +2553,12 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp24_ = one_selected; #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp24_) { -#line 2614 "CollectionPage.c" - ConfigFacade* _tmp25_ = NULL; - ConfigFacade* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; +#line 2557 "CollectionPage.c" + ConfigFacade* _tmp25_; + ConfigFacade* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gboolean _tmp29_; #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp25_ = config_facade_get_instance (); #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2632,11 +2575,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _g_free0 (_tmp28_); #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp26_); -#line 2636 "CollectionPage.c" +#line 2579 "CollectionPage.c" } else { #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp23_ = FALSE; -#line 2640 "CollectionPage.c" +#line 2583 "CollectionPage.c" } #line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp23_); @@ -2644,28 +2587,28 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp33_ = one_selected; #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp33_) { -#line 2648 "CollectionPage.c" - gboolean _tmp34_ = FALSE; +#line 2591 "CollectionPage.c" + gboolean _tmp34_; #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp34_ = primary_is_video; #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp32_ = !_tmp34_; -#line 2654 "CollectionPage.c" +#line 2597 "CollectionPage.c" } else { #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp32_ = FALSE; -#line 2658 "CollectionPage.c" +#line 2601 "CollectionPage.c" } #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp32_) { -#line 2662 "CollectionPage.c" - ViewCollection* _tmp35_ = NULL; - ViewCollection* _tmp36_ = NULL; - DataView* _tmp37_ = NULL; - DataView* _tmp38_ = NULL; - DataSource* _tmp39_ = NULL; - Photo* _tmp40_ = NULL; - PhotoFileFormat _tmp41_ = 0; +#line 2605 "CollectionPage.c" + ViewCollection* _tmp35_; + ViewCollection* _tmp36_; + DataView* _tmp37_; + DataView* _tmp38_; + DataSource* _tmp39_; + Photo* _tmp40_; + PhotoFileFormat _tmp41_; #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2688,20 +2631,20 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _g_object_unref0 (_tmp38_); #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp36_); -#line 2692 "CollectionPage.c" +#line 2635 "CollectionPage.c" } else { #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp31_ = FALSE; -#line 2696 "CollectionPage.c" +#line 2639 "CollectionPage.c" } #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp31_) { -#line 2700 "CollectionPage.c" - ConfigFacade* _tmp42_ = NULL; - ConfigFacade* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gboolean _tmp46_ = FALSE; +#line 2643 "CollectionPage.c" + ConfigFacade* _tmp42_; + ConfigFacade* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + gboolean _tmp46_; #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp42_ = config_facade_get_instance (); #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2718,11 +2661,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _g_free0 (_tmp45_); #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp43_); -#line 2722 "CollectionPage.c" +#line 2665 "CollectionPage.c" } else { #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp30_ = FALSE; -#line 2726 "CollectionPage.c" +#line 2669 "CollectionPage.c" } #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp30_); @@ -2730,17 +2673,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp48_ = selection_has_videos; #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp48_) { -#line 2734 "CollectionPage.c" - gboolean _tmp49_ = FALSE; +#line 2677 "CollectionPage.c" + gboolean _tmp49_; #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp49_ = collection_page_can_revert_selected (self); #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp47_ = _tmp49_; -#line 2740 "CollectionPage.c" +#line 2683 "CollectionPage.c" } else { #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp47_ = FALSE; -#line 2744 "CollectionPage.c" +#line 2687 "CollectionPage.c" } #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp47_); @@ -2748,17 +2691,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp51_ = selection_has_videos; #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp51_) { -#line 2752 "CollectionPage.c" - gboolean _tmp52_ = FALSE; +#line 2695 "CollectionPage.c" + gboolean _tmp52_; #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp52_ = has_selected; #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp50_ = _tmp52_; -#line 2758 "CollectionPage.c" +#line 2701 "CollectionPage.c" } else { #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp50_ = FALSE; -#line 2762 "CollectionPage.c" +#line 2705 "CollectionPage.c" } #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp50_); @@ -2766,28 +2709,28 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp55_ = selection_has_videos; #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp55_) { -#line 2770 "CollectionPage.c" - gboolean _tmp56_ = FALSE; +#line 2713 "CollectionPage.c" + gboolean _tmp56_; #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp56_ = one_selected; #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp54_ = _tmp56_; -#line 2776 "CollectionPage.c" +#line 2719 "CollectionPage.c" } else { #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp54_ = FALSE; -#line 2780 "CollectionPage.c" +#line 2723 "CollectionPage.c" } #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp54_) { -#line 2784 "CollectionPage.c" - ViewCollection* _tmp57_ = NULL; - ViewCollection* _tmp58_ = NULL; - DataView* _tmp59_ = NULL; - DataView* _tmp60_ = NULL; - DataSource* _tmp61_ = NULL; - Photo* _tmp62_ = NULL; - gboolean _tmp63_ = FALSE; +#line 2727 "CollectionPage.c" + ViewCollection* _tmp57_; + ViewCollection* _tmp58_; + DataView* _tmp59_; + DataView* _tmp60_; + DataSource* _tmp61_; + Photo* _tmp62_; + gboolean _tmp63_; #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp57_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -2810,11 +2753,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _g_object_unref0 (_tmp60_); #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp58_); -#line 2814 "CollectionPage.c" +#line 2757 "CollectionPage.c" } else { #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp53_ = FALSE; -#line 2818 "CollectionPage.c" +#line 2761 "CollectionPage.c" } #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp53_); @@ -2822,31 +2765,31 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp66_ = selection_has_videos; #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp66_) { -#line 2826 "CollectionPage.c" - gboolean _tmp67_ = FALSE; +#line 2769 "CollectionPage.c" + gboolean _tmp67_; #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp67_ = has_selected; #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp65_ = _tmp67_; -#line 2832 "CollectionPage.c" +#line 2775 "CollectionPage.c" } else { #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp65_ = FALSE; -#line 2836 "CollectionPage.c" +#line 2779 "CollectionPage.c" } #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp65_) { -#line 2840 "CollectionPage.c" - gboolean _tmp68_ = FALSE; +#line 2783 "CollectionPage.c" + gboolean _tmp68_; #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp68_ = pixel_transformation_bundle_has_copied_color_adjustments (); #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp64_ = _tmp68_; -#line 2846 "CollectionPage.c" +#line 2789 "CollectionPage.c" } else { #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp64_ = FALSE; -#line 2850 "CollectionPage.c" +#line 2793 "CollectionPage.c" } #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp64_); @@ -2854,17 +2797,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp70_ = selection_has_videos; #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp70_) { -#line 2858 "CollectionPage.c" - gboolean _tmp71_ = FALSE; +#line 2801 "CollectionPage.c" + gboolean _tmp71_; #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp71_ = has_selected; #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp69_ = _tmp71_; -#line 2864 "CollectionPage.c" +#line 2807 "CollectionPage.c" } else { #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp69_ = FALSE; -#line 2868 "CollectionPage.c" +#line 2811 "CollectionPage.c" } #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp69_); @@ -2872,17 +2815,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp73_ = selection_has_videos; #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp73_) { -#line 2876 "CollectionPage.c" - gboolean _tmp74_ = FALSE; +#line 2819 "CollectionPage.c" + gboolean _tmp74_; #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp74_ = has_selected; #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp72_ = _tmp74_; -#line 2882 "CollectionPage.c" +#line 2825 "CollectionPage.c" } else { #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp72_ = FALSE; -#line 2886 "CollectionPage.c" +#line 2829 "CollectionPage.c" } #line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp72_); @@ -2890,17 +2833,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp76_ = selection_has_videos; #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp76_) { -#line 2894 "CollectionPage.c" - gboolean _tmp77_ = FALSE; +#line 2837 "CollectionPage.c" + gboolean _tmp77_; #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp77_ = has_selected; #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp75_ = _tmp77_; -#line 2900 "CollectionPage.c" +#line 2843 "CollectionPage.c" } else { #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp75_ = FALSE; -#line 2904 "CollectionPage.c" +#line 2847 "CollectionPage.c" } #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp75_); @@ -2908,17 +2851,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp79_ = selection_has_videos; #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp79_) { -#line 2912 "CollectionPage.c" - gboolean _tmp80_ = FALSE; +#line 2855 "CollectionPage.c" + gboolean _tmp80_; #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp80_ = has_selected; #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp78_ = _tmp80_; -#line 2918 "CollectionPage.c" +#line 2861 "CollectionPage.c" } else { #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp78_ = FALSE; -#line 2922 "CollectionPage.c" +#line 2865 "CollectionPage.c" } #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp78_); @@ -2942,17 +2885,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp86_ = page_has_photos; #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp86_) { -#line 2946 "CollectionPage.c" - gboolean _tmp87_ = FALSE; +#line 2889 "CollectionPage.c" + gboolean _tmp87_; #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp87_ = primary_is_video; #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp85_ = !_tmp87_; -#line 2952 "CollectionPage.c" +#line 2895 "CollectionPage.c" } else { #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp85_ = FALSE; -#line 2956 "CollectionPage.c" +#line 2899 "CollectionPage.c" } #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp85_); @@ -2960,17 +2903,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp89_ = selection_has_videos; #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp89_) { -#line 2964 "CollectionPage.c" - gboolean _tmp90_ = FALSE; +#line 2907 "CollectionPage.c" + gboolean _tmp90_; #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp90_ = has_selected; #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp88_ = _tmp90_; -#line 2970 "CollectionPage.c" +#line 2913 "CollectionPage.c" } else { #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp88_ = FALSE; -#line 2974 "CollectionPage.c" +#line 2917 "CollectionPage.c" } #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp88_); @@ -2982,17 +2925,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp93_ = selection_has_videos; #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp93_) { -#line 2986 "CollectionPage.c" - gboolean _tmp94_ = FALSE; +#line 2929 "CollectionPage.c" + gboolean _tmp94_; #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp94_ = has_selected; #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp92_ = _tmp94_; -#line 2992 "CollectionPage.c" +#line 2935 "CollectionPage.c" } else { #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp92_ = FALSE; -#line 2996 "CollectionPage.c" +#line 2939 "CollectionPage.c" } #line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp92_); @@ -3000,12 +2943,12 @@ static void collection_page_real_update_actions (Page* base, gint selected_count _tmp95_ = has_selected; #line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp95_) { -#line 3004 "CollectionPage.c" +#line 2947 "CollectionPage.c" const gchar* _tmp96_ = NULL; - gboolean _tmp97_ = FALSE; + gboolean _tmp97_; gchar* label = NULL; - gchar* _tmp98_ = NULL; - const gchar* _tmp99_ = NULL; + gchar* _tmp98_; + const gchar* _tmp99_; #line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_debug ("CollectionPage.vala:284: Setting action label for SetBackground..."); #line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3014,11 +2957,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count if (_tmp97_) { #line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp96_ = RESOURCES_SET_BACKGROUND_MENU; -#line 3018 "CollectionPage.c" +#line 2961 "CollectionPage.c" } else { #line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp96_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU; -#line 3022 "CollectionPage.c" +#line 2965 "CollectionPage.c" } #line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp98_ = g_strdup (_tmp96_); @@ -3030,7 +2973,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp99_); #line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_free0 (label); -#line 3034 "CollectionPage.c" +#line 2977 "CollectionPage.c" } } @@ -3040,15 +2983,15 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 3044 "CollectionPage.c" +#line 2987 "CollectionPage.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = altered; #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3067,26 +3010,26 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt _object_it = _tmp5_; #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 3071 "CollectionPage.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 3014 "CollectionPage.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; DataView* view = NULL; - DataObject* _tmp10_ = NULL; - DataView* _tmp11_ = NULL; + DataObject* _tmp10_; + DataView* _tmp11_; gboolean _tmp12_ = FALSE; - DataView* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; + DataView* _tmp13_; + gboolean _tmp14_; LibraryPhoto* photo = NULL; - DataView* _tmp20_ = NULL; - DataSource* _tmp21_ = NULL; - LibraryPhoto* _tmp22_ = NULL; - LibraryPhoto* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - LibraryPhoto* _tmp25_ = NULL; - gboolean _tmp26_ = FALSE; + DataView* _tmp20_; + DataSource* _tmp21_; + LibraryPhoto* _tmp22_; + LibraryPhoto* _tmp23_; + gboolean _tmp24_; + LibraryPhoto* _tmp25_; + gboolean _tmp26_; #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp6_ = _object_it; #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3095,7 +3038,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt if (!_tmp7_) { #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3099 "CollectionPage.c" +#line 3042 "CollectionPage.c" } #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp8_ = _object_it; @@ -3117,13 +3060,13 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt if (!_tmp14_) { #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp12_ = TRUE; -#line 3121 "CollectionPage.c" +#line 3064 "CollectionPage.c" } else { - GeeMap* _tmp15_ = NULL; - DataView* _tmp16_ = NULL; - gpointer _tmp17_ = NULL; - Alteration* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + GeeMap* _tmp15_; + DataView* _tmp16_; + gpointer _tmp17_; + Alteration* _tmp18_; + gboolean _tmp19_; #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = altered; #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3138,7 +3081,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt _tmp12_ = !_tmp19_; #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala" _alteration_unref0 (_tmp18_); -#line 3142 "CollectionPage.c" +#line 3085 "CollectionPage.c" } #line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp12_) { @@ -3148,7 +3091,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt _g_object_unref0 (object); #line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala" continue; -#line 3152 "CollectionPage.c" +#line 3095 "CollectionPage.c" } #line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp20_ = view; @@ -3160,7 +3103,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt if (_tmp22_ == NULL) { #line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp21_); -#line 3164 "CollectionPage.c" +#line 3107 "CollectionPage.c" } #line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala" photo = _tmp22_; @@ -3176,7 +3119,7 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt _g_object_unref0 (object); #line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala" continue; -#line 3180 "CollectionPage.c" +#line 3123 "CollectionPage.c" } #line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp24_ = collection_page_can_revert_selected (self); @@ -3196,20 +3139,20 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt _g_object_unref0 (object); #line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3200 "CollectionPage.c" +#line 3143 "CollectionPage.c" } #line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_object_it); -#line 3204 "CollectionPage.c" +#line 3147 "CollectionPage.c" } } static void collection_page_on_print (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; #line 314 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3224,13 +3167,13 @@ static void collection_page_on_print (CollectionPage* self) { _data_collection_unref0 (_tmp1_); #line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp3_) { -#line 3228 "CollectionPage.c" - PrintManager* _tmp4_ = NULL; - PrintManager* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; +#line 3171 "CollectionPage.c" + PrintManager* _tmp4_; + PrintManager* _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + GeeList* _tmp8_; + GeeCollection* _tmp9_; #line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = print_manager_get_instance (); #line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3251,19 +3194,19 @@ static void collection_page_on_print (CollectionPage* self) { _data_collection_unref0 (_tmp7_); #line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala" _print_manager_unref0 (_tmp5_); -#line 3255 "CollectionPage.c" +#line 3198 "CollectionPage.c" } } static void collection_page_on_external_app_changed (CollectionPage* self) { gint selected_count = 0; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gint _tmp3_; gboolean _tmp4_ = FALSE; - gint _tmp5_ = 0; + gint _tmp5_; #line 321 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3282,11 +3225,11 @@ static void collection_page_on_external_app_changed (CollectionPage* self) { _tmp5_ = selected_count; #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp5_ == 1) { -#line 3286 "CollectionPage.c" - ConfigFacade* _tmp6_ = NULL; - ConfigFacade* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 3229 "CollectionPage.c" + ConfigFacade* _tmp6_; + ConfigFacade* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp6_ = config_facade_get_instance (); #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3301,36 +3244,36 @@ static void collection_page_on_external_app_changed (CollectionPage* self) { _g_free0 (_tmp9_); #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp7_); -#line 3305 "CollectionPage.c" +#line 3248 "CollectionPage.c" } else { #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = FALSE; -#line 3309 "CollectionPage.c" +#line 3252 "CollectionPage.c" } #line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_); -#line 3313 "CollectionPage.c" +#line 3256 "CollectionPage.c" } static void collection_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) { CollectionPage * self; Thumbnail* thumbnail = NULL; - CheckerboardItem* _tmp0_ = NULL; - Thumbnail* _tmp1_ = NULL; - Thumbnail* _tmp2_ = NULL; - MediaSource* _tmp3_ = NULL; - MediaSource* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + CheckerboardItem* _tmp0_; + Thumbnail* _tmp1_; + Thumbnail* _tmp2_; + MediaSource* _tmp3_; + MediaSource* _tmp4_; + gboolean _tmp5_; LibraryPhoto* photo = NULL; - Thumbnail* _tmp6_ = NULL; - MediaSource* _tmp7_ = NULL; - LibraryPhoto* _tmp8_ = NULL; - LibraryPhoto* _tmp9_ = NULL; - LibraryPhoto* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - CheckerboardPageActivator _tmp13_ = 0; + Thumbnail* _tmp6_; + MediaSource* _tmp7_; + LibraryPhoto* _tmp8_; + LibraryPhoto* _tmp9_; + LibraryPhoto* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + CheckerboardPageActivator _tmp13_; #line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3361,7 +3304,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec _g_object_unref0 (thumbnail); #line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3365 "CollectionPage.c" +#line 3308 "CollectionPage.c" } #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp6_ = thumbnail; @@ -3373,7 +3316,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec if (_tmp8_ == NULL) { #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp7_); -#line 3377 "CollectionPage.c" +#line 3320 "CollectionPage.c" } #line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala" photo = _tmp8_; @@ -3387,7 +3330,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec _g_object_unref0 (thumbnail); #line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3391 "CollectionPage.c" +#line 3334 "CollectionPage.c" } #line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = photo; @@ -3403,9 +3346,9 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec _tmp13_ = activator; #line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) { -#line 3407 "CollectionPage.c" - CheckerboardPageKeyboardModifiers _tmp14_ = {0}; - gboolean _tmp15_ = FALSE; +#line 3350 "CollectionPage.c" + CheckerboardPageKeyboardModifiers _tmp14_; + gboolean _tmp15_; #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp14_ = *modifiers; #line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3414,11 +3357,11 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec if (_tmp15_) { #line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_external_edit (self); -#line 3418 "CollectionPage.c" +#line 3361 "CollectionPage.c" } else { - LibraryWindow* _tmp16_ = NULL; - LibraryWindow* _tmp17_ = NULL; - LibraryPhoto* _tmp18_ = NULL; + LibraryWindow* _tmp16_; + LibraryWindow* _tmp17_; + LibraryPhoto* _tmp18_; #line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp16_ = library_window_get_app (); #line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3429,45 +3372,45 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec library_window_switch_to_photo_page (_tmp17_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo)); #line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp17_); -#line 3433 "CollectionPage.c" +#line 3376 "CollectionPage.c" } } else { - CheckerboardPageActivator _tmp19_ = 0; + CheckerboardPageActivator _tmp19_; #line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp19_ = activator; #line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) { -#line 3441 "CollectionPage.c" +#line 3384 "CollectionPage.c" gboolean _tmp20_ = FALSE; - CheckerboardPageKeyboardModifiers _tmp21_ = {0}; - gboolean _tmp22_ = FALSE; + CheckerboardPageKeyboardModifiers _tmp21_; + gboolean _tmp22_; #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp21_ = *modifiers; #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp22_ = _tmp21_.shift_pressed; #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp22_) { -#line 3451 "CollectionPage.c" - CheckerboardPageKeyboardModifiers _tmp23_ = {0}; - gboolean _tmp24_ = FALSE; +#line 3394 "CollectionPage.c" + CheckerboardPageKeyboardModifiers _tmp23_; + gboolean _tmp24_; #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp23_ = *modifiers; #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp24_ = _tmp23_.ctrl_pressed; #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp20_ = !_tmp24_; -#line 3460 "CollectionPage.c" +#line 3403 "CollectionPage.c" } else { #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp20_ = FALSE; -#line 3464 "CollectionPage.c" +#line 3407 "CollectionPage.c" } #line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp20_) { -#line 3468 "CollectionPage.c" - LibraryWindow* _tmp25_ = NULL; - LibraryWindow* _tmp26_ = NULL; - LibraryPhoto* _tmp27_ = NULL; +#line 3411 "CollectionPage.c" + LibraryWindow* _tmp25_; + LibraryWindow* _tmp26_; + LibraryPhoto* _tmp27_; #line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp25_ = library_window_get_app (); #line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3478,7 +3421,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec library_window_switch_to_photo_page (_tmp26_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PHOTO, Photo)); #line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp26_); -#line 3482 "CollectionPage.c" +#line 3425 "CollectionPage.c" } } } @@ -3486,7 +3429,7 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec _g_object_unref0 (photo); #line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (thumbnail); -#line 3490 "CollectionPage.c" +#line 3433 "CollectionPage.c" } @@ -3494,10 +3437,10 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey CollectionPage * self; gboolean result = FALSE; gboolean handled = FALSE; - GdkEventKey* _tmp0_ = NULL; - guint _tmp1_ = 0U; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + GdkEventKey* _tmp0_; + guint _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; GQuark _tmp5_ = 0U; #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala" static GQuark _tmp4_label0 = 0; @@ -3519,9 +3462,9 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey static GQuark _tmp4_label8 = 0; #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala" static GQuark _tmp4_label9 = 0; -#line 3523 "CollectionPage.c" +#line 3466 "CollectionPage.c" gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + gboolean _tmp9_; #line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3542,10 +3485,10 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey if ((((((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Page_Up")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Page_Up"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("Home"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Home"))))) || (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("End"))))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_End"))))) { #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala" switch (0) { -#line 3546 "CollectionPage.c" +#line 3489 "CollectionPage.c" default: { - GdkEventKey* _tmp6_ = NULL; + GdkEventKey* _tmp6_; gboolean _tmp7_ = FALSE; #line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp6_ = event; @@ -3553,46 +3496,46 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp6_, &_tmp7_); #line 375 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3557 "CollectionPage.c" +#line 3500 "CollectionPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) { #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala" switch (0) { -#line 3563 "CollectionPage.c" +#line 3506 "CollectionPage.c" default: { #line 378 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); #line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3570 "CollectionPage.c" +#line 3513 "CollectionPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) { #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala" switch (0) { -#line 3576 "CollectionPage.c" +#line 3519 "CollectionPage.c" default: { #line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise"); #line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3583 "CollectionPage.c" +#line 3526 "CollectionPage.c" } } } else { #line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala" switch (0) { -#line 3589 "CollectionPage.c" +#line 3532 "CollectionPage.c" default: { #line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala" handled = FALSE; #line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3596 "CollectionPage.c" +#line 3539 "CollectionPage.c" } } } @@ -3602,84 +3545,84 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey if (_tmp9_) { #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp8_ = TRUE; -#line 3606 "CollectionPage.c" +#line 3549 "CollectionPage.c" } else { - GdkEventKey* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GdkEventKey* _tmp10_; + gboolean _tmp11_; #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = event; #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp11_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp10_); #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp8_ = _tmp11_; -#line 3616 "CollectionPage.c" +#line 3559 "CollectionPage.c" } #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = _tmp8_; #line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 3622 "CollectionPage.c" +#line 3565 "CollectionPage.c" } static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) { #line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_on_export_completed ((CollectionPage*) self); -#line 3629 "CollectionPage.c" +#line 3572 "CollectionPage.c" } static void collection_page_real_on_export (MediaPage* base) { CollectionPage * self; - ExporterUI* _tmp0_ = NULL; + ExporterUI* _tmp0_; GeeCollection* export_list = NULL; - ViewCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + ViewCollection* _tmp1_; + ViewCollection* _tmp2_; + GeeList* _tmp3_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; + gint _tmp6_; + gint _tmp7_; gboolean has_some_photos = FALSE; - gboolean _tmp8_ = FALSE; + gboolean _tmp8_; gboolean has_some_videos = FALSE; - gboolean _tmp9_ = FALSE; + gboolean _tmp9_; gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; - gboolean _tmp13_ = FALSE; + gboolean _tmp11_; + gboolean _tmp13_; gchar* title = NULL; - gboolean _tmp16_ = FALSE; + gboolean _tmp16_; ExportDialog* export_dialog = NULL; - const gchar* _tmp31_ = NULL; - ExportDialog* _tmp32_ = NULL; - ExportFormatParameters _tmp33_ = {0}; - gboolean _tmp34_ = FALSE; + const gchar* _tmp27_; + ExportDialog* _tmp28_; + ExportFormatParameters _tmp29_ = {0}; + gboolean _tmp30_; ExportFormatParameters export_params = {0}; gint scale = 0; ScaleConstraint constraint = 0; - ExportDialog* _tmp37_ = NULL; - gint _tmp38_ = 0; - ScaleConstraint _tmp39_ = 0; - gboolean _tmp40_ = FALSE; + ExportDialog* _tmp33_; + gint _tmp34_ = 0; + ScaleConstraint _tmp35_ = 0; + gboolean _tmp36_; Scaling scaling = {0}; - ScaleConstraint _tmp41_ = 0; - gint _tmp42_ = 0; - Scaling _tmp43_ = {0}; - GeeCollection* _tmp44_ = NULL; - gint _tmp45_ = 0; - gint _tmp46_ = 0; + ScaleConstraint _tmp37_; + gint _tmp38_; + Scaling _tmp39_ = {0}; + GeeCollection* _tmp40_; + gint _tmp41_; + gint _tmp42_; GFile* export_dir = NULL; - const gchar* _tmp81_ = NULL; - GFile* _tmp82_ = NULL; - GFile* _tmp83_ = NULL; - GeeCollection* _tmp84_ = NULL; - GFile* _tmp85_ = NULL; - Scaling _tmp86_ = {0}; - ExportFormatParameters _tmp87_ = {0}; - Exporter* _tmp88_ = NULL; - Exporter* _tmp89_ = NULL; - ExporterUI* _tmp90_ = NULL; - ExporterUI* _tmp91_ = NULL; + const gchar* _tmp77_; + GFile* _tmp78_; + GFile* _tmp79_; + GeeCollection* _tmp80_; + GFile* _tmp81_; + Scaling _tmp82_; + ExportFormatParameters _tmp83_; + Exporter* _tmp84_; + Exporter* _tmp85_; + ExporterUI* _tmp86_; + ExporterUI* _tmp87_; GError * _inner_error_ = NULL; #line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); @@ -3689,7 +3632,7 @@ static void collection_page_real_on_export (MediaPage* base) { if (_tmp0_ != NULL) { #line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3693 "CollectionPage.c" +#line 3636 "CollectionPage.c" } #line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -3715,7 +3658,7 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3719 "CollectionPage.c" +#line 3662 "CollectionPage.c" } #line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp8_ = collection_page_selection_has_photo (self); @@ -3731,14 +3674,14 @@ static void collection_page_real_on_export (MediaPage* base) { if (_tmp11_) { #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = TRUE; -#line 3735 "CollectionPage.c" +#line 3678 "CollectionPage.c" } else { - gboolean _tmp12_ = FALSE; + gboolean _tmp12_; #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp12_ = has_some_videos; #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = _tmp12_; -#line 3742 "CollectionPage.c" +#line 3685 "CollectionPage.c" } #line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala" _vala_assert (_tmp10_, "has_some_photos || has_some_videos"); @@ -3746,9 +3689,9 @@ static void collection_page_real_on_export (MediaPage* base) { _tmp13_ = has_some_photos; #line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (!_tmp13_) { -#line 3750 "CollectionPage.c" - GeeCollection* _tmp14_ = NULL; - ExporterUI* _tmp15_ = NULL; +#line 3693 "CollectionPage.c" + GeeCollection* _tmp14_; + ExporterUI* _tmp15_; #line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp14_ = export_list; #line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3761,7 +3704,7 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3765 "CollectionPage.c" +#line 3708 "CollectionPage.c" } #line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala" title = NULL; @@ -3769,12 +3712,12 @@ static void collection_page_real_on_export (MediaPage* base) { _tmp16_ = has_some_videos; #line 414 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp16_) { -#line 3773 "CollectionPage.c" +#line 3716 "CollectionPage.c" const gchar* _tmp17_ = NULL; - GeeCollection* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; - gchar* _tmp23_ = NULL; + GeeCollection* _tmp18_; + gint _tmp19_; + gint _tmp20_; + gchar* _tmp21_; #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp18_ = export_list; #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3783,104 +3726,90 @@ static void collection_page_real_on_export (MediaPage* base) { _tmp20_ = _tmp19_; #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp20_ == 1) { -#line 3787 "CollectionPage.c" - const gchar* _tmp21_ = NULL; -#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp21_ = _ ("Export Photo/Video"); #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = _tmp21_; -#line 3793 "CollectionPage.c" + _tmp17_ = _ ("Export Photo/Video"); +#line 3732 "CollectionPage.c" } else { - const gchar* _tmp22_ = NULL; -#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp22_ = _ ("Export Photos/Videos"); #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp17_ = _tmp22_; -#line 3800 "CollectionPage.c" + _tmp17_ = _ ("Export Photos/Videos"); +#line 3736 "CollectionPage.c" } #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp23_ = g_strdup (_tmp17_); + _tmp21_ = g_strdup (_tmp17_); #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_free0 (title); #line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala" - title = _tmp23_; -#line 3808 "CollectionPage.c" + title = _tmp21_; +#line 3744 "CollectionPage.c" } else { - const gchar* _tmp24_ = NULL; - GeeCollection* _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; - gchar* _tmp30_ = NULL; -#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp25_ = export_list; + const gchar* _tmp22_ = NULL; + GeeCollection* _tmp23_; + gint _tmp24_; + gint _tmp25_; + gchar* _tmp26_; #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp26_ = gee_collection_get_size (_tmp25_); + _tmp23_ = export_list; #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp27_ = _tmp26_; + _tmp24_ = gee_collection_get_size (_tmp23_); #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp27_ == 1) { -#line 3823 "CollectionPage.c" - const gchar* _tmp28_ = NULL; + _tmp25_ = _tmp24_; #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp28_ = _ ("Export Photo"); + if (_tmp25_ == 1) { #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = _tmp28_; -#line 3829 "CollectionPage.c" + _tmp22_ = _ ("Export Photo"); +#line 3761 "CollectionPage.c" } else { - const gchar* _tmp29_ = NULL; -#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp29_ = _ ("Export Photos"); #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = _tmp29_; -#line 3836 "CollectionPage.c" + _tmp22_ = _ ("Export Photos"); +#line 3765 "CollectionPage.c" } #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp30_ = g_strdup (_tmp24_); + _tmp26_ = g_strdup (_tmp22_); #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_free0 (title); #line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala" - title = _tmp30_; -#line 3844 "CollectionPage.c" + title = _tmp26_; +#line 3773 "CollectionPage.c" } #line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp31_ = title; + _tmp27_ = title; #line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp32_ = export_dialog_new (_tmp31_); + _tmp28_ = export_dialog_new (_tmp27_); #line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala" - g_object_ref_sink (_tmp32_); + g_object_ref_sink (_tmp28_); #line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_dialog = _tmp32_; + export_dialog = _tmp28_; #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp34_ = has_some_videos; + _tmp30_ = has_some_videos; #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp34_) { -#line 3858 "CollectionPage.c" - ExportFormatParameters _tmp35_ = {0}; + if (_tmp30_) { +#line 3787 "CollectionPage.c" + ExportFormatParameters _tmp31_ = {0}; #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_format_parameters_current (&_tmp35_); + export_format_parameters_current (&_tmp31_); #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp33_ = _tmp35_; -#line 3864 "CollectionPage.c" + _tmp29_ = _tmp31_; +#line 3793 "CollectionPage.c" } else { - ExportFormatParameters _tmp36_ = {0}; + ExportFormatParameters _tmp32_ = {0}; #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_format_parameters_last (&_tmp36_); + export_format_parameters_last (&_tmp32_); #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp33_ = _tmp36_; -#line 3871 "CollectionPage.c" + _tmp29_ = _tmp32_; +#line 3800 "CollectionPage.c" } #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_params = _tmp33_; + export_params = _tmp29_; #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp37_ = export_dialog; + _tmp33_ = export_dialog; #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp40_ = export_dialog_execute (_tmp37_, &_tmp38_, &_tmp39_, &export_params); + _tmp36_ = export_dialog_execute (_tmp33_, &_tmp34_, &_tmp35_, &export_params); #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala" - scale = _tmp38_; + scale = _tmp34_; #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala" - constraint = _tmp39_; + constraint = _tmp35_; #line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp40_) { + if (!_tmp36_) { #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_dialog); #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -3889,111 +3818,111 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 3893 "CollectionPage.c" +#line 3822 "CollectionPage.c" } #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp41_ = constraint; + _tmp37_ = constraint; #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp42_ = scale; + _tmp38_ = scale; #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - scaling_for_constraint (_tmp41_, _tmp42_, FALSE, &_tmp43_); + scaling_for_constraint (_tmp37_, _tmp38_, FALSE, &_tmp39_); #line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala" - scaling = _tmp43_; + scaling = _tmp39_; #line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp44_ = export_list; + _tmp40_ = export_list; #line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp45_ = gee_collection_get_size (_tmp44_); + _tmp41_ = gee_collection_get_size (_tmp40_); #line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp46_ = _tmp45_; + _tmp42_ = _tmp41_; #line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp46_ == 1) { -#line 3911 "CollectionPage.c" + if (_tmp42_ == 1) { +#line 3840 "CollectionPage.c" LibraryPhoto* photo = NULL; GFile* save_as = NULL; - LibraryPhoto* _tmp55_ = NULL; - ExportFormatParameters _tmp56_ = {0}; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - GFile* _tmp59_ = NULL; - GFile* _tmp60_ = NULL; - GFile* _tmp61_ = NULL; + LibraryPhoto* _tmp51_; + ExportFormatParameters _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + GFile* _tmp55_; + GFile* _tmp56_; + GFile* _tmp57_; #line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala" photo = NULL; -#line 3923 "CollectionPage.c" +#line 3852 "CollectionPage.c" { GeeIterator* _p_it = NULL; - GeeCollection* _tmp47_ = NULL; - GeeIterator* _tmp48_ = NULL; + GeeCollection* _tmp43_; + GeeIterator* _tmp44_; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp47_ = export_list; + _tmp43_ = export_list; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp48_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable)); + _tmp44_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable)); #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _p_it = _tmp48_; + _p_it = _tmp44_; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 3936 "CollectionPage.c" - GeeIterator* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; +#line 3865 "CollectionPage.c" + GeeIterator* _tmp45_; + gboolean _tmp46_; LibraryPhoto* p = NULL; - GeeIterator* _tmp51_ = NULL; - gpointer _tmp52_ = NULL; - LibraryPhoto* _tmp53_ = NULL; - LibraryPhoto* _tmp54_ = NULL; + GeeIterator* _tmp47_; + gpointer _tmp48_; + LibraryPhoto* _tmp49_; + LibraryPhoto* _tmp50_; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp49_ = _p_it; + _tmp45_ = _p_it; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp50_ = gee_iterator_next (_tmp49_); + _tmp46_ = gee_iterator_next (_tmp45_); #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (!_tmp50_) { + if (!_tmp46_) { #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3952 "CollectionPage.c" +#line 3881 "CollectionPage.c" } #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp51_ = _p_it; + _tmp47_ = _p_it; #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp52_ = gee_iterator_get (_tmp51_); + _tmp48_ = gee_iterator_get (_tmp47_); #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" - p = (LibraryPhoto*) _tmp52_; + p = (LibraryPhoto*) _tmp48_; #line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp53_ = p; + _tmp49_ = p; #line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp54_ = _g_object_ref0 (_tmp53_); + _tmp50_ = _g_object_ref0 (_tmp49_); #line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo = _tmp54_; + photo = _tmp50_; #line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (p); #line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 3972 "CollectionPage.c" +#line 3901 "CollectionPage.c" } #line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_p_it); -#line 3976 "CollectionPage.c" +#line 3905 "CollectionPage.c" } #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp55_ = photo; + _tmp51_ = photo; #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp56_ = export_params; + _tmp52_ = export_params; #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp57_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo), &_tmp56_); + _tmp53_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo), &_tmp52_); #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp58_ = _tmp57_; + _tmp54_ = _tmp53_; #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp59_ = export_ui_choose_file (_tmp58_); + _tmp55_ = export_ui_choose_file (_tmp54_); #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp60_ = _tmp59_; + _tmp56_ = _tmp55_; #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp54_); #line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala" - save_as = _tmp60_; + save_as = _tmp56_; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp61_ = save_as; + _tmp57_ = save_as; #line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp61_ == NULL) { + if (_tmp57_ == NULL) { #line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (save_as); #line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4006,102 +3935,102 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4010 "CollectionPage.c" +#line 3939 "CollectionPage.c" } { - AppWindow* _tmp62_ = NULL; - AppWindow* _tmp63_ = NULL; - LibraryPhoto* _tmp64_ = NULL; - GFile* _tmp65_ = NULL; - Scaling _tmp66_ = {0}; - ExportFormatParameters _tmp67_ = {0}; - JpegQuality _tmp68_ = 0; - LibraryPhoto* _tmp69_ = NULL; - ExportFormatParameters _tmp70_ = {0}; - PhotoFileFormat _tmp71_ = 0; - ExportFormatParameters _tmp72_ = {0}; - ExportFormatMode _tmp73_ = 0; - ExportFormatParameters _tmp74_ = {0}; - gboolean _tmp75_ = FALSE; - AppWindow* _tmp76_ = NULL; - AppWindow* _tmp77_ = NULL; + AppWindow* _tmp58_; + AppWindow* _tmp59_; + LibraryPhoto* _tmp60_; + GFile* _tmp61_; + Scaling _tmp62_; + ExportFormatParameters _tmp63_; + JpegQuality _tmp64_; + LibraryPhoto* _tmp65_; + ExportFormatParameters _tmp66_; + PhotoFileFormat _tmp67_; + ExportFormatParameters _tmp68_; + ExportFormatMode _tmp69_; + ExportFormatParameters _tmp70_; + gboolean _tmp71_; + AppWindow* _tmp72_; + AppWindow* _tmp73_; #line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp62_ = app_window_get_instance (); + _tmp58_ = app_window_get_instance (); #line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp63_ = _tmp62_; + _tmp59_ = _tmp58_; #line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_PAGE_WINDOW, PageWindow)); #line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp63_); + _g_object_unref0 (_tmp59_); #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp64_ = photo; + _tmp60_ = photo; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp65_ = save_as; + _tmp61_ = save_as; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp66_ = scaling; + _tmp62_ = scaling; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp67_ = export_params; + _tmp63_ = export_params; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp68_ = _tmp67_.quality; + _tmp64_ = _tmp63_.quality; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp69_ = photo; + _tmp65_ = photo; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp70_ = export_params; + _tmp66_ = export_params; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp71_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_PHOTO, Photo), &_tmp70_); + _tmp67_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_PHOTO, Photo), &_tmp66_); #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp72_ = export_params; + _tmp68_ = export_params; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp73_ = _tmp72_.mode; + _tmp69_ = _tmp68_.mode; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp74_ = export_params; + _tmp70_ = export_params; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp75_ = _tmp74_.export_metadata; + _tmp71_ = _tmp70_.export_metadata; #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" - photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PHOTO, Photo), _tmp65_, &_tmp66_, _tmp68_, _tmp71_, _tmp73_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp75_, &_inner_error_); + photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO, Photo), _tmp61_, &_tmp62_, _tmp64_, _tmp67_, _tmp69_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp71_, &_inner_error_); #line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4065 "CollectionPage.c" - goto __catch233_g_error; +#line 3994 "CollectionPage.c" + goto __catch234_g_error; } #line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp76_ = app_window_get_instance (); + _tmp72_ = app_window_get_instance (); #line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp77_ = _tmp76_; + _tmp73_ = _tmp72_; #line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_PAGE_WINDOW, PageWindow)); #line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp77_); -#line 4076 "CollectionPage.c" + _g_object_unref0 (_tmp73_); +#line 4005 "CollectionPage.c" } - goto __finally233; - __catch233_g_error: + goto __finally234; + __catch234_g_error: { GError* err = NULL; - AppWindow* _tmp78_ = NULL; - AppWindow* _tmp79_ = NULL; - GFile* _tmp80_ = NULL; + AppWindow* _tmp74_; + AppWindow* _tmp75_; + GFile* _tmp76_; #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" err = _inner_error_; #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" _inner_error_ = NULL; #line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp78_ = app_window_get_instance (); + _tmp74_ = app_window_get_instance (); #line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp79_ = _tmp78_; + _tmp75_ = _tmp74_; #line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PAGE_WINDOW, PageWindow)); #line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp79_); + _g_object_unref0 (_tmp75_); #line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp80_ = save_as; + _tmp76_ = save_as; #line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_error_dialog (_tmp80_, FALSE); + export_error_dialog (_tmp76_, FALSE); #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_error_free0 (err); -#line 4103 "CollectionPage.c" +#line 4032 "CollectionPage.c" } - __finally233: + __finally234: #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4120,7 +4049,7 @@ static void collection_page_real_on_export (MediaPage* base) { g_clear_error (&_inner_error_); #line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4124 "CollectionPage.c" +#line 4053 "CollectionPage.c" } #line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (save_as); @@ -4134,18 +4063,18 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4138 "CollectionPage.c" +#line 4067 "CollectionPage.c" } #line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp81_ = title; + _tmp77_ = title; #line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp82_ = export_ui_choose_dir (_tmp81_); + _tmp78_ = export_ui_choose_dir (_tmp77_); #line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala" - export_dir = _tmp82_; + export_dir = _tmp78_; #line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp83_ = export_dir; + _tmp79_ = export_dir; #line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala" - if (_tmp83_ == NULL) { + if (_tmp79_ == NULL) { #line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_dir); #line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4156,32 +4085,32 @@ static void collection_page_real_on_export (MediaPage* base) { _g_object_unref0 (export_list); #line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4160 "CollectionPage.c" +#line 4089 "CollectionPage.c" } #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp84_ = export_list; + _tmp80_ = export_list; #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp85_ = export_dir; + _tmp81_ = export_dir; #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp86_ = scaling; + _tmp82_ = scaling; #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp87_ = export_params; + _tmp83_ = export_params; #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp88_ = exporter_new (_tmp84_, _tmp85_, &_tmp86_, &_tmp87_, FALSE); + _tmp84_ = exporter_new (_tmp80_, _tmp81_, &_tmp82_, &_tmp83_, FALSE); #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp89_ = _tmp88_; + _tmp85_ = _tmp84_; #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp90_ = exporter_ui_new (_tmp89_); + _tmp86_ = exporter_ui_new (_tmp85_); #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" _exporter_ui_unref0 (self->priv->exporter); #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - self->priv->exporter = _tmp90_; + self->priv->exporter = _tmp86_; #line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _g_object_unref0 (_tmp89_); + _g_object_unref0 (_tmp85_); #line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp91_ = self->priv->exporter; + _tmp87_ = self->priv->exporter; #line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala" - exporter_ui_export (_tmp91_, _collection_page_on_export_completed_exporter_completion_callback, self); + exporter_ui_export (_tmp87_, _collection_page_on_export_completed_exporter_completion_callback, self); #line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_dir); #line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4190,7 +4119,7 @@ static void collection_page_real_on_export (MediaPage* base) { _g_free0 (title); #line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (export_list); -#line 4194 "CollectionPage.c" +#line 4123 "CollectionPage.c" } @@ -4201,7 +4130,7 @@ static void collection_page_on_export_completed (CollectionPage* self) { _exporter_ui_unref0 (self->priv->exporter); #line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala" self->priv->exporter = NULL; -#line 4205 "CollectionPage.c" +#line 4134 "CollectionPage.c" } @@ -4209,17 +4138,17 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { gboolean result = FALSE; #line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); -#line 4213 "CollectionPage.c" +#line 4142 "CollectionPage.c" { GeeList* _source_list = NULL; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + GeeList* _tmp2_; + GeeList* _tmp3_; gint _source_size = 0; - GeeList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; gint _source_index = 0; #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -4245,19 +4174,19 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { _source_index = -1; #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 4249 "CollectionPage.c" - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; +#line 4178 "CollectionPage.c" + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; DataSource* source = NULL; - GeeList* _tmp10_ = NULL; - gint _tmp11_ = 0; - gpointer _tmp12_ = NULL; + GeeList* _tmp10_; + gint _tmp11_; + gpointer _tmp12_; LibraryPhoto* photo = NULL; - DataSource* _tmp13_ = NULL; - LibraryPhoto* _tmp14_ = NULL; + DataSource* _tmp13_; + LibraryPhoto* _tmp14_; gboolean _tmp15_ = FALSE; - LibraryPhoto* _tmp16_ = NULL; + LibraryPhoto* _tmp16_; #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = _source_index; #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4270,7 +4199,7 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { if (!(_tmp8_ < _tmp9_)) { #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 4274 "CollectionPage.c" +#line 4203 "CollectionPage.c" } #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = _source_list; @@ -4290,10 +4219,10 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { _tmp16_ = photo; #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp16_ != NULL) { -#line 4294 "CollectionPage.c" +#line 4223 "CollectionPage.c" gboolean _tmp17_ = FALSE; - LibraryPhoto* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + LibraryPhoto* _tmp18_; + gboolean _tmp19_; #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp18_ = photo; #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4302,25 +4231,25 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { if (_tmp19_) { #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp17_ = TRUE; -#line 4306 "CollectionPage.c" +#line 4235 "CollectionPage.c" } else { - LibraryPhoto* _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; + LibraryPhoto* _tmp20_; + gboolean _tmp21_; #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp20_ = photo; #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp17_ = _tmp21_; -#line 4316 "CollectionPage.c" +#line 4245 "CollectionPage.c" } #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = _tmp17_; -#line 4320 "CollectionPage.c" +#line 4249 "CollectionPage.c" } else { #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = FALSE; -#line 4324 "CollectionPage.c" +#line 4253 "CollectionPage.c" } #line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp15_) { @@ -4334,23 +4263,23 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) { _g_object_unref0 (_source_list); #line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 4338 "CollectionPage.c" +#line 4267 "CollectionPage.c" } #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (source); -#line 4344 "CollectionPage.c" +#line 4273 "CollectionPage.c" } #line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_source_list); -#line 4348 "CollectionPage.c" +#line 4277 "CollectionPage.c" } #line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = FALSE; #line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 4354 "CollectionPage.c" +#line 4283 "CollectionPage.c" } @@ -4358,17 +4287,17 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se gboolean result = FALSE; #line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE); -#line 4362 "CollectionPage.c" +#line 4291 "CollectionPage.c" { GeeList* _source_list = NULL; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + GeeList* _tmp2_; + GeeList* _tmp3_; gint _source_size = 0; - GeeList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; gint _source_index = 0; #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -4394,19 +4323,19 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se _source_index = -1; #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 4398 "CollectionPage.c" - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; +#line 4327 "CollectionPage.c" + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; DataSource* source = NULL; - GeeList* _tmp10_ = NULL; - gint _tmp11_ = 0; - gpointer _tmp12_ = NULL; + GeeList* _tmp10_; + gint _tmp11_; + gpointer _tmp12_; LibraryPhoto* photo = NULL; - DataSource* _tmp13_ = NULL; - LibraryPhoto* _tmp14_ = NULL; + DataSource* _tmp13_; + LibraryPhoto* _tmp14_; gboolean _tmp15_ = FALSE; - LibraryPhoto* _tmp16_ = NULL; + LibraryPhoto* _tmp16_; #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = _source_index; #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4419,7 +4348,7 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se if (!(_tmp8_ < _tmp9_)) { #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 4423 "CollectionPage.c" +#line 4352 "CollectionPage.c" } #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = _source_list; @@ -4439,20 +4368,20 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se _tmp16_ = photo; #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp16_ != NULL) { -#line 4443 "CollectionPage.c" - LibraryPhoto* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; +#line 4372 "CollectionPage.c" + LibraryPhoto* _tmp17_; + gboolean _tmp18_; #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp17_ = photo; #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = _tmp18_; -#line 4452 "CollectionPage.c" +#line 4381 "CollectionPage.c" } else { #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = FALSE; -#line 4456 "CollectionPage.c" +#line 4385 "CollectionPage.c" } #line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp15_) { @@ -4466,43 +4395,41 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se _g_object_unref0 (_source_list); #line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 4470 "CollectionPage.c" +#line 4399 "CollectionPage.c" } #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (source); -#line 4476 "CollectionPage.c" +#line 4405 "CollectionPage.c" } #line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_source_list); -#line 4480 "CollectionPage.c" +#line 4409 "CollectionPage.c" } #line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala" result = FALSE; #line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 4486 "CollectionPage.c" +#line 4415 "CollectionPage.c" } static void collection_page_on_rotate_clockwise (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; RotateMultipleCommand* command = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - RotateMultipleCommand* _tmp10_ = NULL; - RotateMultipleCommand* _tmp11_ = NULL; - CommandManager* _tmp12_ = NULL; - CommandManager* _tmp13_ = NULL; - RotateMultipleCommand* _tmp14_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp7_; + RotateMultipleCommand* _tmp8_; + RotateMultipleCommand* _tmp9_; + CommandManager* _tmp10_; + CommandManager* _tmp11_; + RotateMultipleCommand* _tmp12_; #line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4519,7 +4446,7 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) { if (_tmp3_) { #line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4523 "CollectionPage.c" +#line 4450 "CollectionPage.c" } #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -4530,40 +4457,36 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) { #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = _tmp6_; #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _ ("Rotating"); -#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _ ("Undoing Rotate"); + _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate")); #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _tmp8_, _tmp9_); -#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp7_); #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp5_); #line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp11_; + command = _tmp9_; #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = command; + _tmp12_ = command; #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); #line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp13_); + _command_manager_unref0 (_tmp11_); #line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4559 "CollectionPage.c" +#line 4482 "CollectionPage.c" } static void collection_page_on_publish (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; #line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4578,11 +4501,11 @@ static void collection_page_on_publish (CollectionPage* self) { _data_collection_unref0 (_tmp1_); #line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp3_) { -#line 4582 "CollectionPage.c" - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; +#line 4505 "CollectionPage.c" + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; + GeeCollection* _tmp7_; #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4597,28 +4520,26 @@ static void collection_page_on_publish (CollectionPage* self) { _g_object_unref0 (_tmp7_); #line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp5_); -#line 4601 "CollectionPage.c" +#line 4524 "CollectionPage.c" } } static void collection_page_on_rotate_counterclockwise (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; RotateMultipleCommand* command = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - RotateMultipleCommand* _tmp10_ = NULL; - RotateMultipleCommand* _tmp11_ = NULL; - CommandManager* _tmp12_ = NULL; - CommandManager* _tmp13_ = NULL; - RotateMultipleCommand* _tmp14_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp7_; + RotateMultipleCommand* _tmp8_; + RotateMultipleCommand* _tmp9_; + CommandManager* _tmp10_; + CommandManager* _tmp11_; + RotateMultipleCommand* _tmp12_; #line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4635,7 +4556,7 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) { if (_tmp3_) { #line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4639 "CollectionPage.c" +#line 4560 "CollectionPage.c" } #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -4646,52 +4567,46 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) { #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = _tmp6_; #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _ ("Rotating"); -#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _ ("Undoing Rotate"); + _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate")); #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _tmp8_, _tmp9_); -#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp7_); #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp5_); #line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp11_; + command = _tmp9_; #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = command; + _tmp12_ = command; #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); #line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp13_); + _command_manager_unref0 (_tmp11_); #line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4675 "CollectionPage.c" +#line 4592 "CollectionPage.c" } static void collection_page_on_flip_horizontally (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; RotateMultipleCommand* command = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - RotateMultipleCommand* _tmp10_ = NULL; - RotateMultipleCommand* _tmp11_ = NULL; - CommandManager* _tmp12_ = NULL; - CommandManager* _tmp13_ = NULL; - RotateMultipleCommand* _tmp14_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp7_; + RotateMultipleCommand* _tmp8_; + RotateMultipleCommand* _tmp9_; + CommandManager* _tmp10_; + CommandManager* _tmp11_; + RotateMultipleCommand* _tmp12_; #line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4708,7 +4623,7 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) { if (_tmp3_) { #line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4712 "CollectionPage.c" +#line 4627 "CollectionPage.c" } #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -4719,52 +4634,46 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) { #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = _tmp6_; #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _ ("Flipping Horizontally"); -#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _ ("Undoing Flip Horizontally"); -#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _tmp8_, _tmp9_); + _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _ ("Flipping Horizontally"), _ ("Undoing Flip Horizontally")); #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp7_); #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp5_); #line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp11_; + command = _tmp9_; #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = command; + _tmp12_ = command; #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); #line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp13_); + _command_manager_unref0 (_tmp11_); #line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4748 "CollectionPage.c" +#line 4659 "CollectionPage.c" } static void collection_page_on_flip_vertically (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; RotateMultipleCommand* command = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - RotateMultipleCommand* _tmp10_ = NULL; - RotateMultipleCommand* _tmp11_ = NULL; - CommandManager* _tmp12_ = NULL; - CommandManager* _tmp13_ = NULL; - RotateMultipleCommand* _tmp14_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp7_; + RotateMultipleCommand* _tmp8_; + RotateMultipleCommand* _tmp9_; + CommandManager* _tmp10_; + CommandManager* _tmp11_; + RotateMultipleCommand* _tmp12_; #line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4781,7 +4690,7 @@ static void collection_page_on_flip_vertically (CollectionPage* self) { if (_tmp3_) { #line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4785 "CollectionPage.c" +#line 4694 "CollectionPage.c" } #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -4792,51 +4701,47 @@ static void collection_page_on_flip_vertically (CollectionPage* self) { #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = _tmp6_; #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp8_ = _ ("Flipping Vertically"); -#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp9_ = _ ("Undoing Flip Vertically"); + _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _ ("Flipping Vertically"), _ ("Undoing Flip Vertically")); #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _tmp8_, _tmp9_); -#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp7_); #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp5_); #line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command = _tmp11_; + command = _tmp9_; #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp14_ = command; + _tmp12_ = command; #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala" - command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); #line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _command_manager_unref0 (_tmp13_); + _command_manager_unref0 (_tmp11_); #line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 4821 "CollectionPage.c" +#line 4726 "CollectionPage.c" } static void collection_page_on_revert (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; RevertMultipleCommand* command = NULL; - ViewCollection* _tmp27_ = NULL; - ViewCollection* _tmp28_ = NULL; - GeeList* _tmp29_ = NULL; - GeeList* _tmp30_ = NULL; - RevertMultipleCommand* _tmp31_ = NULL; - RevertMultipleCommand* _tmp32_ = NULL; - CommandManager* _tmp33_ = NULL; - CommandManager* _tmp34_ = NULL; - RevertMultipleCommand* _tmp35_ = NULL; + ViewCollection* _tmp27_; + ViewCollection* _tmp28_; + GeeList* _tmp29_; + GeeList* _tmp30_; + RevertMultipleCommand* _tmp31_; + RevertMultipleCommand* _tmp32_; + CommandManager* _tmp33_; + CommandManager* _tmp34_; + RevertMultipleCommand* _tmp35_; #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4853,21 +4758,21 @@ static void collection_page_on_revert (CollectionPage* self) { if (_tmp3_) { #line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4857 "CollectionPage.c" +#line 4762 "CollectionPage.c" } #line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = collection_page_can_revert_editable_selected (self); #line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp4_) { -#line 4863 "CollectionPage.c" - AppWindow* _tmp5_ = NULL; - AppWindow* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; - GeeList* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; +#line 4768 "CollectionPage.c" + AppWindow* _tmp5_; + AppWindow* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + GeeList* _tmp9_; + GeeCollection* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp5_ = app_window_get_instance (); #line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4894,18 +4799,18 @@ static void collection_page_on_revert (CollectionPage* self) { if (_tmp12_) { #line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 4898 "CollectionPage.c" +#line 4803 "CollectionPage.c" } { GeeList* _object_list = NULL; - ViewCollection* _tmp13_ = NULL; - ViewCollection* _tmp14_ = NULL; - GeeList* _tmp15_ = NULL; - GeeList* _tmp16_ = NULL; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; + GeeList* _tmp15_; + GeeList* _tmp16_; gint _object_size = 0; - GeeList* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + GeeList* _tmp17_; + gint _tmp18_; + gint _tmp19_; gint _object_index = 0; #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -4931,15 +4836,15 @@ static void collection_page_on_revert (CollectionPage* self) { _object_index = -1; #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 4935 "CollectionPage.c" - gint _tmp20_ = 0; - gint _tmp21_ = 0; - gint _tmp22_ = 0; +#line 4840 "CollectionPage.c" + gint _tmp20_; + gint _tmp21_; + gint _tmp22_; DataObject* object = NULL; - GeeList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gpointer _tmp25_ = NULL; - DataObject* _tmp26_ = NULL; + GeeList* _tmp23_; + gint _tmp24_; + gpointer _tmp25_; + DataObject* _tmp26_; #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp20_ = _object_index; #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -4952,7 +4857,7 @@ static void collection_page_on_revert (CollectionPage* self) { if (!(_tmp21_ < _tmp22_)) { #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 4956 "CollectionPage.c" +#line 4861 "CollectionPage.c" } #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp23_ = _object_list; @@ -4968,11 +4873,11 @@ static void collection_page_on_revert (CollectionPage* self) { photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE); #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (object); -#line 4972 "CollectionPage.c" +#line 4877 "CollectionPage.c" } #line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_object_list); -#line 4976 "CollectionPage.c" +#line 4881 "CollectionPage.c" } } #line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5005,25 +4910,25 @@ static void collection_page_on_revert (CollectionPage* self) { _command_manager_unref0 (_tmp34_); #line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 5009 "CollectionPage.c" +#line 4914 "CollectionPage.c" } void collection_page_on_copy_adjustments (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; Photo* photo = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - DataView* _tmp6_ = NULL; - DataView* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; - Photo* _tmp9_ = NULL; - Photo* _tmp10_ = NULL; - PixelTransformationBundle* _tmp11_ = NULL; - PixelTransformationBundle* _tmp12_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + DataView* _tmp6_; + DataView* _tmp7_; + DataSource* _tmp8_; + Photo* _tmp9_; + Photo* _tmp10_; + PixelTransformationBundle* _tmp11_; + PixelTransformationBundle* _tmp12_; #line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5040,7 +4945,7 @@ void collection_page_on_copy_adjustments (CollectionPage* self) { if (_tmp3_) { #line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5044 "CollectionPage.c" +#line 4949 "CollectionPage.c" } #line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5074,29 +4979,29 @@ void collection_page_on_copy_adjustments (CollectionPage* self) { page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE); #line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); -#line 5078 "CollectionPage.c" +#line 4983 "CollectionPage.c" } void collection_page_on_paste_adjustments (CollectionPage* self) { PixelTransformationBundle* copied_adjustments = NULL; - PixelTransformationBundle* _tmp0_ = NULL; + PixelTransformationBundle* _tmp0_; gboolean _tmp1_ = FALSE; - ViewCollection* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; - gint _tmp4_ = 0; - gboolean _tmp5_ = FALSE; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; + gint _tmp4_; + gboolean _tmp5_; AdjustColorsMultipleCommand* command = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; - GeeList* _tmp9_ = NULL; - GeeList* _tmp10_ = NULL; - PixelTransformationBundle* _tmp11_ = NULL; - AdjustColorsMultipleCommand* _tmp12_ = NULL; - AdjustColorsMultipleCommand* _tmp13_ = NULL; - CommandManager* _tmp14_ = NULL; - CommandManager* _tmp15_ = NULL; - AdjustColorsMultipleCommand* _tmp16_ = NULL; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + GeeList* _tmp9_; + GeeList* _tmp10_; + PixelTransformationBundle* _tmp11_; + AdjustColorsMultipleCommand* _tmp12_; + AdjustColorsMultipleCommand* _tmp13_; + CommandManager* _tmp14_; + CommandManager* _tmp15_; + AdjustColorsMultipleCommand* _tmp16_; #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5117,14 +5022,14 @@ void collection_page_on_paste_adjustments (CollectionPage* self) { if (_tmp5_) { #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = TRUE; -#line 5121 "CollectionPage.c" +#line 5026 "CollectionPage.c" } else { - PixelTransformationBundle* _tmp6_ = NULL; + PixelTransformationBundle* _tmp6_; #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp6_ = copied_adjustments; #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp1_ = _tmp6_ == NULL; -#line 5128 "CollectionPage.c" +#line 5033 "CollectionPage.c" } #line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp1_) { @@ -5132,7 +5037,7 @@ void collection_page_on_paste_adjustments (CollectionPage* self) { _pixel_transformation_bundle_unref0 (copied_adjustments); #line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5136 "CollectionPage.c" +#line 5041 "CollectionPage.c" } #line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5168,25 +5073,25 @@ void collection_page_on_paste_adjustments (CollectionPage* self) { _g_object_unref0 (command); #line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala" _pixel_transformation_bundle_unref0 (copied_adjustments); -#line 5172 "CollectionPage.c" +#line 5077 "CollectionPage.c" } static void collection_page_on_enhance (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; EnhanceMultipleCommand* command = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; - EnhanceMultipleCommand* _tmp8_ = NULL; - EnhanceMultipleCommand* _tmp9_ = NULL; - CommandManager* _tmp10_ = NULL; - CommandManager* _tmp11_ = NULL; - EnhanceMultipleCommand* _tmp12_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp7_; + EnhanceMultipleCommand* _tmp8_; + EnhanceMultipleCommand* _tmp9_; + CommandManager* _tmp10_; + CommandManager* _tmp11_; + EnhanceMultipleCommand* _tmp12_; #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5203,7 +5108,7 @@ static void collection_page_on_enhance (CollectionPage* self) { if (_tmp3_) { #line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5207 "CollectionPage.c" +#line 5112 "CollectionPage.c" } #line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5235,25 +5140,25 @@ static void collection_page_on_enhance (CollectionPage* self) { _command_manager_unref0 (_tmp11_); #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 5239 "CollectionPage.c" +#line 5144 "CollectionPage.c" } static void collection_page_on_duplicate_photo (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; DuplicateMultiplePhotosCommand* command = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; - DuplicateMultiplePhotosCommand* _tmp8_ = NULL; - DuplicateMultiplePhotosCommand* _tmp9_ = NULL; - CommandManager* _tmp10_ = NULL; - CommandManager* _tmp11_ = NULL; - DuplicateMultiplePhotosCommand* _tmp12_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp7_; + DuplicateMultiplePhotosCommand* _tmp8_; + DuplicateMultiplePhotosCommand* _tmp9_; + CommandManager* _tmp10_; + CommandManager* _tmp11_; + DuplicateMultiplePhotosCommand* _tmp12_; #line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5270,7 +5175,7 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) { if (_tmp3_) { #line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5274 "CollectionPage.c" +#line 5179 "CollectionPage.c" } #line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5302,41 +5207,41 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) { _command_manager_unref0 (_tmp11_); #line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 5306 "CollectionPage.c" +#line 5211 "CollectionPage.c" } static void collection_page_on_adjust_date_time (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; gboolean selected_has_videos = FALSE; gboolean only_videos_selected = FALSE; Dateable* photo_source = NULL; - ViewCollection* _tmp21_ = NULL; - ViewCollection* _tmp22_ = NULL; - DataView* _tmp23_ = NULL; - DataView* _tmp24_ = NULL; - DataSource* _tmp25_ = NULL; - Dateable* _tmp26_ = NULL; + ViewCollection* _tmp21_; + ViewCollection* _tmp22_; + DataView* _tmp23_; + DataView* _tmp24_; + DataSource* _tmp25_; + Dateable* _tmp26_; AdjustDateTimeDialog* dialog = NULL; - Dateable* _tmp27_ = NULL; - ViewCollection* _tmp28_ = NULL; - ViewCollection* _tmp29_ = NULL; - gint _tmp30_ = 0; - gboolean _tmp31_ = FALSE; - gboolean _tmp32_ = FALSE; - AdjustDateTimeDialog* _tmp33_ = NULL; - AdjustDateTimeDialog* _tmp34_ = NULL; + Dateable* _tmp27_; + ViewCollection* _tmp28_; + ViewCollection* _tmp29_; + gint _tmp30_; + gboolean _tmp31_; + gboolean _tmp32_; + AdjustDateTimeDialog* _tmp33_; + AdjustDateTimeDialog* _tmp34_; gint64 time_shift = 0LL; gboolean keep_relativity = FALSE; gboolean modify_originals = FALSE; - AdjustDateTimeDialog* _tmp35_ = NULL; + AdjustDateTimeDialog* _tmp35_; gint64 _tmp36_ = 0LL; gboolean _tmp37_ = FALSE; gboolean _tmp38_ = FALSE; - gboolean _tmp39_ = FALSE; + gboolean _tmp39_; #line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5353,23 +5258,23 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) { if (_tmp3_) { #line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5357 "CollectionPage.c" +#line 5262 "CollectionPage.c" } #line 601 "/home/jens/Source/shotwell/src/CollectionPage.vala" selected_has_videos = FALSE; #line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala" only_videos_selected = TRUE; -#line 5363 "CollectionPage.c" +#line 5268 "CollectionPage.c" { GeeList* _dv_list = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp7_; gint _dv_size = 0; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + GeeList* _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _dv_index = 0; #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5395,18 +5300,18 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) { _dv_index = -1; #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala" while (TRUE) { -#line 5399 "CollectionPage.c" - gint _tmp11_ = 0; - gint _tmp12_ = 0; - gint _tmp13_ = 0; +#line 5304 "CollectionPage.c" + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; DataView* dv = NULL; - GeeList* _tmp14_ = NULL; - gint _tmp15_ = 0; - gpointer _tmp16_ = NULL; - DataView* _tmp17_ = NULL; - DataSource* _tmp18_ = NULL; - DataSource* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + GeeList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; + DataView* _tmp17_; + DataSource* _tmp18_; + DataSource* _tmp19_; + gboolean _tmp20_; #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp11_ = _dv_index; #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5419,7 +5324,7 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) { if (!(_tmp12_ < _tmp13_)) { #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala" break; -#line 5423 "CollectionPage.c" +#line 5328 "CollectionPage.c" } #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp14_ = _dv_list; @@ -5443,19 +5348,19 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) { if (_tmp20_) { #line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala" selected_has_videos = TRUE; -#line 5447 "CollectionPage.c" +#line 5352 "CollectionPage.c" } else { #line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala" only_videos_selected = FALSE; -#line 5451 "CollectionPage.c" +#line 5356 "CollectionPage.c" } #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (dv); -#line 5455 "CollectionPage.c" +#line 5360 "CollectionPage.c" } #line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_dv_list); -#line 5459 "CollectionPage.c" +#line 5364 "CollectionPage.c" } #line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5509,20 +5414,20 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) { modify_originals = _tmp38_; #line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp39_) { -#line 5513 "CollectionPage.c" +#line 5418 "CollectionPage.c" AdjustDateTimePhotosCommand* command = NULL; - ViewCollection* _tmp40_ = NULL; - ViewCollection* _tmp41_ = NULL; - GeeList* _tmp42_ = NULL; - GeeList* _tmp43_ = NULL; - gint64 _tmp44_ = 0LL; - gboolean _tmp45_ = FALSE; - gboolean _tmp46_ = FALSE; - AdjustDateTimePhotosCommand* _tmp47_ = NULL; - AdjustDateTimePhotosCommand* _tmp48_ = NULL; - CommandManager* _tmp49_ = NULL; - CommandManager* _tmp50_ = NULL; - AdjustDateTimePhotosCommand* _tmp51_ = NULL; + ViewCollection* _tmp40_; + ViewCollection* _tmp41_; + GeeList* _tmp42_; + GeeList* _tmp43_; + gint64 _tmp44_; + gboolean _tmp45_; + gboolean _tmp46_; + AdjustDateTimePhotosCommand* _tmp47_; + AdjustDateTimePhotosCommand* _tmp48_; + CommandManager* _tmp49_; + CommandManager* _tmp50_; + AdjustDateTimePhotosCommand* _tmp51_; #line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5559,28 +5464,28 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) { _command_manager_unref0 (_tmp50_); #line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (command); -#line 5563 "CollectionPage.c" +#line 5468 "CollectionPage.c" } #line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (dialog); #line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo_source); -#line 5569 "CollectionPage.c" +#line 5474 "CollectionPage.c" } static void collection_page_on_external_edit (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; Photo* photo = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - DataView* _tmp6_ = NULL; - DataView* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; - Photo* _tmp9_ = NULL; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + DataView* _tmp6_; + DataView* _tmp7_; + DataSource* _tmp8_; + Photo* _tmp9_; GError * _inner_error_ = NULL; #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); @@ -5598,7 +5503,7 @@ static void collection_page_on_external_edit (CollectionPage* self) { if (_tmp3_) { #line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5602 "CollectionPage.c" +#line 5507 "CollectionPage.c" } #line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5618,13 +5523,13 @@ static void collection_page_on_external_edit (CollectionPage* self) { _data_collection_unref0 (_tmp5_); #line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala" photo = _tmp9_; -#line 5622 "CollectionPage.c" +#line 5527 "CollectionPage.c" { - AppWindow* _tmp10_ = NULL; - AppWindow* _tmp11_ = NULL; - Photo* _tmp12_ = NULL; - AppWindow* _tmp13_ = NULL; - AppWindow* _tmp14_ = NULL; + AppWindow* _tmp10_; + AppWindow* _tmp11_; + Photo* _tmp12_; + AppWindow* _tmp13_; + AppWindow* _tmp14_; #line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp10_ = app_window_get_instance (); #line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5639,8 +5544,8 @@ static void collection_page_on_external_edit (CollectionPage* self) { photo_open_with_external_editor (_tmp12_, &_inner_error_); #line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5643 "CollectionPage.c" - goto __catch234_g_error; +#line 5548 "CollectionPage.c" + goto __catch235_g_error; } #line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp13_ = app_window_get_instance (); @@ -5650,16 +5555,16 @@ static void collection_page_on_external_edit (CollectionPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow)); #line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp14_); -#line 5654 "CollectionPage.c" +#line 5559 "CollectionPage.c" } - goto __finally234; - __catch234_g_error: + goto __finally235; + __catch235_g_error: { GError* err = NULL; - AppWindow* _tmp15_ = NULL; - AppWindow* _tmp16_ = NULL; - GError* _tmp17_ = NULL; - Photo* _tmp18_ = NULL; + AppWindow* _tmp15_; + AppWindow* _tmp16_; + GError* _tmp17_; + Photo* _tmp18_; #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" err = _inner_error_; #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5680,9 +5585,9 @@ static void collection_page_on_external_edit (CollectionPage* self) { open_external_editor_error_dialog (_tmp17_, _tmp18_); #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_error_free0 (err); -#line 5684 "CollectionPage.c" +#line 5589 "CollectionPage.c" } - __finally234: + __finally235: #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5693,28 +5598,28 @@ static void collection_page_on_external_edit (CollectionPage* self) { g_clear_error (&_inner_error_); #line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5697 "CollectionPage.c" +#line 5602 "CollectionPage.c" } #line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); -#line 5701 "CollectionPage.c" +#line 5606 "CollectionPage.c" } static void collection_page_on_external_edit_raw (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; Photo* photo = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - DataView* _tmp6_ = NULL; - DataView* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; - Photo* _tmp9_ = NULL; - Photo* _tmp10_ = NULL; - PhotoFileFormat _tmp11_ = 0; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + DataView* _tmp6_; + DataView* _tmp7_; + DataSource* _tmp8_; + Photo* _tmp9_; + Photo* _tmp10_; + PhotoFileFormat _tmp11_; GError * _inner_error_ = NULL; #line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); @@ -5732,7 +5637,7 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) { if (_tmp3_) { #line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5736 "CollectionPage.c" +#line 5641 "CollectionPage.c" } #line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5762,14 +5667,14 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) { _g_object_unref0 (photo); #line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5766 "CollectionPage.c" +#line 5671 "CollectionPage.c" } { - AppWindow* _tmp12_ = NULL; - AppWindow* _tmp13_ = NULL; - Photo* _tmp14_ = NULL; - AppWindow* _tmp15_ = NULL; - AppWindow* _tmp16_ = NULL; + AppWindow* _tmp12_; + AppWindow* _tmp13_; + Photo* _tmp14_; + AppWindow* _tmp15_; + AppWindow* _tmp16_; #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp12_ = app_window_get_instance (); #line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5784,8 +5689,8 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) { photo_open_with_raw_external_editor (_tmp14_, &_inner_error_); #line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5788 "CollectionPage.c" - goto __catch235_g_error; +#line 5693 "CollectionPage.c" + goto __catch236_g_error; } #line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = app_window_get_instance (); @@ -5795,17 +5700,17 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow)); #line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp16_); -#line 5799 "CollectionPage.c" +#line 5704 "CollectionPage.c" } - goto __finally235; - __catch235_g_error: + goto __finally236; + __catch236_g_error: { GError* err = NULL; - AppWindow* _tmp17_ = NULL; - AppWindow* _tmp18_ = NULL; - GError* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + AppWindow* _tmp17_; + AppWindow* _tmp18_; + GError* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" err = _inner_error_; #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5830,9 +5735,9 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) { _g_free0 (_tmp21_); #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_error_free0 (err); -#line 5834 "CollectionPage.c" +#line 5739 "CollectionPage.c" } - __finally235: + __finally236: #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5843,27 +5748,27 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) { g_clear_error (&_inner_error_); #line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 5847 "CollectionPage.c" +#line 5752 "CollectionPage.c" } #line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photo); -#line 5851 "CollectionPage.c" +#line 5756 "CollectionPage.c" } void collection_page_on_set_background (CollectionPage* self) { GeeArrayList* photos = NULL; - GeeArrayList* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeArrayList* _tmp5_ = NULL; + GeeArrayList* _tmp0_; + ViewCollection* _tmp1_; + ViewCollection* _tmp2_; + GeeList* _tmp3_; + GeeCollection* _tmp4_; + GeeArrayList* _tmp5_; gboolean desktop = FALSE; gboolean screensaver = FALSE; - GeeArrayList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeArrayList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5894,13 +5799,13 @@ void collection_page_on_set_background (CollectionPage* self) { _tmp8_ = _tmp7_; #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp8_ == 1) { -#line 5898 "CollectionPage.c" +#line 5803 "CollectionPage.c" SetBackgroundPhotoDialog* dialog = NULL; - SetBackgroundPhotoDialog* _tmp9_ = NULL; - SetBackgroundPhotoDialog* _tmp10_ = NULL; + SetBackgroundPhotoDialog* _tmp9_; + SetBackgroundPhotoDialog* _tmp10_; gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; + gboolean _tmp13_; #line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp9_ = set_background_photo_dialog_new (); #line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5917,16 +5822,16 @@ void collection_page_on_set_background (CollectionPage* self) { screensaver = _tmp12_; #line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp13_) { -#line 5921 "CollectionPage.c" - AppWindow* _tmp14_ = NULL; - AppWindow* _tmp15_ = NULL; - GeeArrayList* _tmp16_ = NULL; - gpointer _tmp17_ = NULL; - LibraryPhoto* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - AppWindow* _tmp21_ = NULL; - AppWindow* _tmp22_ = NULL; +#line 5826 "CollectionPage.c" + AppWindow* _tmp14_; + AppWindow* _tmp15_; + GeeArrayList* _tmp16_; + gpointer _tmp17_; + LibraryPhoto* _tmp18_; + gboolean _tmp19_; + gboolean _tmp20_; + AppWindow* _tmp21_; + AppWindow* _tmp22_; #line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp14_ = app_window_get_instance (); #line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5957,15 +5862,15 @@ void collection_page_on_set_background (CollectionPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow)); #line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp22_); -#line 5961 "CollectionPage.c" +#line 5866 "CollectionPage.c" } #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (dialog); -#line 5965 "CollectionPage.c" +#line 5870 "CollectionPage.c" } else { - GeeArrayList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; + GeeArrayList* _tmp23_; + gint _tmp24_; + gint _tmp25_; #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp23_ = photos; #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5974,15 +5879,15 @@ void collection_page_on_set_background (CollectionPage* self) { _tmp25_ = _tmp24_; #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp25_ > 1) { -#line 5978 "CollectionPage.c" +#line 5883 "CollectionPage.c" SetBackgroundSlideshowDialog* dialog = NULL; - SetBackgroundSlideshowDialog* _tmp26_ = NULL; + SetBackgroundSlideshowDialog* _tmp26_; gint delay = 0; - SetBackgroundSlideshowDialog* _tmp27_ = NULL; + SetBackgroundSlideshowDialog* _tmp27_; gint _tmp28_ = 0; gboolean _tmp29_ = FALSE; gboolean _tmp30_ = FALSE; - gboolean _tmp31_ = FALSE; + gboolean _tmp31_; #line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp26_ = set_background_slideshow_dialog_new (); #line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6001,15 +5906,15 @@ void collection_page_on_set_background (CollectionPage* self) { screensaver = _tmp30_; #line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp31_) { -#line 6005 "CollectionPage.c" - AppWindow* _tmp32_ = NULL; - AppWindow* _tmp33_ = NULL; - GeeArrayList* _tmp34_ = NULL; - gint _tmp35_ = 0; - gboolean _tmp36_ = FALSE; - gboolean _tmp37_ = FALSE; - AppWindow* _tmp38_ = NULL; - AppWindow* _tmp39_ = NULL; +#line 5910 "CollectionPage.c" + AppWindow* _tmp32_; + AppWindow* _tmp33_; + GeeArrayList* _tmp34_; + gint _tmp35_; + gboolean _tmp36_; + gboolean _tmp37_; + AppWindow* _tmp38_; + AppWindow* _tmp39_; #line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp32_ = app_window_get_instance (); #line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6036,55 +5941,55 @@ void collection_page_on_set_background (CollectionPage* self) { page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow)); #line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp39_); -#line 6040 "CollectionPage.c" +#line 5945 "CollectionPage.c" } #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (dialog); -#line 6044 "CollectionPage.c" +#line 5949 "CollectionPage.c" } } #line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (photos); -#line 6049 "CollectionPage.c" +#line 5954 "CollectionPage.c" } static void collection_page_on_slideshow (CollectionPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; GeeList* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - gint _tmp7_ = 0; - gboolean _tmp8_ = FALSE; + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + gint _tmp7_; + gboolean _tmp8_; GeeList* sources = NULL; - GeeList* _tmp15_ = NULL; + GeeList* _tmp15_; gboolean _tmp16_ = FALSE; - GeeList* _tmp17_ = NULL; + GeeList* _tmp17_; Thumbnail* thumbnail = NULL; - ViewCollection* _tmp21_ = NULL; - ViewCollection* _tmp22_ = NULL; - GeeList* _tmp23_ = NULL; - gpointer _tmp24_ = NULL; - DataSource* _tmp25_ = NULL; - DataView* _tmp26_ = NULL; - Thumbnail* _tmp27_ = NULL; - Thumbnail* _tmp28_ = NULL; + ViewCollection* _tmp21_; + ViewCollection* _tmp22_; + GeeList* _tmp23_; + gpointer _tmp24_; + DataSource* _tmp25_; + DataView* _tmp26_; + Thumbnail* _tmp27_; + Thumbnail* _tmp28_; LibraryPhoto* photo = NULL; - Thumbnail* _tmp29_ = NULL; - MediaSource* _tmp30_ = NULL; - LibraryPhoto* _tmp31_ = NULL; - LibraryPhoto* _tmp32_ = NULL; - AppWindow* _tmp33_ = NULL; - AppWindow* _tmp34_ = NULL; - LibraryPhotoSourceCollection* _tmp35_ = NULL; - ViewCollection* _tmp36_ = NULL; - ViewCollection* _tmp37_ = NULL; - LibraryPhoto* _tmp38_ = NULL; - SlideshowPage* _tmp39_ = NULL; - SlideshowPage* _tmp40_ = NULL; + Thumbnail* _tmp29_; + MediaSource* _tmp30_; + LibraryPhoto* _tmp31_; + LibraryPhoto* _tmp32_; + AppWindow* _tmp33_; + AppWindow* _tmp34_; + LibraryPhotoSourceCollection* _tmp35_; + ViewCollection* _tmp36_; + ViewCollection* _tmp37_; + LibraryPhoto* _tmp38_; + SlideshowPage* _tmp39_; + SlideshowPage* _tmp40_; #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6101,7 +6006,7 @@ static void collection_page_on_slideshow (CollectionPage* self) { if (_tmp3_) { #line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 6105 "CollectionPage.c" +#line 6010 "CollectionPage.c" } #line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -6115,10 +6020,10 @@ static void collection_page_on_slideshow (CollectionPage* self) { _data_collection_unref0 (_tmp6_); #line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp8_) { -#line 6119 "CollectionPage.c" - ViewCollection* _tmp9_ = NULL; - ViewCollection* _tmp10_ = NULL; - GeeList* _tmp11_ = NULL; +#line 6024 "CollectionPage.c" + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + GeeList* _tmp11_; #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6131,11 +6036,11 @@ static void collection_page_on_slideshow (CollectionPage* self) { _tmp4_ = _tmp11_; #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp10_); -#line 6135 "CollectionPage.c" +#line 6040 "CollectionPage.c" } else { - ViewCollection* _tmp12_ = NULL; - ViewCollection* _tmp13_ = NULL; - GeeList* _tmp14_ = NULL; + ViewCollection* _tmp12_; + ViewCollection* _tmp13_; + GeeList* _tmp14_; #line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6148,7 +6053,7 @@ static void collection_page_on_slideshow (CollectionPage* self) { _tmp4_ = _tmp14_; #line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala" _data_collection_unref0 (_tmp13_); -#line 6152 "CollectionPage.c" +#line 6057 "CollectionPage.c" } #line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp15_ = _g_object_ref0 (_tmp4_); @@ -6160,11 +6065,11 @@ static void collection_page_on_slideshow (CollectionPage* self) { if (_tmp17_ == NULL) { #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp16_ = TRUE; -#line 6164 "CollectionPage.c" +#line 6069 "CollectionPage.c" } else { - GeeList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; + GeeList* _tmp18_; + gint _tmp19_; + gint _tmp20_; #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp18_ = sources; #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6173,7 +6078,7 @@ static void collection_page_on_slideshow (CollectionPage* self) { _tmp20_ = _tmp19_; #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp16_ = _tmp20_ == 0; -#line 6177 "CollectionPage.c" +#line 6082 "CollectionPage.c" } #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp16_) { @@ -6183,7 +6088,7 @@ static void collection_page_on_slideshow (CollectionPage* self) { _g_object_unref0 (_tmp4_); #line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 6187 "CollectionPage.c" +#line 6092 "CollectionPage.c" } #line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -6217,7 +6122,7 @@ static void collection_page_on_slideshow (CollectionPage* self) { _g_object_unref0 (_tmp4_); #line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 6221 "CollectionPage.c" +#line 6126 "CollectionPage.c" } #line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp29_ = thumbnail; @@ -6229,7 +6134,7 @@ static void collection_page_on_slideshow (CollectionPage* self) { if (_tmp31_ == NULL) { #line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp30_); -#line 6233 "CollectionPage.c" +#line 6138 "CollectionPage.c" } #line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala" photo = _tmp31_; @@ -6247,7 +6152,7 @@ static void collection_page_on_slideshow (CollectionPage* self) { _g_object_unref0 (_tmp4_); #line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala" return; -#line 6251 "CollectionPage.c" +#line 6156 "CollectionPage.c" } #line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp33_ = app_window_get_instance (); @@ -6283,7 +6188,7 @@ static void collection_page_on_slideshow (CollectionPage* self) { _g_object_unref0 (sources); #line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala" _g_object_unref0 (_tmp4_); -#line 6287 "CollectionPage.c" +#line 6192 "CollectionPage.c" } @@ -6291,12 +6196,12 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e CollectionPage * self; gboolean result = FALSE; GtkToolButton* rotate_button = NULL; - GtkBuilder* _tmp0_ = NULL; - GObject* _tmp1_ = NULL; - GtkToolButton* _tmp2_ = NULL; - GtkToolButton* _tmp3_ = NULL; - GdkEventKey* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + GtkBuilder* _tmp0_; + GObject* _tmp1_; + GtkToolButton* _tmp2_; + GtkToolButton* _tmp3_; + GdkEventKey* _tmp7_; + gboolean _tmp8_; #line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6311,10 +6216,10 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e _tmp3_ = rotate_button; #line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp3_ != NULL) { -#line 6315 "CollectionPage.c" - GtkToolButton* _tmp4_ = NULL; - GtkToolButton* _tmp5_ = NULL; - GtkToolButton* _tmp6_ = NULL; +#line 6220 "CollectionPage.c" + GtkToolButton* _tmp4_; + GtkToolButton* _tmp5_; + GtkToolButton* _tmp6_; #line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = rotate_button; #line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6327,7 +6232,7 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e _tmp6_ = rotate_button; #line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP); -#line 6331 "CollectionPage.c" +#line 6236 "CollectionPage.c" } #line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = event; @@ -6339,7 +6244,7 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e _g_object_unref0 (rotate_button); #line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 6343 "CollectionPage.c" +#line 6248 "CollectionPage.c" } @@ -6347,12 +6252,12 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* CollectionPage * self; gboolean result = FALSE; GtkToolButton* rotate_button = NULL; - GtkBuilder* _tmp0_ = NULL; - GObject* _tmp1_ = NULL; - GtkToolButton* _tmp2_ = NULL; - GtkToolButton* _tmp3_ = NULL; - GdkEventKey* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + GtkBuilder* _tmp0_; + GObject* _tmp1_; + GtkToolButton* _tmp2_; + GtkToolButton* _tmp3_; + GdkEventKey* _tmp7_; + gboolean _tmp8_; #line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6367,10 +6272,10 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* _tmp3_ = rotate_button; #line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala" if (_tmp3_ != NULL) { -#line 6371 "CollectionPage.c" - GtkToolButton* _tmp4_ = NULL; - GtkToolButton* _tmp5_ = NULL; - GtkToolButton* _tmp6_ = NULL; +#line 6276 "CollectionPage.c" + GtkToolButton* _tmp4_; + GtkToolButton* _tmp5_; + GtkToolButton* _tmp6_; #line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp4_ = rotate_button; #line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6383,7 +6288,7 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* _tmp6_ = rotate_button; #line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP); -#line 6387 "CollectionPage.c" +#line 6292 "CollectionPage.c" } #line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp7_ = event; @@ -6395,22 +6300,22 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* _g_object_unref0 (rotate_button); #line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 6399 "CollectionPage.c" +#line 6304 "CollectionPage.c" } static gpointer _view_filter_ref0 (gpointer self) { #line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala" return self ? view_filter_ref (self) : NULL; -#line 6406 "CollectionPage.c" +#line 6311 "CollectionPage.c" } static SearchViewFilter* collection_page_real_get_search_view_filter (CheckerboardPage* base) { CollectionPage * self; SearchViewFilter* result = NULL; - CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL; - SearchViewFilter* _tmp1_ = NULL; + CollectionPageCollectionSearchViewFilter* _tmp0_; + SearchViewFilter* _tmp1_; #line 728 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage); #line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6421,7 +6326,7 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa result = _tmp1_; #line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 6425 "CollectionPage.c" +#line 6330 "CollectionPage.c" } @@ -6434,7 +6339,7 @@ static guint collection_page_collection_search_view_filter_real_get_criteria (Se result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 24 "/home/jens/Source/shotwell/src/CollectionPage.vala" return result; -#line 6438 "CollectionPage.c" +#line 6343 "CollectionPage.c" } @@ -6444,14 +6349,14 @@ CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view self = (CollectionPageCollectionSearchViewFilter*) default_search_view_filter_construct (object_type); #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" return self; -#line 6448 "CollectionPage.c" +#line 6353 "CollectionPage.c" } CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void) { #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" return collection_page_collection_search_view_filter_construct (COLLECTION_PAGE_TYPE_COLLECTION_SEARCH_VIEW_FILTER); -#line 6455 "CollectionPage.c" +#line 6360 "CollectionPage.c" } @@ -6459,8 +6364,8 @@ static void collection_page_collection_search_view_filter_class_init (Collection #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_collection_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) collection_page_collection_search_view_filter_real_get_criteria; -#line 6464 "CollectionPage.c" + ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) collection_page_collection_search_view_filter_real_get_criteria; +#line 6369 "CollectionPage.c" } @@ -6486,39 +6391,39 @@ static void collection_page_class_init (CollectionPageClass * klass) { #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_type_class_add_private (klass, sizeof (CollectionPagePrivate)); #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->get_toolbar = (GtkToolbar* (*)(Page*)) collection_page_real_get_toolbar; + ((PageClass *) klass)->get_toolbar = (GtkToolbar* (*) (Page *)) collection_page_real_get_toolbar; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) collection_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) collection_page_real_init_collect_ui_filenames; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) collection_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) collection_page_real_add_actions; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) collection_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) collection_page_real_remove_actions; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) collection_page_real_init_collect_injection_groups; + ((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*) (Page *, int*)) collection_page_real_init_collect_injection_groups; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) collection_page_real_init_actions; + ((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) collection_page_real_init_actions; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) collection_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) collection_page_real_update_actions; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) collection_page_real_on_item_activated; + ((CheckerboardPageClass *) klass)->on_item_activated = (void (*) (CheckerboardPage *, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) collection_page_real_on_item_activated; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_app_key_pressed; + ((PageClass *) klass)->on_app_key_pressed = (gboolean (*) (Page *, GdkEventKey*)) collection_page_real_on_app_key_pressed; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((MediaPageClass *) klass)->on_export = (void (*)(MediaPage*)) collection_page_real_on_export; + ((MediaPageClass *) klass)->on_export = (void (*) (MediaPage *)) collection_page_real_on_export; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->on_ctrl_pressed = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_ctrl_pressed; + ((PageClass *) klass)->on_ctrl_pressed = (gboolean (*) (Page *, GdkEventKey*)) collection_page_real_on_ctrl_pressed; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->on_ctrl_released = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_ctrl_released; + ((PageClass *) klass)->on_ctrl_released = (gboolean (*) (Page *, GdkEventKey*)) collection_page_real_on_ctrl_released; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) collection_page_real_get_search_view_filter; + ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) collection_page_real_get_search_view_filter; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" G_OBJECT_CLASS (klass)->finalize = collection_page_finalize; -#line 6517 "CollectionPage.c" +#line 6422 "CollectionPage.c" } static void collection_page_instance_init (CollectionPage * self) { - CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL; + CollectionPageCollectionSearchViewFilter* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" self->priv = COLLECTION_PAGE_GET_PRIVATE (self); #line 29 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6527,11 +6432,11 @@ static void collection_page_instance_init (CollectionPage * self) { _tmp0_ = collection_page_collection_search_view_filter_new (); #line 30 "/home/jens/Source/shotwell/src/CollectionPage.vala" self->priv->search_filter = _tmp0_; -#line 6531 "CollectionPage.c" +#line 6436 "CollectionPage.c" } -static void collection_page_finalize (GObject* obj) { +static void collection_page_finalize (GObject * obj) { CollectionPage * self; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COLLECTION_PAGE, CollectionPage); @@ -6541,7 +6446,7 @@ static void collection_page_finalize (GObject* obj) { _view_filter_unref0 (self->priv->search_filter); #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" G_OBJECT_CLASS (collection_page_parent_class)->finalize (obj); -#line 6545 "CollectionPage.c" +#line 6450 "CollectionPage.c" } -- cgit v1.2.3