diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:25:40 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:25:40 +0100 |
| commit | cd16e7b4a394b6ce885a618d8a96eccd662208bb (patch) | |
| tree | c9bcd713dbea9467783f8d82c63218af91192da1 /src/MediaPage.c | |
| parent | b1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff) | |
| parent | 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff) | |
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'src/MediaPage.c')
| -rw-r--r-- | src/MediaPage.c | 1656 |
1 files changed, 786 insertions, 870 deletions
diff --git a/src/MediaPage.c b/src/MediaPage.c index ef9658a..3cd4e03 100644 --- a/src/MediaPage.c +++ b/src/MediaPage.c @@ -1,4 +1,4 @@ -/* MediaPage.c generated by valac 0.34.2, the Vala compiler +/* MediaPage.c generated by valac 0.32.1, the Vala compiler * generated from MediaPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1174,14 +1174,14 @@ void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, g GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); GAction* page_get_action (Page* self, const gchar* name); -static GVariant* _variant_new19 (gboolean value); -static GVariant* _variant_new20 (gboolean value); -static GVariant* _variant_new21 (gboolean value); -static GVariant* _variant_new22 (gboolean value); -static GVariant* _variant_new23 (gchar* value); -static GVariant* _variant_new24 (const gchar* value); +static GVariant* _variant_new23 (gboolean value); +static GVariant* _variant_new24 (gboolean value); +static GVariant* _variant_new25 (gboolean value); +static GVariant* _variant_new26 (gboolean value); +static GVariant* _variant_new27 (gchar* value); +static GVariant* _variant_new28 (const gchar* value); RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self); -static GVariant* _variant_new25 (const gchar* value); +static GVariant* _variant_new29 (const gchar* value); static void media_page_real_update_actions (Page* base, gint selected_count, gint count); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); gboolean desktop_integration_is_send_to_installed (void); @@ -1395,9 +1395,9 @@ static void media_page_real_set_display_comments (CheckerboardPage* base, gboole static GAction* media_page_sort_by_title_action (MediaPage* self); static GAction* media_page_sort_ascending_action (MediaPage* self); void media_page_set_menu_sort_by (MediaPage* self, gint val); -static GVariant* _variant_new26 (const gchar* value); +static GVariant* _variant_new30 (const gchar* value); void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending); -static GVariant* _variant_new27 (const gchar* value); +static GVariant* _variant_new31 (const gchar* value); gint64 thumbnail_title_ascending_comparator (void* a, void* b); static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self); gint64 thumbnail_title_descending_comparator (void* a, void* b); @@ -2618,49 +2618,49 @@ static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f } -static GVariant* _variant_new19 (gboolean value) { +static GVariant* _variant_new23 (gboolean value) { #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); #line 2625 "MediaPage.c" } -static GVariant* _variant_new20 (gboolean value) { +static GVariant* _variant_new24 (gboolean value) { #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); #line 2632 "MediaPage.c" } -static GVariant* _variant_new21 (gboolean value) { +static GVariant* _variant_new25 (gboolean value) { #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); #line 2639 "MediaPage.c" } -static GVariant* _variant_new22 (gboolean value) { +static GVariant* _variant_new26 (gboolean value) { #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); #line 2646 "MediaPage.c" } -static GVariant* _variant_new23 (gchar* value) { +static GVariant* _variant_new27 (gchar* value) { #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); #line 2653 "MediaPage.c" } -static GVariant* _variant_new24 (const gchar* value) { +static GVariant* _variant_new28 (const gchar* value) { #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); #line 2660 "MediaPage.c" } -static GVariant* _variant_new25 (const gchar* value) { +static GVariant* _variant_new29 (const gchar* value) { #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); #line 2667 "MediaPage.c" @@ -2676,58 +2676,50 @@ static void media_page_real_add_actions (Page* base) { AppWindow* _tmp2_ = NULL; AppWindow* _tmp3_ = NULL; GAction* _tmp4_ = NULL; - GSimpleAction* _tmp5_ = NULL; - GSimpleAction* _tmp6_ = NULL; + GAction* _tmp5_ = NULL; + ConfigFacade* _tmp6_ = NULL; ConfigFacade* _tmp7_ = NULL; - ConfigFacade* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - GVariant* _tmp10_ = NULL; + gboolean _tmp8_ = FALSE; + GVariant* _tmp9_ = NULL; + GAction* _tmp10_ = NULL; GAction* _tmp11_ = NULL; - GSimpleAction* _tmp12_ = NULL; - GSimpleAction* _tmp13_ = NULL; - ConfigFacade* _tmp14_ = NULL; - ConfigFacade* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - GVariant* _tmp17_ = NULL; - GAction* _tmp18_ = NULL; - GSimpleAction* _tmp19_ = NULL; - GSimpleAction* _tmp20_ = NULL; - ConfigFacade* _tmp21_ = NULL; - ConfigFacade* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; - GVariant* _tmp24_ = NULL; - GAction* _tmp25_ = NULL; - GSimpleAction* _tmp26_ = NULL; - GSimpleAction* _tmp27_ = NULL; - ConfigFacade* _tmp28_ = NULL; - ConfigFacade* _tmp29_ = NULL; - gboolean _tmp30_ = FALSE; - GVariant* _tmp31_ = NULL; - GAction* _tmp32_ = NULL; - GSimpleAction* _tmp33_ = NULL; - GSimpleAction* _tmp34_ = NULL; - gint _tmp35_ = 0; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; + ConfigFacade* _tmp12_ = NULL; + ConfigFacade* _tmp13_ = NULL; + gboolean _tmp14_ = FALSE; + GVariant* _tmp15_ = NULL; + GAction* _tmp16_ = NULL; + GAction* _tmp17_ = NULL; + ConfigFacade* _tmp18_ = NULL; + ConfigFacade* _tmp19_ = NULL; + gboolean _tmp20_ = FALSE; + GVariant* _tmp21_ = NULL; + GAction* _tmp22_ = NULL; + GAction* _tmp23_ = NULL; + ConfigFacade* _tmp24_ = NULL; + ConfigFacade* _tmp25_ = NULL; + gboolean _tmp26_ = FALSE; + GVariant* _tmp27_ = NULL; + GAction* _tmp28_ = NULL; + GAction* _tmp29_ = NULL; + gint _tmp30_ = 0; + gchar* _tmp31_ = NULL; + gchar* _tmp32_ = NULL; + GVariant* _tmp33_ = NULL; + const gchar* _tmp34_ = NULL; + gboolean _tmp35_ = FALSE; + GAction* _tmp36_ = NULL; + GAction* _tmp37_ = NULL; GVariant* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - gboolean _tmp40_ = FALSE; - GAction* _tmp41_ = NULL; - GSimpleAction* _tmp42_ = NULL; - GSimpleAction* _tmp43_ = NULL; - GVariant* _tmp44_ = NULL; RawDeveloper d = 0; - ConfigFacade* _tmp45_ = NULL; - ConfigFacade* _tmp46_ = NULL; - RawDeveloper _tmp47_ = 0; - RawDeveloper _tmp48_ = 0; - GSimpleAction* action = NULL; - GAction* _tmp49_ = NULL; - GSimpleAction* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - RawDeveloper _tmp52_ = 0; - GSimpleAction* _tmp53_ = NULL; - GVariant* _tmp54_ = NULL; + ConfigFacade* _tmp39_ = NULL; + ConfigFacade* _tmp40_ = NULL; + RawDeveloper _tmp41_ = 0; + RawDeveloper _tmp42_ = 0; + const gchar* _tmp43_ = NULL; + RawDeveloper _tmp44_ = 0; + GAction* _tmp45_ = NULL; + GAction* _tmp46_ = NULL; + GVariant* _tmp47_ = NULL; #line 324 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); #line 325 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -2749,222 +2741,164 @@ static void media_page_real_add_actions (Page* base) { #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle"); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp4_) : NULL; -#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp5_ == NULL) { -#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp4_); -#line 2758 "MediaPage.c" - } -#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp7_ = config_facade_get_instance (); + _tmp6_ = config_facade_get_instance (); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp9_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp8_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp10_ = _variant_new19 (_tmp9_); + _tmp9_ = _variant_new23 (_tmp8_); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp6_, _tmp10_); + g_action_change_state (_tmp5_, _tmp9_); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp10_); + _g_variant_unref0 (_tmp9_); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp6_); -#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp11_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); + _g_object_unref0 (_tmp5_); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp11_) : NULL; + _tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp12_ == NULL) { + _tmp11_ = _tmp10_; #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp11_); -#line 2786 "MediaPage.c" - } + _tmp12_ = config_facade_get_instance (); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp13_ = _tmp12_; #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp14_ = config_facade_get_instance (); -#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp15_ = _tmp14_; -#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp16_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp14_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp17_ = _variant_new20 (_tmp16_); + _tmp15_ = _variant_new24 (_tmp14_); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp13_, _tmp17_); + g_action_change_state (_tmp11_, _tmp15_); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp17_); -#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp15_); + _g_variant_unref0 (_tmp15_); #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp13_); +#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala" + _g_object_unref0 (_tmp11_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp18_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings"); -#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp18_) : NULL; -#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp19_ == NULL) { -#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp18_); -#line 2814 "MediaPage.c" - } + _tmp16_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings"); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp21_ = config_facade_get_instance (); + _tmp18_ = config_facade_get_instance (); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp22_ = _tmp21_; + _tmp19_ = _tmp18_; #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp23_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp20_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp24_ = _variant_new21 (_tmp23_); + _tmp21_ = _variant_new25 (_tmp20_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp20_, _tmp24_); + g_action_change_state (_tmp17_, _tmp21_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp24_); + _g_variant_unref0 (_tmp21_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp19_); #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp20_); -#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp25_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags"); -#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp26_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp25_) : NULL; -#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp26_ == NULL) { + _g_object_unref0 (_tmp17_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp25_); -#line 2842 "MediaPage.c" - } + _tmp22_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags"); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp27_ = _tmp26_; + _tmp23_ = _tmp22_; #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp28_ = config_facade_get_instance (); + _tmp24_ = config_facade_get_instance (); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp30_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp26_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp31_ = _variant_new22 (_tmp30_); + _tmp27_ = _variant_new26 (_tmp26_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp27_, _tmp31_); + g_action_change_state (_tmp23_, _tmp27_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp31_); + _g_variant_unref0 (_tmp27_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp25_); #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp27_); -#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp32_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy"); -#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp33_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp32_) : NULL; -#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp33_ == NULL) { + _g_object_unref0 (_tmp23_); #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp32_); -#line 2870 "MediaPage.c" - } + _tmp28_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy"); #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp34_ = _tmp33_; + _tmp29_ = _tmp28_; #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp35_ = sort_by; + _tmp30_ = sort_by; #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp36_ = g_strdup_printf ("%d", _tmp35_); + _tmp31_ = g_strdup_printf ("%d", _tmp30_); #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp38_ = _variant_new23 (_tmp37_); + _tmp33_ = _variant_new27 (_tmp32_); #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp34_, _tmp38_); + g_action_change_state (_tmp29_, _tmp33_); #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp38_); + _g_variant_unref0 (_tmp33_); #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp32_); #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp34_); + _g_object_unref0 (_tmp29_); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp40_ = sort_order; + _tmp35_ = sort_order; #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp40_) { + if (_tmp35_) { #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp39_ = "'ascending'"; -#line 2896 "MediaPage.c" + _tmp34_ = "ascending"; +#line 2848 "MediaPage.c" } else { #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp39_ = "'descending'"; -#line 2900 "MediaPage.c" + _tmp34_ = "descending"; +#line 2852 "MediaPage.c" } #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp41_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort"); -#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp42_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp41_) : NULL; -#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp42_ == NULL) { + _tmp36_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort"); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp41_); -#line 2910 "MediaPage.c" - } -#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp43_ = _tmp42_; + _tmp37_ = _tmp36_; #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp44_ = _variant_new24 (_tmp39_); + _tmp38_ = _variant_new28 (_tmp34_); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp43_, _tmp44_); + g_action_change_state (_tmp37_, _tmp38_); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp44_); + _g_variant_unref0 (_tmp38_); #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp43_); -#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp45_ = config_facade_get_instance (); -#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp46_ = _tmp45_; -#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp47_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp48_ = _tmp47_; -#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp46_); -#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala" - d = _tmp48_; + _g_object_unref0 (_tmp37_); #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp49_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); + _tmp39_ = config_facade_get_instance (); #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp50_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp49_) : NULL; + _tmp40_ = _tmp39_; #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp50_ == NULL) { + _tmp41_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp49_); -#line 2942 "MediaPage.c" - } + _tmp42_ = _tmp41_; #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" - action = _tmp50_; + _g_object_unref0 (_tmp40_); +#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala" + d = _tmp42_; #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp52_ = d; + _tmp44_ = d; #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp52_ == RAW_DEVELOPER_SHOTWELL) { + if (_tmp44_ == RAW_DEVELOPER_SHOTWELL) { #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp51_ = "'Shotwell'"; -#line 2952 "MediaPage.c" + _tmp43_ = "Shotwell"; +#line 2884 "MediaPage.c" } else { #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp51_ = "'Camera'"; -#line 2956 "MediaPage.c" + _tmp43_ = "Camera"; +#line 2888 "MediaPage.c" } #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp53_ = action; + _tmp45_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper"); #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp54_ = _variant_new25 (_tmp51_); + _tmp46_ = _tmp45_; #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp53_, _tmp54_); + _tmp47_ = _variant_new29 (_tmp43_); #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp54_); -#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (action); -#line 2968 "MediaPage.c" + g_action_change_state (_tmp46_, _tmp47_); +#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" + _g_variant_unref0 (_tmp47_); +#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala" + _g_object_unref0 (_tmp46_); +#line 2902 "MediaPage.c" } @@ -3030,17 +2964,17 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin _tmp11_ = desktop_integration_is_send_to_installed (); #line 352 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp11_) { -#line 3034 "MediaPage.c" +#line 2968 "MediaPage.c" gint _tmp12_ = 0; #line 353 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp12_ = selected_count; #line 353 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp12_ > 0); -#line 3040 "MediaPage.c" +#line 2974 "MediaPage.c" } else { #line 355 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", FALSE); -#line 3044 "MediaPage.c" +#line 2978 "MediaPage.c" } #line 357 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp13_ = selected_count; @@ -3054,7 +2988,7 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin _tmp15_ = selected_count; #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp15_ == 1) { -#line 3058 "MediaPage.c" +#line 2992 "MediaPage.c" ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; DataSource* _tmp18_ = NULL; @@ -3073,11 +3007,11 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin _g_object_unref0 (_tmp19_); #line 363 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp17_); -#line 3077 "MediaPage.c" +#line 3011 "MediaPage.c" } else { #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp14_ = FALSE; -#line 3081 "MediaPage.c" +#line 3015 "MediaPage.c" } #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp14_); @@ -3091,7 +3025,7 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin _tmp22_ = count; #line 367 "/home/jens/Source/shotwell/src/MediaPage.vala" PAGE_CLASS (media_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp21_, _tmp22_); -#line 3095 "MediaPage.c" +#line 3029 "MediaPage.c" } @@ -3100,7 +3034,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 370 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 3104 "MediaPage.c" +#line 3038 "MediaPage.c" { GeeIterator* _object_it = NULL; GeeMap* _tmp0_ = NULL; @@ -3127,7 +3061,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) { _object_it = _tmp5_; #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3131 "MediaPage.c" +#line 3065 "MediaPage.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; DataObject* object = NULL; @@ -3147,7 +3081,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) { if (!_tmp7_) { #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3151 "MediaPage.c" +#line 3085 "MediaPage.c" } #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp8_ = _object_it; @@ -3171,7 +3105,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) { _alteration_unref0 (_tmp13_); #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp15_) { -#line 3175 "MediaPage.c" +#line 3109 "MediaPage.c" ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; gint _tmp18_ = 0; @@ -3189,15 +3123,15 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) { _g_object_unref0 (object); #line 375 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3193 "MediaPage.c" +#line 3127 "MediaPage.c" } #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (object); -#line 3197 "MediaPage.c" +#line 3131 "MediaPage.c" } #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_object_it); -#line 3201 "MediaPage.c" +#line 3135 "MediaPage.c" } } @@ -3250,7 +3184,7 @@ static void media_page_update_rating_sensitivities (MediaPage* self) { _tmp8_ = media_page_can_decrease_selected_rating (self); #line 389 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp8_); -#line 3254 "MediaPage.c" +#line 3188 "MediaPage.c" } @@ -3290,11 +3224,11 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", FALSE); #line 395 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 3294 "MediaPage.c" +#line 3228 "MediaPage.c" } #line 399 "/home/jens/Source/shotwell/src/MediaPage.vala" is_raw = FALSE; -#line 3298 "MediaPage.c" +#line 3232 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp7_ = NULL; @@ -3330,7 +3264,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self _view_index = -1; #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3334 "MediaPage.c" +#line 3268 "MediaPage.c" gint _tmp14_ = 0; gint _tmp15_ = 0; gint _tmp16_ = 0; @@ -3356,7 +3290,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self if (!(_tmp15_ < _tmp16_)) { #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3360 "MediaPage.c" +#line 3294 "MediaPage.c" } #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp17_ = _view_list; @@ -3376,7 +3310,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self if (_tmp22_ == NULL) { #line 401 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp21_); -#line 3380 "MediaPage.c" +#line 3314 "MediaPage.c" } #line 401 "/home/jens/Source/shotwell/src/MediaPage.vala" photo = _tmp22_; @@ -3384,7 +3318,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self _tmp24_ = photo; #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp24_ != NULL) { -#line 3388 "MediaPage.c" +#line 3322 "MediaPage.c" Photo* _tmp25_ = NULL; PhotoFileFormat _tmp26_ = 0; #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -3393,11 +3327,11 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self _tmp26_ = photo_get_master_file_format (_tmp25_); #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp23_ = _tmp26_ == PHOTO_FILE_FORMAT_RAW; -#line 3397 "MediaPage.c" +#line 3331 "MediaPage.c" } else { #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp23_ = FALSE; -#line 3401 "MediaPage.c" +#line 3335 "MediaPage.c" } #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp23_) { @@ -3409,23 +3343,23 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self _g_object_unref0 (view); #line 405 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3413 "MediaPage.c" +#line 3347 "MediaPage.c" } #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (photo); #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 3419 "MediaPage.c" +#line 3353 "MediaPage.c" } #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 3423 "MediaPage.c" +#line 3357 "MediaPage.c" } #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp27_ = is_raw; #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp27_); -#line 3429 "MediaPage.c" +#line 3363 "MediaPage.c" } @@ -3437,14 +3371,14 @@ static void media_page_update_flag_action (MediaPage* self, gint selected_count) _tmp0_ = selected_count; #line 414 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_ > 0); -#line 3441 "MediaPage.c" +#line 3375 "MediaPage.c" } static gpointer _core_tracker_ref0 (gpointer self) { #line 418 "/home/jens/Source/shotwell/src/MediaPage.vala" return self ? core_tracker_ref (self) : NULL; -#line 3448 "MediaPage.c" +#line 3382 "MediaPage.c" } @@ -3463,7 +3397,7 @@ static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base result = _tmp1_; #line 418 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3467 "MediaPage.c" +#line 3401 "MediaPage.c" } @@ -3515,7 +3449,7 @@ void media_page_set_display_ratings (MediaPage* self, gboolean display) { _tmp8_ = display; #line 426 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", _tmp8_); -#line 3519 "MediaPage.c" +#line 3453 "MediaPage.c" } @@ -3523,7 +3457,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { gboolean result = FALSE; #line 429 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE); -#line 3527 "MediaPage.c" +#line 3461 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp0_ = NULL; @@ -3559,7 +3493,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { _view_index = -1; #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3563 "MediaPage.c" +#line 3497 "MediaPage.c" gint _tmp7_ = 0; gint _tmp8_ = 0; gint _tmp9_ = 0; @@ -3585,7 +3519,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { if (!(_tmp8_ < _tmp9_)) { #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3589 "MediaPage.c" +#line 3523 "MediaPage.c" } #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = _view_list; @@ -3619,21 +3553,21 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) { _g_object_unref0 (_view_list); #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3623 "MediaPage.c" +#line 3557 "MediaPage.c" } #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 3627 "MediaPage.c" +#line 3561 "MediaPage.c" } #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 3631 "MediaPage.c" +#line 3565 "MediaPage.c" } #line 435 "/home/jens/Source/shotwell/src/MediaPage.vala" result = FALSE; #line 435 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3637 "MediaPage.c" +#line 3571 "MediaPage.c" } @@ -3641,7 +3575,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { gboolean result = FALSE; #line 438 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE); -#line 3645 "MediaPage.c" +#line 3579 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp0_ = NULL; @@ -3677,7 +3611,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { _view_index = -1; #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3681 "MediaPage.c" +#line 3615 "MediaPage.c" gint _tmp7_ = 0; gint _tmp8_ = 0; gint _tmp9_ = 0; @@ -3703,7 +3637,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { if (!(_tmp8_ < _tmp9_)) { #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3707 "MediaPage.c" +#line 3641 "MediaPage.c" } #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = _view_list; @@ -3737,21 +3671,21 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) { _g_object_unref0 (_view_list); #line 441 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3741 "MediaPage.c" +#line 3675 "MediaPage.c" } #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 3745 "MediaPage.c" +#line 3679 "MediaPage.c" } #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 3749 "MediaPage.c" +#line 3683 "MediaPage.c" } #line 444 "/home/jens/Source/shotwell/src/MediaPage.vala" result = FALSE; #line 444 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3755 "MediaPage.c" +#line 3689 "MediaPage.c" } @@ -3759,7 +3693,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { gboolean result = FALSE; #line 447 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE); -#line 3763 "MediaPage.c" +#line 3697 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp0_ = NULL; @@ -3795,7 +3729,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { _view_index = -1; #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 3799 "MediaPage.c" +#line 3733 "MediaPage.c" gint _tmp7_ = 0; gint _tmp8_ = 0; gint _tmp9_ = 0; @@ -3821,7 +3755,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { if (!(_tmp8_ < _tmp9_)) { #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 3825 "MediaPage.c" +#line 3759 "MediaPage.c" } #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = _view_list; @@ -3855,21 +3789,21 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) { _g_object_unref0 (_view_list); #line 450 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3859 "MediaPage.c" +#line 3793 "MediaPage.c" } #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 3863 "MediaPage.c" +#line 3797 "MediaPage.c" } #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 3867 "MediaPage.c" +#line 3801 "MediaPage.c" } #line 453 "/home/jens/Source/shotwell/src/MediaPage.vala" result = FALSE; #line 453 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3873 "MediaPage.c" +#line 3807 "MediaPage.c" } @@ -3886,7 +3820,7 @@ MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* result = _tmp0_; #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3890 "MediaPage.c" +#line 3824 "MediaPage.c" } @@ -3911,7 +3845,7 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev result = TRUE; #line 463 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3915 "MediaPage.c" +#line 3849 "MediaPage.c" } else { GdkEventScroll* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; @@ -3923,7 +3857,7 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev result = _tmp3_; #line 465 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3927 "MediaPage.c" +#line 3861 "MediaPage.c" } } @@ -3949,7 +3883,7 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll* result = TRUE; #line 472 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3953 "MediaPage.c" +#line 3887 "MediaPage.c" } else { GdkEventScroll* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; @@ -3961,7 +3895,7 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll* result = _tmp3_; #line 474 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 3965 "MediaPage.c" +#line 3899 "MediaPage.c" } } @@ -3987,7 +3921,7 @@ static void media_page_on_send_to (MediaPage* self) { _g_object_unref0 (_tmp3_); #line 479 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); -#line 3991 "MediaPage.c" +#line 3925 "MediaPage.c" } @@ -4022,7 +3956,7 @@ void media_page_on_play_video (MediaPage* self) { if (_tmp3_) { #line 484 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4026 "MediaPage.c" +#line 3960 "MediaPage.c" } #line 486 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -4040,7 +3974,7 @@ void media_page_on_play_video (MediaPage* self) { if (_tmp9_ == NULL) { #line 486 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp8_); -#line 4044 "MediaPage.c" +#line 3978 "MediaPage.c" } #line 486 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = _tmp9_; @@ -4058,7 +3992,7 @@ void media_page_on_play_video (MediaPage* self) { _g_object_unref0 (video); #line 488 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4062 "MediaPage.c" +#line 3996 "MediaPage.c" } { Video* _tmp12_ = NULL; @@ -4084,12 +4018,12 @@ void media_page_on_play_video (MediaPage* self) { _g_object_unref0 (_tmp14_); #line 491 "/home/jens/Source/shotwell/src/MediaPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4088 "MediaPage.c" - goto __catch558_g_error; +#line 4022 "MediaPage.c" + goto __catch556_g_error; } } - goto __finally558; - __catch558_g_error: + goto __finally556; + __catch556_g_error: { GError* e = NULL; const gchar* _tmp17_ = NULL; @@ -4117,9 +4051,9 @@ void media_page_on_play_video (MediaPage* self) { _g_free0 (_tmp21_); #line 490 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_error_free0 (e); -#line 4121 "MediaPage.c" +#line 4055 "MediaPage.c" } - __finally558: + __finally556: #line 490 "/home/jens/Source/shotwell/src/MediaPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 490 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4130,11 +4064,11 @@ void media_page_on_play_video (MediaPage* self) { g_clear_error (&_inner_error_); #line 490 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4134 "MediaPage.c" +#line 4068 "MediaPage.c" } #line 482 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (video); -#line 4138 "MediaPage.c" +#line 4072 "MediaPage.c" } @@ -4195,7 +4129,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve static GQuark _tmp4_label22 = 0; #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" static GQuark _tmp4_label23 = 0; -#line 4199 "MediaPage.c" +#line 4133 "MediaPage.c" gboolean _tmp30_ = FALSE; gboolean _tmp31_ = FALSE; #line 498 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4218,150 +4152,150 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4222 "MediaPage.c" +#line 4156 "MediaPage.c" default: { #line 504 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize"); #line 505 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4229 "MediaPage.c" +#line 4163 "MediaPage.c" } } } else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4235 "MediaPage.c" +#line 4169 "MediaPage.c" default: { #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize"); #line 511 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4242 "MediaPage.c" +#line 4176 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("period")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4248 "MediaPage.c" +#line 4182 "MediaPage.c" default: { #line 514 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating"); #line 515 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4255 "MediaPage.c" +#line 4189 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("comma")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4261 "MediaPage.c" +#line 4195 "MediaPage.c" default: { #line 518 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating"); #line 519 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4268 "MediaPage.c" +#line 4202 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4274 "MediaPage.c" +#line 4208 "MediaPage.c" default: { #line 522 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne"); #line 523 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4281 "MediaPage.c" +#line 4215 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4287 "MediaPage.c" +#line 4221 "MediaPage.c" default: { #line 526 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo"); #line 527 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4294 "MediaPage.c" +#line 4228 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4300 "MediaPage.c" +#line 4234 "MediaPage.c" default: { #line 530 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree"); #line 531 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4307 "MediaPage.c" +#line 4241 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4313 "MediaPage.c" +#line 4247 "MediaPage.c" default: { #line 534 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour"); #line 535 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4320 "MediaPage.c" +#line 4254 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4326 "MediaPage.c" +#line 4260 "MediaPage.c" default: { #line 538 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive"); #line 539 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4333 "MediaPage.c" +#line 4267 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4339 "MediaPage.c" +#line 4273 "MediaPage.c" default: { #line 542 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated"); #line 543 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4346 "MediaPage.c" +#line 4280 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4352 "MediaPage.c" +#line 4286 "MediaPage.c" default: { #line 546 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected"); #line 547 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4359 "MediaPage.c" +#line 4293 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("exclam")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4365 "MediaPage.c" +#line 4299 "MediaPage.c" default: { gboolean _tmp6_ = FALSE; @@ -4369,7 +4303,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 550 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp6_) { -#line 4373 "MediaPage.c" +#line 4307 "MediaPage.c" SearchViewFilter* _tmp7_ = NULL; SearchViewFilter* _tmp8_ = NULL; #line 551 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4380,17 +4314,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve search_view_filter_set_rating_filter (_tmp8_, RATING_FILTER_ONE_OR_HIGHER); #line 551 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_filter_unref0 (_tmp8_); -#line 4384 "MediaPage.c" +#line 4318 "MediaPage.c" } #line 552 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4388 "MediaPage.c" +#line 4322 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label16) ? _tmp4_label16 : (_tmp4_label16 = g_quark_from_static_string ("at")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4394 "MediaPage.c" +#line 4328 "MediaPage.c" default: { gboolean _tmp9_ = FALSE; @@ -4398,7 +4332,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp9_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 555 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp9_) { -#line 4402 "MediaPage.c" +#line 4336 "MediaPage.c" SearchViewFilter* _tmp10_ = NULL; SearchViewFilter* _tmp11_ = NULL; #line 556 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4409,17 +4343,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve search_view_filter_set_rating_filter (_tmp11_, RATING_FILTER_TWO_OR_HIGHER); #line 556 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_filter_unref0 (_tmp11_); -#line 4413 "MediaPage.c" +#line 4347 "MediaPage.c" } #line 557 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4417 "MediaPage.c" +#line 4351 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label17) ? _tmp4_label17 : (_tmp4_label17 = g_quark_from_static_string ("numbersign")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4423 "MediaPage.c" +#line 4357 "MediaPage.c" default: { gboolean _tmp12_ = FALSE; @@ -4427,7 +4361,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp12_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 560 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp12_) { -#line 4431 "MediaPage.c" +#line 4365 "MediaPage.c" SearchViewFilter* _tmp13_ = NULL; SearchViewFilter* _tmp14_ = NULL; #line 561 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4438,17 +4372,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve search_view_filter_set_rating_filter (_tmp14_, RATING_FILTER_THREE_OR_HIGHER); #line 561 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_filter_unref0 (_tmp14_); -#line 4442 "MediaPage.c" +#line 4376 "MediaPage.c" } #line 562 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4446 "MediaPage.c" +#line 4380 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label18) ? _tmp4_label18 : (_tmp4_label18 = g_quark_from_static_string ("dollar")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4452 "MediaPage.c" +#line 4386 "MediaPage.c" default: { gboolean _tmp15_ = FALSE; @@ -4456,7 +4390,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp15_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 565 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp15_) { -#line 4460 "MediaPage.c" +#line 4394 "MediaPage.c" SearchViewFilter* _tmp16_ = NULL; SearchViewFilter* _tmp17_ = NULL; #line 566 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4467,17 +4401,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve search_view_filter_set_rating_filter (_tmp17_, RATING_FILTER_FOUR_OR_HIGHER); #line 566 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_filter_unref0 (_tmp17_); -#line 4471 "MediaPage.c" +#line 4405 "MediaPage.c" } #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4475 "MediaPage.c" +#line 4409 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label19) ? _tmp4_label19 : (_tmp4_label19 = g_quark_from_static_string ("percent")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4481 "MediaPage.c" +#line 4415 "MediaPage.c" default: { gboolean _tmp18_ = FALSE; @@ -4485,7 +4419,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp18_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 570 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp18_) { -#line 4489 "MediaPage.c" +#line 4423 "MediaPage.c" SearchViewFilter* _tmp19_ = NULL; SearchViewFilter* _tmp20_ = NULL; #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4496,17 +4430,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve search_view_filter_set_rating_filter (_tmp20_, RATING_FILTER_FIVE_OR_HIGHER); #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_filter_unref0 (_tmp20_); -#line 4500 "MediaPage.c" +#line 4434 "MediaPage.c" } #line 572 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4504 "MediaPage.c" +#line 4438 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label20) ? _tmp4_label20 : (_tmp4_label20 = g_quark_from_static_string ("parenright")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4510 "MediaPage.c" +#line 4444 "MediaPage.c" default: { gboolean _tmp21_ = FALSE; @@ -4514,7 +4448,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp21_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp21_) { -#line 4518 "MediaPage.c" +#line 4452 "MediaPage.c" SearchViewFilter* _tmp22_ = NULL; SearchViewFilter* _tmp23_ = NULL; #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4525,17 +4459,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve search_view_filter_set_rating_filter (_tmp23_, RATING_FILTER_UNRATED_OR_HIGHER); #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_filter_unref0 (_tmp23_); -#line 4529 "MediaPage.c" +#line 4463 "MediaPage.c" } #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4533 "MediaPage.c" +#line 4467 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label21) ? _tmp4_label21 : (_tmp4_label21 = g_quark_from_static_string ("parenleft")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4539 "MediaPage.c" +#line 4473 "MediaPage.c" default: { gboolean _tmp24_ = FALSE; @@ -4543,7 +4477,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp24_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 580 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp24_) { -#line 4547 "MediaPage.c" +#line 4481 "MediaPage.c" SearchViewFilter* _tmp25_ = NULL; SearchViewFilter* _tmp26_ = NULL; #line 581 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4554,17 +4488,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve search_view_filter_set_rating_filter (_tmp26_, RATING_FILTER_REJECTED_OR_HIGHER); #line 581 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_filter_unref0 (_tmp26_); -#line 4558 "MediaPage.c" +#line 4492 "MediaPage.c" } #line 582 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4562 "MediaPage.c" +#line 4496 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label22) ? _tmp4_label22 : (_tmp4_label22 = g_quark_from_static_string ("asterisk")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4568 "MediaPage.c" +#line 4502 "MediaPage.c" default: { gboolean _tmp27_ = FALSE; @@ -4572,7 +4506,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp27_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 585 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp27_) { -#line 4576 "MediaPage.c" +#line 4510 "MediaPage.c" SearchViewFilter* _tmp28_ = NULL; SearchViewFilter* _tmp29_ = NULL; #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4583,37 +4517,37 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve search_view_filter_set_rating_filter (_tmp29_, RATING_FILTER_REJECTED_ONLY); #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala" _view_filter_unref0 (_tmp29_); -#line 4587 "MediaPage.c" +#line 4521 "MediaPage.c" } #line 587 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4591 "MediaPage.c" +#line 4525 "MediaPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label23) ? _tmp4_label23 : (_tmp4_label23 = g_quark_from_static_string ("slash")))) { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4597 "MediaPage.c" +#line 4531 "MediaPage.c" default: { #line 590 "/home/jens/Source/shotwell/src/MediaPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag"); #line 591 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4604 "MediaPage.c" +#line 4538 "MediaPage.c" } } } else { #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 4610 "MediaPage.c" +#line 4544 "MediaPage.c" default: { #line 594 "/home/jens/Source/shotwell/src/MediaPage.vala" handled = FALSE; #line 595 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 4617 "MediaPage.c" +#line 4551 "MediaPage.c" } } } @@ -4623,7 +4557,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve if (_tmp31_) { #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp30_ = TRUE; -#line 4627 "MediaPage.c" +#line 4561 "MediaPage.c" } else { GdkEventKey* _tmp32_ = NULL; gboolean _tmp33_ = FALSE; @@ -4633,13 +4567,13 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve _tmp33_ = PAGE_CLASS (media_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp32_); #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp30_ = _tmp33_; -#line 4637 "MediaPage.c" +#line 4571 "MediaPage.c" } #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala" result = _tmp30_; #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 4643 "MediaPage.c" +#line 4577 "MediaPage.c" } @@ -4737,7 +4671,7 @@ static void media_page_real_switched_to (Page* base) { _data_collection_unref0 (_tmp17_); #line 614 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp19_) { -#line 4741 "MediaPage.c" +#line 4675 "MediaPage.c" CheckerboardItem* selected = NULL; ViewCollection* _tmp20_ = NULL; ViewCollection* _tmp21_ = NULL; @@ -4760,21 +4694,21 @@ static void media_page_real_switched_to (Page* base) { _tmp24_ = selected; #line 616 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp24_ != NULL) { -#line 4764 "MediaPage.c" +#line 4698 "MediaPage.c" CheckerboardItem* _tmp25_ = NULL; #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp25_ = selected; #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala" checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp25_); -#line 4770 "MediaPage.c" +#line 4704 "MediaPage.c" } #line 614 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (selected); -#line 4774 "MediaPage.c" +#line 4708 "MediaPage.c" } #line 620 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_sync_sort (self); -#line 4778 "MediaPage.c" +#line 4712 "MediaPage.c" } @@ -4786,21 +4720,21 @@ static void media_page_real_switching_from (Page* base) { media_page_disconnect_slider (self); #line 626 "/home/jens/Source/shotwell/src/MediaPage.vala" PAGE_CLASS (media_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 4790 "MediaPage.c" +#line 4724 "MediaPage.c" } static gpointer _g_object_ref0 (gpointer self) { #line 630 "/home/jens/Source/shotwell/src/MediaPage.vala" return self ? g_object_ref (self) : NULL; -#line 4797 "MediaPage.c" +#line 4731 "MediaPage.c" } static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self) { #line 631 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_zoom_changed ((MediaPage*) self); -#line 4804 "MediaPage.c" +#line 4738 "MediaPage.c" } @@ -4826,7 +4760,7 @@ void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* sl g_signal_connect_object (_tmp2_, "zoom-changed", (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self, 0); #line 632 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_load_persistent_thumbnail_scale (self); -#line 4830 "MediaPage.c" +#line 4764 "MediaPage.c" } @@ -4844,7 +4778,7 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) { if (_tmp0_ == NULL) { #line 637 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4848 "MediaPage.c" +#line 4782 "MediaPage.c" } #line 639 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = config_facade_get_instance (); @@ -4858,7 +4792,7 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) { configuration_facade_set_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); #line 639 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp2_); -#line 4862 "MediaPage.c" +#line 4796 "MediaPage.c" } @@ -4880,7 +4814,7 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) { if (_tmp0_ == NULL) { #line 644 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4884 "MediaPage.c" +#line 4818 "MediaPage.c" } #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = config_facade_get_instance (); @@ -4904,7 +4838,7 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) { _tmp7_ = persistent_scale; #line 649 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_thumb_size (self, _tmp7_); -#line 4908 "MediaPage.c" +#line 4842 "MediaPage.c" } @@ -4920,7 +4854,7 @@ void media_page_disconnect_slider (MediaPage* self) { if (_tmp0_ == NULL) { #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4924 "MediaPage.c" +#line 4858 "MediaPage.c" } #line 656 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = self->priv->connected_slider; @@ -4932,7 +4866,7 @@ void media_page_disconnect_slider (MediaPage* self) { _g_object_unref0 (self->priv->connected_slider); #line 657 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->connected_slider = NULL; -#line 4936 "MediaPage.c" +#line 4870 "MediaPage.c" } @@ -4942,7 +4876,7 @@ static void media_page_real_on_zoom_changed (MediaPage* self) { _tmp0_ = self->priv->connected_slider; #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ != NULL) { -#line 4946 "MediaPage.c" +#line 4880 "MediaPage.c" MediaPageZoomSliderAssembly* _tmp1_ = NULL; gint _tmp2_ = 0; #line 662 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -4951,11 +4885,11 @@ static void media_page_real_on_zoom_changed (MediaPage* self) { _tmp2_ = media_page_zoom_slider_assembly_get_scale (_tmp1_); #line 662 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_thumb_size (self, _tmp2_); -#line 4955 "MediaPage.c" +#line 4889 "MediaPage.c" } #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_save_persistent_thumbnail_scale (self); -#line 4959 "MediaPage.c" +#line 4893 "MediaPage.c" } @@ -4964,7 +4898,7 @@ void media_page_on_zoom_changed (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_zoom_changed (self); -#line 4968 "MediaPage.c" +#line 4902 "MediaPage.c" } @@ -4973,7 +4907,7 @@ static void media_page_real_on_export (MediaPage* self) { g_critical ("Type `%s' does not implement abstract method `media_page_on_export'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 4977 "MediaPage.c" +#line 4911 "MediaPage.c" } @@ -4982,14 +4916,14 @@ void media_page_on_export (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_export (self); -#line 4986 "MediaPage.c" +#line 4920 "MediaPage.c" } static void media_page_real_on_increase_size (MediaPage* self) { #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_increase_zoom_level (self); -#line 4993 "MediaPage.c" +#line 4927 "MediaPage.c" } @@ -4998,14 +4932,14 @@ void media_page_on_increase_size (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 669 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_increase_size (self); -#line 5002 "MediaPage.c" +#line 4936 "MediaPage.c" } static void media_page_real_on_decrease_size (MediaPage* self) { #line 674 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_decrease_zoom_level (self); -#line 5009 "MediaPage.c" +#line 4943 "MediaPage.c" } @@ -5014,7 +4948,7 @@ void media_page_on_decrease_size (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 673 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_decrease_size (self); -#line 5018 "MediaPage.c" +#line 4952 "MediaPage.c" } @@ -5049,7 +4983,7 @@ static void media_page_on_add_tags (MediaPage* self) { if (_tmp3_) { #line 679 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5053 "MediaPage.c" +#line 4987 "MediaPage.c" } #line 681 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = add_tags_dialog_new (); @@ -5071,7 +5005,7 @@ static void media_page_on_add_tags (MediaPage* self) { _tmp8__length1 = names_length1; #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp8_ != NULL) { -#line 5075 "MediaPage.c" +#line 5009 "MediaPage.c" CommandManager* _tmp9_ = NULL; CommandManager* _tmp10_ = NULL; HierarchicalTagIndex* _tmp11_ = NULL; @@ -5132,13 +5066,13 @@ static void media_page_on_add_tags (MediaPage* self) { _hierarchical_tag_index_unref0 (_tmp12_); #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala" _command_manager_unref0 (_tmp10_); -#line 5136 "MediaPage.c" +#line 5070 "MediaPage.c" } #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 5142 "MediaPage.c" +#line 5076 "MediaPage.c" } @@ -5183,7 +5117,7 @@ static void media_page_on_modify_tags (MediaPage* self) { if (_tmp3_) { #line 693 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5187 "MediaPage.c" +#line 5121 "MediaPage.c" } #line 695 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5227,7 +5161,7 @@ static void media_page_on_modify_tags (MediaPage* self) { _g_object_unref0 (media); #line 701 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5231 "MediaPage.c" +#line 5165 "MediaPage.c" } #line 703 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5253,7 +5187,7 @@ static void media_page_on_modify_tags (MediaPage* self) { _text_entry_dialog_mediator_unref0 (dialog); #line 691 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (media); -#line 5257 "MediaPage.c" +#line 5191 "MediaPage.c" } @@ -5305,7 +5239,7 @@ static void media_page_set_display_tags (MediaPage* self, gboolean display) { _tmp8_ = display; #line 711 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", _tmp8_); -#line 5309 "MediaPage.c" +#line 5243 "MediaPage.c" } @@ -5328,7 +5262,7 @@ static void media_page_on_new_event (MediaPage* self) { _data_collection_unref0 (_tmp1_); #line 715 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp3_) { -#line 5332 "MediaPage.c" +#line 5266 "MediaPage.c" CommandManager* _tmp4_ = NULL; CommandManager* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; @@ -5363,7 +5297,7 @@ static void media_page_on_new_event (MediaPage* self) { _data_collection_unref0 (_tmp7_); #line 716 "/home/jens/Source/shotwell/src/MediaPage.vala" _command_manager_unref0 (_tmp5_); -#line 5367 "MediaPage.c" +#line 5301 "MediaPage.c" } } @@ -5401,7 +5335,7 @@ static void media_page_on_flag_unflag (MediaPage* self) { if (_tmp3_) { #line 721 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5405 "MediaPage.c" +#line 5339 "MediaPage.c" } #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5417,7 +5351,7 @@ static void media_page_on_flag_unflag (MediaPage* self) { sources = _tmp7_; #line 727 "/home/jens/Source/shotwell/src/MediaPage.vala" flag = FALSE; -#line 5421 "MediaPage.c" +#line 5355 "MediaPage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp8_ = NULL; @@ -5430,7 +5364,7 @@ static void media_page_on_flag_unflag (MediaPage* self) { _source_it = _tmp9_; #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 5434 "MediaPage.c" +#line 5368 "MediaPage.c" GeeIterator* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; MediaSource* source = NULL; @@ -5449,7 +5383,7 @@ static void media_page_on_flag_unflag (MediaPage* self) { if (!_tmp11_) { #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 5453 "MediaPage.c" +#line 5387 "MediaPage.c" } #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp12_ = _source_it; @@ -5467,7 +5401,7 @@ static void media_page_on_flag_unflag (MediaPage* self) { _tmp17_ = flaggable; #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp17_ != NULL) { -#line 5471 "MediaPage.c" +#line 5405 "MediaPage.c" Flaggable* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -5476,11 +5410,11 @@ static void media_page_on_flag_unflag (MediaPage* self) { _tmp19_ = flaggable_is_flagged (_tmp18_); #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp16_ = !_tmp19_; -#line 5480 "MediaPage.c" +#line 5414 "MediaPage.c" } else { #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp16_ = FALSE; -#line 5484 "MediaPage.c" +#line 5418 "MediaPage.c" } #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp16_) { @@ -5492,17 +5426,17 @@ static void media_page_on_flag_unflag (MediaPage* self) { _g_object_unref0 (source); #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 5496 "MediaPage.c" +#line 5430 "MediaPage.c" } #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (flaggable); #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (source); -#line 5502 "MediaPage.c" +#line 5436 "MediaPage.c" } #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_source_it); -#line 5506 "MediaPage.c" +#line 5440 "MediaPage.c" } #line 737 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5524,7 +5458,7 @@ static void media_page_on_flag_unflag (MediaPage* self) { _command_manager_unref0 (_tmp21_); #line 719 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (sources); -#line 5528 "MediaPage.c" +#line 5462 "MediaPage.c" } @@ -5557,7 +5491,7 @@ static void media_page_real_on_increase_rating (MediaPage* self) { if (_tmp3_) { #line 742 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5561 "MediaPage.c" +#line 5495 "MediaPage.c" } #line 744 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5591,7 +5525,7 @@ static void media_page_real_on_increase_rating (MediaPage* self) { media_page_update_rating_sensitivities (self); #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (command); -#line 5595 "MediaPage.c" +#line 5529 "MediaPage.c" } @@ -5600,7 +5534,7 @@ void media_page_on_increase_rating (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_increase_rating (self); -#line 5604 "MediaPage.c" +#line 5538 "MediaPage.c" } @@ -5633,7 +5567,7 @@ static void media_page_real_on_decrease_rating (MediaPage* self) { if (_tmp3_) { #line 752 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5637 "MediaPage.c" +#line 5571 "MediaPage.c" } #line 754 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5667,7 +5601,7 @@ static void media_page_real_on_decrease_rating (MediaPage* self) { media_page_update_rating_sensitivities (self); #line 750 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (command); -#line 5671 "MediaPage.c" +#line 5605 "MediaPage.c" } @@ -5676,7 +5610,7 @@ void media_page_on_decrease_rating (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 750 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_decrease_rating (self); -#line 5680 "MediaPage.c" +#line 5614 "MediaPage.c" } @@ -5710,7 +5644,7 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) { if (_tmp3_) { #line 762 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 5714 "MediaPage.c" +#line 5648 "MediaPage.c" } #line 764 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5746,7 +5680,7 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) { media_page_update_rating_sensitivities (self); #line 760 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (command); -#line 5750 "MediaPage.c" +#line 5684 "MediaPage.c" } @@ -5755,14 +5689,14 @@ void media_page_on_set_rating (MediaPage* self, Rating rating) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 760 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_set_rating (self, rating); -#line 5759 "MediaPage.c" +#line 5693 "MediaPage.c" } static void media_page_real_on_rate_rejected (MediaPage* self) { #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_REJECTED); -#line 5766 "MediaPage.c" +#line 5700 "MediaPage.c" } @@ -5771,14 +5705,14 @@ void media_page_on_rate_rejected (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 770 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_rejected (self); -#line 5775 "MediaPage.c" +#line 5709 "MediaPage.c" } static void media_page_real_on_rate_unrated (MediaPage* self) { #line 775 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_UNRATED); -#line 5782 "MediaPage.c" +#line 5716 "MediaPage.c" } @@ -5787,14 +5721,14 @@ void media_page_on_rate_unrated (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 774 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_unrated (self); -#line 5791 "MediaPage.c" +#line 5725 "MediaPage.c" } static void media_page_real_on_rate_one (MediaPage* self) { #line 779 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_ONE); -#line 5798 "MediaPage.c" +#line 5732 "MediaPage.c" } @@ -5803,14 +5737,14 @@ void media_page_on_rate_one (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 778 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_one (self); -#line 5807 "MediaPage.c" +#line 5741 "MediaPage.c" } static void media_page_real_on_rate_two (MediaPage* self) { #line 783 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_TWO); -#line 5814 "MediaPage.c" +#line 5748 "MediaPage.c" } @@ -5819,14 +5753,14 @@ void media_page_on_rate_two (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 782 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_two (self); -#line 5823 "MediaPage.c" +#line 5757 "MediaPage.c" } static void media_page_real_on_rate_three (MediaPage* self) { #line 787 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_THREE); -#line 5830 "MediaPage.c" +#line 5764 "MediaPage.c" } @@ -5835,14 +5769,14 @@ void media_page_on_rate_three (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 786 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_three (self); -#line 5839 "MediaPage.c" +#line 5773 "MediaPage.c" } static void media_page_real_on_rate_four (MediaPage* self) { #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_FOUR); -#line 5846 "MediaPage.c" +#line 5780 "MediaPage.c" } @@ -5851,14 +5785,14 @@ void media_page_on_rate_four (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 790 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_four (self); -#line 5855 "MediaPage.c" +#line 5789 "MediaPage.c" } static void media_page_real_on_rate_five (MediaPage* self) { #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_on_set_rating (self, RATING_FIVE); -#line 5862 "MediaPage.c" +#line 5796 "MediaPage.c" } @@ -5867,7 +5801,7 @@ void media_page_on_rate_five (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 794 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_rate_five (self); -#line 5871 "MediaPage.c" +#line 5805 "MediaPage.c" } @@ -5892,7 +5826,7 @@ static void media_page_on_remove_from_library (MediaPage* self) { _g_object_unref0 (_tmp3_); #line 799 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp1_); -#line 5896 "MediaPage.c" +#line 5830 "MediaPage.c" } @@ -5911,7 +5845,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor; #line 805 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ != NULL) { -#line 5915 "MediaPage.c" +#line 5849 "MediaPage.c" ViewCollection* _tmp1_ = NULL; ViewCollection* _tmp2_ = NULL; CheckerboardItem* _tmp3_ = NULL; @@ -5931,7 +5865,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { if (_tmp5_ == NULL) { #line 806 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp4_); -#line 5935 "MediaPage.c" +#line 5869 "MediaPage.c" } #line 806 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (restore_point); @@ -5939,7 +5873,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { restore_point = _tmp5_; #line 806 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp2_); -#line 5943 "MediaPage.c" +#line 5877 "MediaPage.c" } #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -5953,7 +5887,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { _data_collection_unref0 (_tmp7_); #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp9_) { -#line 5957 "MediaPage.c" +#line 5891 "MediaPage.c" CommandManager* _tmp10_ = NULL; CommandManager* _tmp11_ = NULL; ViewCollection* _tmp12_ = NULL; @@ -5988,13 +5922,13 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { _data_collection_unref0 (_tmp13_); #line 810 "/home/jens/Source/shotwell/src/MediaPage.vala" _command_manager_unref0 (_tmp11_); -#line 5992 "MediaPage.c" +#line 5926 "MediaPage.c" } #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp19_ = restore_point; #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp19_ != NULL) { -#line 5998 "MediaPage.c" +#line 5932 "MediaPage.c" ViewCollection* _tmp20_ = NULL; ViewCollection* _tmp21_ = NULL; CheckerboardItem* _tmp22_ = NULL; @@ -6011,25 +5945,25 @@ static void media_page_real_on_move_to_trash (MediaPage* self) { _tmp18_ = _tmp23_; #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp21_); -#line 6015 "MediaPage.c" +#line 5949 "MediaPage.c" } else { #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp18_ = FALSE; -#line 6019 "MediaPage.c" +#line 5953 "MediaPage.c" } #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp18_) { -#line 6023 "MediaPage.c" +#line 5957 "MediaPage.c" CheckerboardItem* _tmp24_ = NULL; #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp24_ = restore_point; #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala" checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp24_); -#line 6029 "MediaPage.c" +#line 5963 "MediaPage.c" } #line 802 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (restore_point); -#line 6033 "MediaPage.c" +#line 5967 "MediaPage.c" } @@ -6038,7 +5972,7 @@ void media_page_on_move_to_trash (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 802 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_move_to_trash (self); -#line 6042 "MediaPage.c" +#line 5976 "MediaPage.c" } @@ -6078,7 +6012,7 @@ static void media_page_real_on_edit_title (MediaPage* self) { if (_tmp3_) { #line 821 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 6082 "MediaPage.c" +#line 6016 "MediaPage.c" } #line 823 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -6122,7 +6056,7 @@ static void media_page_real_on_edit_title (MediaPage* self) { _tmp17_ = new_title; #line 827 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp17_ != NULL) { -#line 6126 "MediaPage.c" +#line 6060 "MediaPage.c" CommandManager* _tmp18_ = NULL; CommandManager* _tmp19_ = NULL; GeeList* _tmp20_ = NULL; @@ -6147,7 +6081,7 @@ static void media_page_real_on_edit_title (MediaPage* self) { _g_object_unref0 (_tmp23_); #line 828 "/home/jens/Source/shotwell/src/MediaPage.vala" _command_manager_unref0 (_tmp19_); -#line 6151 "MediaPage.c" +#line 6085 "MediaPage.c" } #line 819 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_free0 (new_title); @@ -6155,7 +6089,7 @@ static void media_page_real_on_edit_title (MediaPage* self) { _text_entry_dialog_mediator_unref0 (edit_title_dialog); #line 819 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (media_sources); -#line 6159 "MediaPage.c" +#line 6093 "MediaPage.c" } @@ -6164,7 +6098,7 @@ void media_page_on_edit_title (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 819 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_edit_title (self); -#line 6168 "MediaPage.c" +#line 6102 "MediaPage.c" } @@ -6204,7 +6138,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) { if (_tmp3_) { #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 6208 "MediaPage.c" +#line 6142 "MediaPage.c" } #line 835 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); @@ -6248,7 +6182,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) { _tmp17_ = new_comment; #line 839 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp17_ != NULL) { -#line 6252 "MediaPage.c" +#line 6186 "MediaPage.c" CommandManager* _tmp18_ = NULL; CommandManager* _tmp19_ = NULL; GeeList* _tmp20_ = NULL; @@ -6273,7 +6207,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) { _g_object_unref0 (_tmp23_); #line 840 "/home/jens/Source/shotwell/src/MediaPage.vala" _command_manager_unref0 (_tmp19_); -#line 6277 "MediaPage.c" +#line 6211 "MediaPage.c" } #line 831 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_free0 (new_comment); @@ -6281,7 +6215,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 831 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (media_sources); -#line 6285 "MediaPage.c" +#line 6219 "MediaPage.c" } @@ -6290,7 +6224,7 @@ void media_page_on_edit_comment (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 831 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_edit_comment (self); -#line 6294 "MediaPage.c" +#line 6228 "MediaPage.c" } @@ -6326,7 +6260,7 @@ static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* a _tmp5_ = value; #line 849 "/home/jens/Source/shotwell/src/MediaPage.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6330 "MediaPage.c" +#line 6264 "MediaPage.c" } @@ -6335,7 +6269,7 @@ void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVari g_return_if_fail (IS_MEDIA_PAGE (self)); #line 843 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action, value); -#line 6339 "MediaPage.c" +#line 6273 "MediaPage.c" } @@ -6371,7 +6305,7 @@ static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction* _tmp5_ = value; #line 858 "/home/jens/Source/shotwell/src/MediaPage.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6375 "MediaPage.c" +#line 6309 "MediaPage.c" } @@ -6380,7 +6314,7 @@ void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVa g_return_if_fail (IS_MEDIA_PAGE (self)); #line 852 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action, value); -#line 6384 "MediaPage.c" +#line 6318 "MediaPage.c" } @@ -6416,7 +6350,7 @@ static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction* _tmp5_ = value; #line 867 "/home/jens/Source/shotwell/src/MediaPage.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6420 "MediaPage.c" +#line 6354 "MediaPage.c" } @@ -6425,7 +6359,7 @@ void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVar g_return_if_fail (IS_MEDIA_PAGE (self)); #line 861 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action, value); -#line 6429 "MediaPage.c" +#line 6363 "MediaPage.c" } @@ -6461,7 +6395,7 @@ static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* act _tmp5_ = value; #line 876 "/home/jens/Source/shotwell/src/MediaPage.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6465 "MediaPage.c" +#line 6399 "MediaPage.c" } @@ -6470,7 +6404,7 @@ void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVarian g_return_if_fail (IS_MEDIA_PAGE (self)); #line 870 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action, value); -#line 6474 "MediaPage.c" +#line 6408 "MediaPage.c" } @@ -6479,7 +6413,7 @@ static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* s g_critical ("Type `%s' does not implement abstract method `media_page_get_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 879 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 6483 "MediaPage.c" +#line 6417 "MediaPage.c" } @@ -6488,7 +6422,7 @@ void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, g g_return_if_fail (IS_MEDIA_PAGE (self)); #line 879 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->get_config_photos_sort (self, sort_order, sort_by); -#line 6492 "MediaPage.c" +#line 6426 "MediaPage.c" } @@ -6497,7 +6431,7 @@ static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean so g_critical ("Type `%s' does not implement abstract method `media_page_set_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 881 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 6501 "MediaPage.c" +#line 6435 "MediaPage.c" } @@ -6506,38 +6440,38 @@ void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gi g_return_if_fail (IS_MEDIA_PAGE (self)); #line 881 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->set_config_photos_sort (self, sort_order, sort_by); -#line 6510 "MediaPage.c" +#line 6444 "MediaPage.c" } static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) { + GSimpleAction* _tmp0_ = NULL; + GVariant* _tmp1_ = NULL; gint sort_by = 0; - gint _tmp0_ = 0; + gint _tmp2_ = 0; gboolean sort_order = FALSE; - gboolean _tmp1_ = FALSE; - GSimpleAction* _tmp2_ = NULL; - GVariant* _tmp3_ = NULL; + gboolean _tmp3_ = FALSE; #line 883 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 884 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = media_page_get_menu_sort_by (self); + _tmp0_ = action; +#line 884 "/home/jens/Source/shotwell/src/MediaPage.vala" + _tmp1_ = value; #line 884 "/home/jens/Source/shotwell/src/MediaPage.vala" - sort_by = _tmp0_; -#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp1_ = media_page_get_menu_sort_order (self); -#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala" - sort_order = _tmp1_; + g_simple_action_set_state (_tmp0_, _tmp1_); +#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala" + _tmp2_ = media_page_get_menu_sort_by (self); +#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala" + sort_by = _tmp2_; #line 887 "/home/jens/Source/shotwell/src/MediaPage.vala" + _tmp3_ = media_page_get_menu_sort_order (self); +#line 887 "/home/jens/Source/shotwell/src/MediaPage.vala" + sort_order = _tmp3_; +#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_view_comparator (self, sort_by, sort_order); -#line 888 "/home/jens/Source/shotwell/src/MediaPage.vala" - media_page_set_config_photos_sort (self, sort_order, sort_by); -#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp2_ = action; -#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = value; #line 890 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp2_, _tmp3_); -#line 6541 "MediaPage.c" + media_page_set_config_photos_sort (self, sort_order, sort_by); +#line 6475 "MediaPage.c" } @@ -6546,7 +6480,7 @@ void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVarian g_return_if_fail (IS_MEDIA_PAGE (self)); #line 883 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value); -#line 6550 "MediaPage.c" +#line 6484 "MediaPage.c" } @@ -6555,7 +6489,7 @@ void media_page_on_raw_developer_shotwell (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 894 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_developer_changed (self, RAW_DEVELOPER_SHOTWELL); -#line 6559 "MediaPage.c" +#line 6493 "MediaPage.c" } @@ -6564,7 +6498,7 @@ void media_page_on_raw_developer_camera (MediaPage* self) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_developer_changed (self, RAW_DEVELOPER_CAMERA); -#line 6568 "MediaPage.c" +#line 6502 "MediaPage.c" } @@ -6578,7 +6512,7 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* static GQuark _tmp3_label0 = 0; #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala" static GQuark _tmp3_label1 = 0; -#line 6582 "MediaPage.c" +#line 6516 "MediaPage.c" RawDeveloper _tmp5_ = 0; GSimpleAction* _tmp6_ = NULL; GVariant* _tmp7_ = NULL; @@ -6600,38 +6534,38 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) { #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 6604 "MediaPage.c" +#line 6538 "MediaPage.c" default: { #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala" developer = RAW_DEVELOPER_SHOTWELL; #line 908 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 6611 "MediaPage.c" +#line 6545 "MediaPage.c" } } } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) { #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 6617 "MediaPage.c" +#line 6551 "MediaPage.c" default: { #line 910 "/home/jens/Source/shotwell/src/MediaPage.vala" developer = RAW_DEVELOPER_CAMERA; #line 911 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 6624 "MediaPage.c" +#line 6558 "MediaPage.c" } } } else { #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (0) { -#line 6630 "MediaPage.c" +#line 6564 "MediaPage.c" default: { #line 913 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 6635 "MediaPage.c" +#line 6569 "MediaPage.c" } } } @@ -6645,7 +6579,7 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* _tmp7_ = value; #line 918 "/home/jens/Source/shotwell/src/MediaPage.vala" g_simple_action_set_state (_tmp6_, _tmp7_); -#line 6649 "MediaPage.c" +#line 6583 "MediaPage.c" } @@ -6673,7 +6607,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) if (_tmp3_) { #line 923 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 6677 "MediaPage.c" +#line 6611 "MediaPage.c" } #line 928 "/home/jens/Source/shotwell/src/MediaPage.vala" need_warn = FALSE; @@ -6681,7 +6615,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) _tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); #line 931 "/home/jens/Source/shotwell/src/MediaPage.vala" to_set = _tmp4_; -#line 6685 "MediaPage.c" +#line 6619 "MediaPage.c" { GeeList* _view_list = NULL; ViewCollection* _tmp5_ = NULL; @@ -6717,7 +6651,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) _view_index = -1; #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala" while (TRUE) { -#line 6721 "MediaPage.c" +#line 6655 "MediaPage.c" gint _tmp12_ = 0; gint _tmp13_ = 0; gint _tmp14_ = 0; @@ -6743,7 +6677,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) if (!(_tmp13_ < _tmp14_)) { #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 6747 "MediaPage.c" +#line 6681 "MediaPage.c" } #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp15_ = _view_list; @@ -6763,7 +6697,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) if (_tmp20_ == NULL) { #line 933 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp19_); -#line 6767 "MediaPage.c" +#line 6701 "MediaPage.c" } #line 933 "/home/jens/Source/shotwell/src/MediaPage.vala" p = _tmp20_; @@ -6771,7 +6705,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) _tmp22_ = p; #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp22_ != NULL) { -#line 6775 "MediaPage.c" +#line 6709 "MediaPage.c" RawDeveloper _tmp23_ = 0; Photo* _tmp24_ = NULL; RawDeveloper _tmp25_ = 0; @@ -6786,15 +6720,15 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) _tmp26_ = raw_developer_is_equivalent (_tmp23_, _tmp25_); #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp21_ = !_tmp26_; -#line 6790 "MediaPage.c" +#line 6724 "MediaPage.c" } else { #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp21_ = FALSE; -#line 6794 "MediaPage.c" +#line 6728 "MediaPage.c" } #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp21_) { -#line 6798 "MediaPage.c" +#line 6732 "MediaPage.c" GeeArrayList* _tmp27_ = NULL; DataView* _tmp28_ = NULL; Photo* _tmp29_ = NULL; @@ -6813,18 +6747,18 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) if (_tmp30_) { #line 938 "/home/jens/Source/shotwell/src/MediaPage.vala" need_warn = TRUE; -#line 6817 "MediaPage.c" +#line 6751 "MediaPage.c" } } #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (p); #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (view); -#line 6824 "MediaPage.c" +#line 6758 "MediaPage.c" } #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_view_list); -#line 6828 "MediaPage.c" +#line 6762 "MediaPage.c" } #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp32_ = need_warn; @@ -6832,7 +6766,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) if (!_tmp32_) { #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp31_ = TRUE; -#line 6836 "MediaPage.c" +#line 6770 "MediaPage.c" } else { GeeArrayList* _tmp33_ = NULL; gint _tmp34_ = 0; @@ -6848,11 +6782,11 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) _tmp36_ = dialogs_confirm_warn_developer_changed (_tmp35_); #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp31_ = _tmp36_; -#line 6852 "MediaPage.c" +#line 6786 "MediaPage.c" } #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp31_) { -#line 6856 "MediaPage.c" +#line 6790 "MediaPage.c" SetRawDeveloperCommand* command = NULL; GeeArrayList* _tmp37_ = NULL; RawDeveloper _tmp38_ = 0; @@ -6882,11 +6816,11 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) media_page_update_development_menu_item_sensitivity (self); #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (command); -#line 6886 "MediaPage.c" +#line 6820 "MediaPage.c" } #line 921 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (to_set); -#line 6890 "MediaPage.c" +#line 6824 "MediaPage.c" } @@ -6895,7 +6829,7 @@ void media_page_developer_changed (MediaPage* self, RawDeveloper rd) { g_return_if_fail (IS_MEDIA_PAGE (self)); #line 921 "/home/jens/Source/shotwell/src/MediaPage.vala" MEDIA_PAGE_GET_CLASS (self)->developer_changed (self, rd); -#line 6899 "MediaPage.c" +#line 6833 "MediaPage.c" } @@ -6913,7 +6847,7 @@ static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean _tmp1_ = display; #line 954 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_); -#line 6917 "MediaPage.c" +#line 6851 "MediaPage.c" } @@ -6931,7 +6865,7 @@ static void media_page_real_set_display_comments (CheckerboardPage* base, gboole _tmp1_ = display; #line 960 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", _tmp1_); -#line 6935 "MediaPage.c" +#line 6869 "MediaPage.c" } @@ -6951,7 +6885,7 @@ static GAction* media_page_sort_by_title_action (MediaPage* self) { result = action; #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6955 "MediaPage.c" +#line 6889 "MediaPage.c" } @@ -6971,7 +6905,7 @@ static GAction* media_page_sort_ascending_action (MediaPage* self) { result = action; #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 6975 "MediaPage.c" +#line 6909 "MediaPage.c" } @@ -7008,14 +6942,14 @@ gint media_page_get_menu_sort_by (MediaPage* self) { result = _tmp6_; #line 977 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7012 "MediaPage.c" +#line 6946 "MediaPage.c" } -static GVariant* _variant_new26 (const gchar* value) { +static GVariant* _variant_new30 (const gchar* value) { #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 7019 "MediaPage.c" +#line 6953 "MediaPage.c" } @@ -7024,9 +6958,8 @@ void media_page_set_menu_sort_by (MediaPage* self, gint val) { gint _tmp0_ = 0; gchar* _tmp1_ = NULL; GAction* _tmp2_ = NULL; - GSimpleAction* _tmp3_ = NULL; - GSimpleAction* _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; + GAction* _tmp3_ = NULL; + GVariant* _tmp4_ = NULL; #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); #line 981 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -7038,26 +6971,18 @@ void media_page_set_menu_sort_by (MediaPage* self, gint val) { #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = media_page_sort_by_title_action (self); #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL; -#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_ == NULL) { -#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp2_); -#line 7047 "MediaPage.c" - } -#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _variant_new26 (sort); + _tmp4_ = _variant_new30 (sort); #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); + g_action_change_state (_tmp3_, _tmp4_); #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp5_); + _g_variant_unref0 (_tmp4_); #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_free0 (sort); -#line 7061 "MediaPage.c" +#line 6986 "MediaPage.c" } @@ -7091,14 +7016,14 @@ gboolean media_page_get_menu_sort_order (MediaPage* self) { result = _tmp5_; #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7095 "MediaPage.c" +#line 7020 "MediaPage.c" } -static GVariant* _variant_new27 (const gchar* value) { +static GVariant* _variant_new31 (const gchar* value) { #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 7102 "MediaPage.c" +#line 7027 "MediaPage.c" } @@ -7106,152 +7031,143 @@ void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) { const gchar* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; GAction* _tmp2_ = NULL; - GSimpleAction* _tmp3_ = NULL; - GSimpleAction* _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; + GAction* _tmp3_ = NULL; + GVariant* _tmp4_ = NULL; #line 990 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); -#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = ascending; -#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp1_) { -#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = "'ascending'"; -#line 7121 "MediaPage.c" +#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" + _tmp0_ = "ascending"; +#line 7045 "MediaPage.c" } else { -#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp0_ = "'descending'"; -#line 7125 "MediaPage.c" +#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" + _tmp0_ = "descending"; +#line 7049 "MediaPage.c" } #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = media_page_sort_ascending_action (self); #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL; -#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" - if (_tmp3_ == NULL) { -#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp2_); -#line 7135 "MediaPage.c" - } -#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp5_ = _variant_new27 (_tmp0_); + _tmp4_ = _variant_new31 (_tmp0_); #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); + g_action_change_state (_tmp3_, _tmp4_); #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_variant_unref0 (_tmp5_); + _g_variant_unref0 (_tmp4_); #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala" - _g_object_unref0 (_tmp4_); -#line 7147 "MediaPage.c" + _g_object_unref0 (_tmp3_); +#line 7063 "MediaPage.c" } static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = thumbnail_title_ascending_comparator (a, b); -#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7156 "MediaPage.c" +#line 7072 "MediaPage.c" } static gint64 _thumbnail_title_descending_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = thumbnail_title_descending_comparator (a, b); -#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7165 "MediaPage.c" +#line 7081 "MediaPage.c" } static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { gboolean result; result = thumbnail_title_comparator_predicate (object, alteration); -#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7174 "MediaPage.c" +#line 7090 "MediaPage.c" } static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = thumbnail_exposure_time_ascending_comparator (a, b); -#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7183 "MediaPage.c" +#line 7099 "MediaPage.c" } static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = thumbnail_exposure_time_desending_comparator (a, b); -#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7192 "MediaPage.c" +#line 7108 "MediaPage.c" } static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { gboolean result; result = thumbnail_exposure_time_comparator_predicate (object, alteration); -#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7201 "MediaPage.c" +#line 7117 "MediaPage.c" } static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = thumbnail_rating_ascending_comparator (a, b); -#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7210 "MediaPage.c" +#line 7126 "MediaPage.c" } static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = thumbnail_rating_descending_comparator (a, b); -#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7219 "MediaPage.c" +#line 7135 "MediaPage.c" } static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { gboolean result; result = thumbnail_rating_comparator_predicate (object, alteration); -#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7228 "MediaPage.c" +#line 7144 "MediaPage.c" } static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = thumbnail_filename_ascending_comparator (a, b); -#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7237 "MediaPage.c" +#line 7153 "MediaPage.c" } static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, void* b, gpointer self) { gint64 result; result = thumbnail_filename_descending_comparator (a, b); -#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7246 "MediaPage.c" +#line 7162 "MediaPage.c" } static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { gboolean result; result = thumbnail_filename_comparator_predicate (object, alteration); -#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7255 "MediaPage.c" +#line 7171 "MediaPage.c" } @@ -7269,329 +7185,329 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool void* _tmp10__target = NULL; ComparatorPredicate _tmp11_ = NULL; void* _tmp11__target = NULL; -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); -#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = sort_by; -#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" switch (_tmp0_) { -#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" case MEDIA_PAGE_SORT_BY_TITLE: -#line 7281 "MediaPage.c" +#line 7197 "MediaPage.c" { gboolean _tmp1_ = FALSE; -#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = ascending; -#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp1_) { -#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_title_ascending_comparator_comparator; -#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7302 "MediaPage.c" +#line 7218 "MediaPage.c" } else { -#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_title_descending_comparator_comparator; -#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7318 "MediaPage.c" +#line 7234 "MediaPage.c" } -#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); -#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = NULL; -#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = _thumbnail_title_comparator_predicate_comparator_predicate; -#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7336 "MediaPage.c" +#line 7252 "MediaPage.c" } -#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE: -#line 7340 "MediaPage.c" +#line 7256 "MediaPage.c" { gboolean _tmp2_ = FALSE; -#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1007 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = ascending; -#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1007 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp2_) { -#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_exposure_time_ascending_comparator_comparator; -#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7361 "MediaPage.c" +#line 7277 "MediaPage.c" } else { -#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_exposure_time_desending_comparator_comparator; -#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7377 "MediaPage.c" +#line 7293 "MediaPage.c" } -#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); -#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = NULL; -#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = _thumbnail_exposure_time_comparator_predicate_comparator_predicate; -#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7395 "MediaPage.c" +#line 7311 "MediaPage.c" } -#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" case MEDIA_PAGE_SORT_BY_RATING: -#line 7399 "MediaPage.c" +#line 7315 "MediaPage.c" { gboolean _tmp3_ = FALSE; -#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = ascending; -#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1014 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp3_) { -#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_rating_ascending_comparator_comparator; -#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7420 "MediaPage.c" +#line 7336 "MediaPage.c" } else { -#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_rating_descending_comparator_comparator; -#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7436 "MediaPage.c" +#line 7352 "MediaPage.c" } -#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); -#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = NULL; -#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = _thumbnail_rating_comparator_predicate_comparator_predicate; -#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7454 "MediaPage.c" +#line 7370 "MediaPage.c" } -#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala" case MEDIA_PAGE_SORT_BY_FILENAME: -#line 7458 "MediaPage.c" +#line 7374 "MediaPage.c" { gboolean _tmp4_ = FALSE; -#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1021 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = ascending; -#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1021 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp4_) { -#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_filename_ascending_comparator_comparator; -#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7479 "MediaPage.c" +#line 7395 "MediaPage.c" } else { -#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_filename_descending_comparator_comparator; -#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7495 "MediaPage.c" +#line 7411 "MediaPage.c" } -#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); -#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = NULL; -#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = _thumbnail_filename_comparator_predicate_comparator_predicate; -#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7513 "MediaPage.c" +#line 7429 "MediaPage.c" } default: { gint _tmp5_ = 0; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp5_ = media_page_get_menu_sort_by (self); -#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp6_ = g_strdup_printf ("%i", _tmp5_); -#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp7_ = _tmp6_; -#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" - g_debug ("MediaPage.vala:1029: Unknown sort criteria: %s", _tmp7_); -#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala" + g_debug ("MediaPage.vala:1028: Unknown sort criteria: %s", _tmp7_); +#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_free0 (_tmp7_); -#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = _thumbnail_title_descending_comparator_comparator; -#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); -#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = NULL; -#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = _thumbnail_title_comparator_predicate_comparator_predicate; -#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala" break; -#line 7560 "MediaPage.c" +#line 7476 "MediaPage.c" } } -#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp9_ = _tmp8_; -#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = comparator; -#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10__target = comparator_target; -#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp11_ = predicate; -#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp11__target = predicate_target; -#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), _tmp10_, _tmp10__target, _tmp11_, _tmp11__target); -#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp9_); -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" (predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL); -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate = NULL; -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target = NULL; -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" predicate_target_destroy_notify = NULL; -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" (comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL); -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator = NULL; -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target = NULL; -#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala" comparator_target_destroy_notify = NULL; -#line 7595 "MediaPage.c" +#line 7511 "MediaPage.c" } @@ -7600,106 +7516,106 @@ void media_page_sync_sort (MediaPage* self) { gint sort_by = 0; gboolean _tmp0_ = FALSE; gint _tmp1_ = 0; -#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1037 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); -#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_); -#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala" sort_ascending = _tmp0_; -#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala" sort_by = _tmp1_; -#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1056 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_menu_sort_by (self, sort_by); -#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_menu_sort_order (self, sort_ascending); -#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_view_comparator (self, sort_by, sort_ascending); -#line 7618 "MediaPage.c" +#line 7534 "MediaPage.c" } static void media_page_real_destroy (GtkWidget* base) { MediaPage * self; -#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage); -#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_disconnect_slider (self); -#line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1065 "/home/jens/Source/shotwell/src/MediaPage.vala" GTK_WIDGET_CLASS (media_page_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), gtk_widget_get_type (), GtkWidget)); -#line 7630 "MediaPage.c" +#line 7546 "MediaPage.c" } void media_page_increase_zoom_level (MediaPage* self) { MediaPageZoomSliderAssembly* _tmp0_ = NULL; -#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); -#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = self->priv->connected_slider; -#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ != NULL) { -#line 7642 "MediaPage.c" +#line 7558 "MediaPage.c" MediaPageZoomSliderAssembly* _tmp1_ = NULL; -#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = self->priv->connected_slider; -#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_zoom_slider_assembly_increase_step (_tmp1_); -#line 7648 "MediaPage.c" +#line 7564 "MediaPage.c" } else { gint new_scale = 0; gint _tmp2_ = 0; gint _tmp3_ = 0; gint _tmp4_ = 0; -#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = media_page_get_thumb_size (self); -#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = media_page_compute_zoom_scale_increase (_tmp2_); -#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala" new_scale = _tmp3_; -#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_save_persistent_thumbnail_scale (self); -#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = new_scale; -#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_thumb_size (self, _tmp4_); -#line 7666 "MediaPage.c" +#line 7582 "MediaPage.c" } } void media_page_decrease_zoom_level (MediaPage* self) { MediaPageZoomSliderAssembly* _tmp0_ = NULL; -#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); -#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = self->priv->connected_slider; -#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_ != NULL) { -#line 7679 "MediaPage.c" +#line 7595 "MediaPage.c" MediaPageZoomSliderAssembly* _tmp1_ = NULL; -#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = self->priv->connected_slider; -#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_zoom_slider_assembly_decrease_step (_tmp1_); -#line 7685 "MediaPage.c" +#line 7601 "MediaPage.c" } else { gint new_scale = 0; gint _tmp2_ = 0; gint _tmp3_ = 0; gint _tmp4_ = 0; -#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = media_page_get_thumb_size (self); -#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = media_page_compute_zoom_scale_decrease (_tmp2_); -#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala" new_scale = _tmp3_; -#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_save_persistent_thumbnail_scale (self); -#line 1085 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = new_scale; -#line 1085 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_set_thumb_size (self, _tmp4_); -#line 7703 "MediaPage.c" +#line 7619 "MediaPage.c" } } @@ -7709,28 +7625,28 @@ static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource* DataSource* _tmp0_ = NULL; gint _tmp1_ = 0; Thumbnail* _tmp2_ = NULL; -#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); -#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = source; -#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = media_page_get_thumb_size (self); -#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_); -#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); -#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7725 "MediaPage.c" +#line 7641 "MediaPage.c" } DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source) { -#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL); -#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala" return MEDIA_PAGE_GET_CLASS (self)->create_thumbnail (self, source); -#line 7734 "MediaPage.c" +#line 7650 "MediaPage.c" } @@ -7761,104 +7677,104 @@ void media_page_set_thumb_size (MediaPage* self, gint new_scale) { gint _tmp24_ = 0; gint _tmp25_ = 0; gint _tmp26_ = 0; -#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1094 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_if_fail (IS_MEDIA_PAGE (self)); -#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = media_page_get_thumb_size (self); -#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = new_scale; -#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp1_ == _tmp2_) { -#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = TRUE; -#line 7775 "MediaPage.c" +#line 7691 "MediaPage.c" } else { gboolean _tmp3_ = FALSE; -#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = !_tmp3_; -#line 7782 "MediaPage.c" +#line 7698 "MediaPage.c" } -#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp0_) { -#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 7788 "MediaPage.c" +#line 7704 "MediaPage.c" } -#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = new_scale; -#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp5_ = thumbnail_get_MIN_SCALE (); -#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp6_ = _tmp5_; -#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp7_ = thumbnail_get_MAX_SCALE (); -#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp8_ = _tmp7_; -#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp9_ = CLAMP (_tmp4_, _tmp6_, _tmp8_); -#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala" new_scale = _tmp9_; -#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp11_ = _tmp10_; -#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp12_ = new_scale; -#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" checkerboard_layout_set_scale (_tmp11_, _tmp12_); -#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp11_); -#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp14_ = _tmp13_; -#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp14_); -#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp16_ = _tmp15_; -#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp17_ = new_scale; -#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" g_value_init (&_tmp18_, G_TYPE_INT); -#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" g_value_set_int (&_tmp18_, _tmp17_); -#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp18_, NULL, NULL); -#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" G_IS_VALUE (&_tmp18_) ? (g_value_unset (&_tmp18_), NULL) : NULL; -#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp16_); -#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp20_ = _tmp19_; -#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection)); -#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala" _data_collection_unref0 (_tmp20_); -#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp21_ = new_scale; -#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp22_ = thumbnail_get_MAX_SCALE (); -#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp23_ = _tmp22_; -#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp21_ < _tmp23_); -#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp24_ = new_scale; -#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp25_ = thumbnail_get_MIN_SCALE (); -#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp26_ = _tmp25_; -#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp24_ > _tmp26_); -#line 7862 "MediaPage.c" +#line 7778 "MediaPage.c" } @@ -7872,59 +7788,59 @@ gint media_page_get_thumb_size (MediaPage* self) { CheckerboardLayout* _tmp10_ = NULL; gint _tmp11_ = 0; gint _tmp12_ = 0; -#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1110 "/home/jens/Source/shotwell/src/MediaPage.vala" g_return_val_if_fail (IS_MEDIA_PAGE (self), 0); -#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp0_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp1_ = _tmp0_; -#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = checkerboard_layout_get_scale (_tmp1_); -#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp3_ = _tmp2_ <= 0; -#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp1_); -#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala" if (_tmp3_) { -#line 7890 "MediaPage.c" +#line 7806 "MediaPage.c" CheckerboardLayout* _tmp4_ = NULL; CheckerboardLayout* _tmp5_ = NULL; ConfigFacade* _tmp6_ = NULL; ConfigFacade* _tmp7_ = NULL; gint _tmp8_ = 0; -#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp5_ = _tmp4_; -#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp6_ = config_facade_get_instance (); -#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp7_ = _tmp6_; -#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp8_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" checkerboard_layout_set_scale (_tmp5_, _tmp8_); -#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp7_); -#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp5_); -#line 7912 "MediaPage.c" +#line 7828 "MediaPage.c" } -#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp9_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp10_ = _tmp9_; -#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp11_ = checkerboard_layout_get_scale (_tmp10_); -#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp12_ = _tmp11_; -#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala" _g_object_unref0 (_tmp10_); -#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala" result = _tmp12_; -#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala" +#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7928 "MediaPage.c" +#line 7844 "MediaPage.c" } @@ -7933,14 +7849,14 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_ result = media_page_zoom_slider_assembly_on_zoom_out_pressed ((MediaPageZoomSliderAssembly*) self, event); #line 144 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7937 "MediaPage.c" +#line 7853 "MediaPage.c" } static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala" media_page_zoom_slider_assembly_on_slider_changed ((MediaPageZoomSliderAssembly*) self); -#line 7944 "MediaPage.c" +#line 7860 "MediaPage.c" } @@ -7949,7 +7865,7 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_b result = media_page_zoom_slider_assembly_on_zoom_in_pressed ((MediaPageZoomSliderAssembly*) self, event); #line 168 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 7953 "MediaPage.c" +#line 7869 "MediaPage.c" } @@ -8131,14 +8047,14 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob _g_object_unref0 (zoom_group); #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala" return self; -#line 8135 "MediaPage.c" +#line 8051 "MediaPage.c" } MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_new (void) { #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala" return media_page_zoom_slider_assembly_construct (MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY); -#line 8142 "MediaPage.c" +#line 8058 "MediaPage.c" } @@ -8179,7 +8095,7 @@ gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) { result = (gdouble) ((_tmp6_ - _tmp8_) / MEDIA_PAGE_SLIDER_STEPPING); #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 8183 "MediaPage.c" +#line 8099 "MediaPage.c" } @@ -8217,7 +8133,7 @@ gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value) { result = res; #line 188 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 8221 "MediaPage.c" +#line 8137 "MediaPage.c" } @@ -8233,7 +8149,7 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZo result = TRUE; #line 193 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 8237 "MediaPage.c" +#line 8153 "MediaPage.c" } @@ -8249,7 +8165,7 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoo result = TRUE; #line 198 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 8253 "MediaPage.c" +#line 8169 "MediaPage.c" } @@ -8258,7 +8174,7 @@ static void media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSlid g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self)); #line 202 "/home/jens/Source/shotwell/src/MediaPage.vala" g_signal_emit_by_name (self, "zoom-changed"); -#line 8262 "MediaPage.c" +#line 8178 "MediaPage.c" } @@ -8279,7 +8195,7 @@ void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* s _tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_); #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_); -#line 8283 "MediaPage.c" +#line 8199 "MediaPage.c" } @@ -8300,7 +8216,7 @@ void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* s _tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_); #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_); -#line 8304 "MediaPage.c" +#line 8220 "MediaPage.c" } @@ -8329,7 +8245,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* if (_tmp2_ == _tmp3_) { #line 217 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 8333 "MediaPage.c" +#line 8249 "MediaPage.c" } #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = self->priv->slider; @@ -8339,7 +8255,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* _tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_); #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_); -#line 8343 "MediaPage.c" +#line 8259 "MediaPage.c" } @@ -8368,7 +8284,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* if (_tmp2_ == _tmp3_) { #line 226 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 8372 "MediaPage.c" +#line 8288 "MediaPage.c" } #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp4_ = self->priv->slider; @@ -8378,7 +8294,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* _tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_); #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_); -#line 8382 "MediaPage.c" +#line 8298 "MediaPage.c" } @@ -8399,7 +8315,7 @@ gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* sel result = _tmp2_; #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala" return result; -#line 8403 "MediaPage.c" +#line 8319 "MediaPage.c" } @@ -8419,7 +8335,7 @@ void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* sel if (_tmp0_ == _tmp1_) { #line 237 "/home/jens/Source/shotwell/src/MediaPage.vala" return; -#line 8423 "MediaPage.c" +#line 8339 "MediaPage.c" } #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp2_ = self->priv->slider; @@ -8429,7 +8345,7 @@ void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* sel _tmp4_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp3_); #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp4_); -#line 8433 "MediaPage.c" +#line 8349 "MediaPage.c" } @@ -8442,14 +8358,14 @@ static void media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssem G_OBJECT_CLASS (klass)->finalize = media_page_zoom_slider_assembly_finalize; #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" g_signal_new ("zoom_changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 8446 "MediaPage.c" +#line 8362 "MediaPage.c" } static void media_page_zoom_slider_assembly_instance_init (MediaPageZoomSliderAssembly * self) { #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv = MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_GET_PRIVATE (self); -#line 8453 "MediaPage.c" +#line 8369 "MediaPage.c" } @@ -8463,7 +8379,7 @@ static void media_page_zoom_slider_assembly_finalize (GObject* obj) { _g_object_unref0 (self->priv->adjustment); #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (media_page_zoom_slider_assembly_parent_class)->finalize (obj); -#line 8467 "MediaPage.c" +#line 8383 "MediaPage.c" } @@ -8562,7 +8478,7 @@ static void media_page_class_init (MediaPageClass * klass) { ((MediaPageClass *) klass)->create_thumbnail = media_page_real_create_thumbnail; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (klass)->finalize = media_page_finalize; -#line 8566 "MediaPage.c" +#line 8482 "MediaPage.c" } @@ -8573,7 +8489,7 @@ static void media_page_instance_init (MediaPage * self) { self->priv->connected_slider = NULL; #line 244 "/home/jens/Source/shotwell/src/MediaPage.vala" self->priv->dnd_handler = NULL; -#line 8577 "MediaPage.c" +#line 8493 "MediaPage.c" } @@ -8589,7 +8505,7 @@ static void media_page_finalize (GObject* obj) { _core_tracker_unref0 (self->priv->tracker); #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (media_page_parent_class)->finalize (obj); -#line 8593 "MediaPage.c" +#line 8509 "MediaPage.c" } |