From 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 2 Jan 2017 11:24:12 +0100 Subject: New upstream version 0.25.2 --- src/camera/ImportPage.c | 1067 +++++++++++++++++++++++------------------------ 1 file changed, 529 insertions(+), 538 deletions(-) (limited to 'src/camera/ImportPage.c') diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c index be81b96..928a456 100644 --- a/src/camera/ImportPage.c +++ b/src/camera/ImportPage.c @@ -1,4 +1,4 @@ -/* ImportPage.c generated by valac 0.34.2, the Vala compiler +/* ImportPage.c generated by valac 0.32.1, the Vala compiler * generated from ImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1883,7 +1883,7 @@ GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); GAction* page_get_action (Page* self, const gchar* name); gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self); -static GVariant* _variant_new11 (gboolean value); +static GVariant* _variant_new15 (gboolean value); Camera* import_page_get_camera (ImportPage* self); gchar* import_page_get_uri (ImportPage* self); gboolean import_page_is_busy (ImportPage* self); @@ -5621,9 +5621,9 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0); #line 761 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/ImportContextMenu"); + checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu"); #line 762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/ImportContextMenu"); + checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu"); #line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; #line 5629 "ImportPage.c" @@ -6097,7 +6097,7 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_ } -static GVariant* _variant_new11 (gboolean value) { +static GVariant* _variant_new15 (gboolean value) { #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); #line 6103 "ImportPage.c" @@ -6109,12 +6109,11 @@ static void import_page_real_add_actions (Page* base) { AppWindow* _tmp0_ = NULL; AppWindow* _tmp1_ = NULL; GAction* _tmp2_ = NULL; - GSimpleAction* _tmp3_ = NULL; - GSimpleAction* _tmp4_ = NULL; + GAction* _tmp3_ = NULL; + ConfigFacade* _tmp4_ = NULL; ConfigFacade* _tmp5_ = NULL; - ConfigFacade* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GVariant* _tmp8_ = NULL; + gboolean _tmp6_ = FALSE; + GVariant* _tmp7_ = NULL; #line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage); #line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6130,32 +6129,24 @@ static void import_page_real_add_actions (Page* base) { #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle"); #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL; -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - if (_tmp3_ == NULL) { -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp2_); -#line 6138 "ImportPage.c" - } -#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp5_ = config_facade_get_instance (); + _tmp4_ = config_facade_get_instance (); #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp7_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp6_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _tmp8_ = _variant_new11 (_tmp7_); + _tmp7_ = _variant_new15 (_tmp6_); #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - g_simple_action_set_state (_tmp4_, _tmp8_); + g_action_change_state (_tmp3_, _tmp7_); #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_variant_unref0 (_tmp8_); + _g_variant_unref0 (_tmp7_); #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" - _g_object_unref0 (_tmp4_); -#line 6158 "ImportPage.c" + _g_object_unref0 (_tmp3_); +#line 6149 "ImportPage.c" } @@ -6173,7 +6164,7 @@ Camera* import_page_get_camera (ImportPage* self) { result = _tmp1_; #line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6176 "ImportPage.c" +#line 6167 "ImportPage.c" } @@ -6191,7 +6182,7 @@ gchar* import_page_get_uri (ImportPage* self) { result = _tmp1_; #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6194 "ImportPage.c" +#line 6185 "ImportPage.c" } @@ -6206,7 +6197,7 @@ gboolean import_page_is_busy (ImportPage* self) { result = _tmp0_; #line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6209 "ImportPage.c" +#line 6200 "ImportPage.c" } @@ -6228,7 +6219,7 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint _tmp1_ = count; #line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" PAGE_CLASS (import_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); -#line 6231 "ImportPage.c" +#line 6222 "ImportPage.c" } @@ -6242,23 +6233,23 @@ gboolean import_page_is_refreshed (ImportPage* self) { _tmp1_ = self->priv->refreshed; #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 6245 "ImportPage.c" +#line 6236 "ImportPage.c" gboolean _tmp2_ = FALSE; #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = !_tmp2_; -#line 6251 "ImportPage.c" +#line 6242 "ImportPage.c" } else { #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 6255 "ImportPage.c" +#line 6246 "ImportPage.c" } #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6261 "ImportPage.c" +#line 6252 "ImportPage.c" } @@ -6274,7 +6265,7 @@ gchar* import_page_get_refresh_message (ImportPage* self) { _tmp0_ = self->priv->refresh_error; #line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 6277 "ImportPage.c" +#line 6268 "ImportPage.c" const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; #line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6285,14 +6276,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) { _g_free0 (msg); #line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" msg = _tmp2_; -#line 6288 "ImportPage.c" +#line 6279 "ImportPage.c" } else { int _tmp3_ = 0; #line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->refresh_result; #line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp3_ == GP_OK) { -#line 6295 "ImportPage.c" +#line 6286 "ImportPage.c" } else { int _tmp4_ = 0; gchar* _tmp5_ = NULL; @@ -6304,14 +6295,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) { _g_free0 (msg); #line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" msg = _tmp5_; -#line 6307 "ImportPage.c" +#line 6298 "ImportPage.c" } } #line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = msg; #line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6314 "ImportPage.c" +#line 6305 "ImportPage.c" } @@ -6330,7 +6321,7 @@ static void import_page_update_status (ImportPage* self, gboolean busy, gboolean self->priv->refreshed = _tmp1_; #line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 6333 "ImportPage.c" +#line 6324 "ImportPage.c" } @@ -6342,7 +6333,7 @@ static void import_page_update_toolbar_state (ImportPage* self) { _tmp0_ = self->priv->hide_imported; #line 929 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_ != NULL) { -#line 6345 "ImportPage.c" +#line 6336 "ImportPage.c" gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; @@ -6351,21 +6342,21 @@ static void import_page_update_toolbar_state (ImportPage* self) { _tmp3_ = self->priv->busy; #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp3_) { -#line 6354 "ImportPage.c" +#line 6345 "ImportPage.c" gboolean _tmp4_ = FALSE; #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = self->priv->refreshed; #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp4_; -#line 6360 "ImportPage.c" +#line 6351 "ImportPage.c" } else { #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = FALSE; -#line 6364 "ImportPage.c" +#line 6355 "ImportPage.c" } #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_) { -#line 6368 "ImportPage.c" +#line 6359 "ImportPage.c" ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; gint _tmp7_ = 0; @@ -6379,17 +6370,17 @@ static void import_page_update_toolbar_state (ImportPage* self) { _tmp1_ = _tmp7_ > 0; #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp6_); -#line 6382 "ImportPage.c" +#line 6373 "ImportPage.c" } else { #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = FALSE; -#line 6386 "ImportPage.c" +#line 6377 "ImportPage.c" } #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = self->priv->hide_imported; #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 6392 "ImportPage.c" +#line 6383 "ImportPage.c" } } @@ -6409,21 +6400,21 @@ static void import_page_on_view_changed (ImportPage* self) { _tmp2_ = self->priv->busy; #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp2_) { -#line 6412 "ImportPage.c" +#line 6403 "ImportPage.c" gboolean _tmp3_ = FALSE; #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = self->priv->refreshed; #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _tmp3_; -#line 6418 "ImportPage.c" +#line 6409 "ImportPage.c" } else { #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = FALSE; -#line 6422 "ImportPage.c" +#line 6413 "ImportPage.c" } #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 6426 "ImportPage.c" +#line 6417 "ImportPage.c" ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; gint _tmp6_ = 0; @@ -6437,11 +6428,11 @@ static void import_page_on_view_changed (ImportPage* self) { _tmp0_ = _tmp6_ > 0; #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp5_); -#line 6440 "ImportPage.c" +#line 6431 "ImportPage.c" } else { #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 6444 "ImportPage.c" +#line 6435 "ImportPage.c" } #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_); @@ -6449,21 +6440,21 @@ static void import_page_on_view_changed (ImportPage* self) { _tmp9_ = self->priv->busy; #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp9_) { -#line 6452 "ImportPage.c" +#line 6443 "ImportPage.c" gboolean _tmp10_ = FALSE; #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = self->priv->refreshed; #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = _tmp10_; -#line 6458 "ImportPage.c" +#line 6449 "ImportPage.c" } else { #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = FALSE; -#line 6462 "ImportPage.c" +#line 6453 "ImportPage.c" } #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp8_) { -#line 6466 "ImportPage.c" +#line 6457 "ImportPage.c" ViewCollection* _tmp11_ = NULL; ViewCollection* _tmp12_ = NULL; gint _tmp13_ = 0; @@ -6477,11 +6468,11 @@ static void import_page_on_view_changed (ImportPage* self) { _tmp7_ = _tmp13_ > 0; #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp12_); -#line 6480 "ImportPage.c" +#line 6471 "ImportPage.c" } else { #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp7_ = FALSE; -#line 6484 "ImportPage.c" +#line 6475 "ImportPage.c" } #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_); @@ -6489,7 +6480,7 @@ static void import_page_on_view_changed (ImportPage* self) { _tmp15_ = self->priv->busy; #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp15_) { -#line 6492 "ImportPage.c" +#line 6483 "ImportPage.c" ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; gint _tmp18_ = 0; @@ -6503,17 +6494,17 @@ static void import_page_on_view_changed (ImportPage* self) { _tmp14_ = _tmp18_ > 0; #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp17_); -#line 6506 "ImportPage.c" +#line 6497 "ImportPage.c" } else { #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp14_ = FALSE; -#line 6510 "ImportPage.c" +#line 6501 "ImportPage.c" } #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_); #line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_toolbar_state (self); -#line 6516 "ImportPage.c" +#line 6507 "ImportPage.c" } @@ -6525,7 +6516,7 @@ static void import_page_on_media_added_removed (ImportPage* self) { _tmp0_ = self->priv->search_filter; #line 942 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 6528 "ImportPage.c" +#line 6519 "ImportPage.c" } @@ -6563,7 +6554,7 @@ static void import_page_on_display_titles (ImportPage* self, GSimpleAction* acti _tmp5_ = value; #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 6566 "ImportPage.c" +#line 6557 "ImportPage.c" } @@ -6586,7 +6577,7 @@ static void import_page_real_switched_to (Page* base) { _g_object_unref0 (_tmp1_); #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" PAGE_CLASS (import_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 6589 "ImportPage.c" +#line 6580 "ImportPage.c" } @@ -6601,7 +6592,7 @@ static void import_page_real_ready (Page* base) { _tmp0_ = self->priv->hide_imported_filter; #line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 6604 "ImportPage.c" +#line 6595 "ImportPage.c" } @@ -6620,20 +6611,20 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o if (_tmp1_) { #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; -#line 6623 "ImportPage.c" +#line 6614 "ImportPage.c" } else { gboolean _tmp2_ = FALSE; #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = self->priv->busy; #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp2_; -#line 6630 "ImportPage.c" +#line 6621 "ImportPage.c" } #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { #line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 6636 "ImportPage.c" +#line 6627 "ImportPage.c" } #line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = import_page_refresh_camera (self); @@ -6647,15 +6638,15 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o case IMPORT_PAGE_REFRESH_RESULT_OK: #line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_BUSY: -#line 6650 "ImportPage.c" +#line 6641 "ImportPage.c" { #line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6654 "ImportPage.c" +#line 6645 "ImportPage.c" } #line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_LOCKED: -#line 6658 "ImportPage.c" +#line 6649 "ImportPage.c" { gboolean _tmp5_ = FALSE; const gchar* _tmp6_ = NULL; @@ -6672,7 +6663,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL); #line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6675 "ImportPage.c" +#line 6666 "ImportPage.c" } #line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = self->priv->uri; @@ -6686,7 +6677,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o uri = _tmp8_; #line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" mount = NULL; -#line 6689 "ImportPage.c" +#line 6680 "ImportPage.c" { GMount* _tmp9_ = NULL; GFile* _tmp10_ = NULL; @@ -6700,7 +6691,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _tmp9_ = _tmp11_; #line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6703 "ImportPage.c" +#line 6694 "ImportPage.c" goto __catch62_g_error; } #line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6713,7 +6704,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o mount = _tmp12_; #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp9_); -#line 6716 "ImportPage.c" +#line 6707 "ImportPage.c" } goto __finally62; __catch62_g_error: @@ -6725,7 +6716,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _inner_error_ = NULL; #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 6728 "ImportPage.c" +#line 6719 "ImportPage.c" } __finally62: #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -6740,13 +6731,13 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o g_clear_error (&_inner_error_); #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 6743 "ImportPage.c" +#line 6734 "ImportPage.c" } #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = mount; #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp13_ != NULL) { -#line 6749 "ImportPage.c" +#line 6740 "ImportPage.c" gchar* mounted_message = NULL; const gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; @@ -6811,26 +6802,26 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _tmp27_ = dialog_res; #line 1009 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) { -#line 6813 "ImportPage.c" +#line 6804 "ImportPage.c" const gchar* _tmp28_ = NULL; #line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = _ ("Please unmount the camera."); #line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp28_); -#line 6819 "ImportPage.c" +#line 6810 "ImportPage.c" } else { GMount* _tmp29_ = NULL; #line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = mount; #line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_unmount_camera (self, _tmp29_); -#line 6826 "ImportPage.c" +#line 6817 "ImportPage.c" } #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (dialog); #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (mounted_message); -#line 6832 "ImportPage.c" +#line 6823 "ImportPage.c" } else { gchar* locked_message = NULL; const gchar* _tmp30_ = NULL; @@ -6889,7 +6880,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _g_object_unref0 (dialog); #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (locked_message); -#line 6889 "ImportPage.c" +#line 6880 "ImportPage.c" } #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); @@ -6897,11 +6888,11 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _g_object_unref0 (uri); #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6897 "ImportPage.c" +#line 6888 "ImportPage.c" } #line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR: -#line 6901 "ImportPage.c" +#line 6892 "ImportPage.c" { const gchar* _tmp41_ = NULL; gchar* _tmp42_ = NULL; @@ -6926,7 +6917,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _g_free0 (_tmp43_); #line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 6926 "ImportPage.c" +#line 6917 "ImportPage.c" } default: { @@ -6935,7 +6926,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o _tmp46_ = res; #line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_error ("ImportPage.vala:1035: Unknown result type %d", (gint) _tmp46_); -#line 6935 "ImportPage.c" +#line 6926 "ImportPage.c" } } } @@ -6944,7 +6935,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) { #line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_unmounted ((ImportPage*) self, _sender); -#line 6944 "ImportPage.c" +#line 6935 "ImportPage.c" } @@ -6953,7 +6944,7 @@ static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* sou import_page_on_unmount_finished ((ImportPage*) self, source_object, res); #line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_object_unref (self); -#line 6953 "ImportPage.c" +#line 6944 "ImportPage.c" } @@ -6983,7 +6974,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) { result = FALSE; #line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 6983 "ImportPage.c" +#line 6974 "ImportPage.c" } #line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, TRUE, FALSE); @@ -7031,7 +7022,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) { result = TRUE; #line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7031 "ImportPage.c" +#line 7022 "ImportPage.c" } @@ -7054,7 +7045,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount)); #line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" mount = _tmp1_; -#line 7054 "ImportPage.c" +#line 7045 "ImportPage.c" { GAsyncResult* _tmp2_ = NULL; #line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7063,7 +7054,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_); #line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7063 "ImportPage.c" +#line 7054 "ImportPage.c" goto __catch63_g_error; } } @@ -7104,7 +7095,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 7104 "ImportPage.c" +#line 7095 "ImportPage.c" } __finally63: #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7117,11 +7108,11 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source, g_clear_error (&_inner_error_); #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 7117 "ImportPage.c" +#line 7108 "ImportPage.c" } #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (mount); -#line 7121 "ImportPage.c" +#line 7112 "ImportPage.c" } @@ -7154,7 +7145,7 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) { gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_try_refreshing_camera (self, TRUE); -#line 7154 "ImportPage.c" +#line 7145 "ImportPage.c" } @@ -7179,7 +7170,7 @@ static void import_page_clear_all_import_sources (ImportPage* self) { source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL); #line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (marker); -#line 7179 "ImportPage.c" +#line 7170 "ImportPage.c" } @@ -7251,7 +7242,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _g_free0 (fulldir); #line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7251 "ImportPage.c" +#line 7242 "ImportPage.c" } #line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = self->priv->camera; @@ -7279,7 +7270,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _g_free0 (fulldir); #line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7279 "ImportPage.c" +#line 7270 "ImportPage.c" } #line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = folders; @@ -7287,19 +7278,19 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _tmp16_ = gp_list_count (_tmp15_); #line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" list_len = _tmp16_; -#line 7287 "ImportPage.c" +#line 7278 "ImportPage.c" { gint list_index = 0; #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" list_index = 0; -#line 7292 "ImportPage.c" +#line 7283 "ImportPage.c" { gboolean _tmp17_ = FALSE; #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = TRUE; #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 7299 "ImportPage.c" +#line 7290 "ImportPage.c" gint _tmp19_ = 0; gint _tmp20_ = 0; gchar* tmp = NULL; @@ -7311,13 +7302,13 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* _tmp26_ = NULL; #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp17_) { -#line 7311 "ImportPage.c" +#line 7302 "ImportPage.c" gint _tmp18_ = 0; #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp18_ = list_index; #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" list_index = _tmp18_ + 1; -#line 7317 "ImportPage.c" +#line 7308 "ImportPage.c" } #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = FALSE; @@ -7329,7 +7320,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, if (!(_tmp19_ < _tmp20_)) { #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7329 "ImportPage.c" +#line 7320 "ImportPage.c" } #line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = folders; @@ -7359,11 +7350,11 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _g_free0 (fulldir); #line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7359 "ImportPage.c" +#line 7350 "ImportPage.c" } #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (tmp); -#line 7363 "ImportPage.c" +#line 7354 "ImportPage.c" } } } @@ -7375,7 +7366,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, _g_free0 (fulldir); #line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7375 "ImportPage.c" +#line 7366 "ImportPage.c" } @@ -7430,7 +7421,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { result = IMPORT_PAGE_REFRESH_RESULT_BUSY; #line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7430 "ImportPage.c" +#line 7421 "ImportPage.c" } #line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = _ ("Starting import, please wait…"); @@ -7458,7 +7449,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp7_ = self->priv->refresh_result; #line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp7_ != GP_OK) { -#line 7458 "ImportPage.c" +#line 7449 "ImportPage.c" int _tmp8_ = 0; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; @@ -7480,17 +7471,17 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { if (_tmp12_ == GP_ERROR_IO_LOCK) { #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED; -#line 7480 "ImportPage.c" +#line 7471 "ImportPage.c" } else { #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR; -#line 7484 "ImportPage.c" +#line 7475 "ImportPage.c" } #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp11_; #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7490 "ImportPage.c" +#line 7481 "ImportPage.c" } #line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = self->priv->refreshed; @@ -7544,19 +7535,19 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp26_ = self->priv->refresh_result; #line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp26_ == GP_OK) { -#line 7544 "ImportPage.c" +#line 7535 "ImportPage.c" { gint fsid = 0; #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" fsid = 0; -#line 7549 "ImportPage.c" +#line 7540 "ImportPage.c" { gboolean _tmp27_ = FALSE; #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = TRUE; #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 7556 "ImportPage.c" +#line 7547 "ImportPage.c" gint _tmp29_ = 0; gint _tmp30_ = 0; gboolean got_well_known_dir = FALSE; @@ -7583,13 +7574,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { gboolean _tmp71_ = FALSE; #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp27_) { -#line 7583 "ImportPage.c" +#line 7574 "ImportPage.c" gint _tmp28_ = 0; #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp28_ = fsid; #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" fsid = _tmp28_ + 1; -#line 7589 "ImportPage.c" +#line 7580 "ImportPage.c" } #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp27_ = FALSE; @@ -7601,7 +7592,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { if (!(_tmp29_ < _tmp30_)) { #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7601 "ImportPage.c" +#line 7592 "ImportPage.c" } #line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = FALSE; @@ -7611,7 +7602,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM"); #line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp32_) { -#line 7611 "ImportPage.c" +#line 7602 "ImportPage.c" gint _tmp33_ = 0; GeeArrayList* _tmp34_ = NULL; #line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7622,7 +7613,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_); #line 1175 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7622 "ImportPage.c" +#line 7613 "ImportPage.c" } #line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp35_ = fsid; @@ -7630,7 +7621,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim"); #line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp36_) { -#line 7630 "ImportPage.c" +#line 7621 "ImportPage.c" gint _tmp37_ = 0; GeeArrayList* _tmp38_ = NULL; #line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7641,7 +7632,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_); #line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7641 "ImportPage.c" +#line 7632 "ImportPage.c" } #line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = fsid; @@ -7649,7 +7640,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD"); #line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp40_) { -#line 7649 "ImportPage.c" +#line 7640 "ImportPage.c" gint _tmp41_ = 0; GeeArrayList* _tmp42_ = NULL; #line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7660,7 +7651,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_); #line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7660 "ImportPage.c" +#line 7651 "ImportPage.c" } #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp43_ = fsid; @@ -7668,7 +7659,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd"); #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp44_) { -#line 7668 "ImportPage.c" +#line 7659 "ImportPage.c" gint _tmp45_ = 0; GeeArrayList* _tmp46_ = NULL; #line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7679,7 +7670,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_); #line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7679 "ImportPage.c" +#line 7670 "ImportPage.c" } #line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp47_ = fsid; @@ -7687,7 +7678,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD"); #line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp48_) { -#line 7687 "ImportPage.c" +#line 7678 "ImportPage.c" gint _tmp49_ = 0; GeeArrayList* _tmp50_ = NULL; #line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7698,7 +7689,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_); #line 1194 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7698 "ImportPage.c" +#line 7689 "ImportPage.c" } #line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp51_ = fsid; @@ -7706,7 +7697,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd"); #line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp52_) { -#line 7706 "ImportPage.c" +#line 7697 "ImportPage.c" gint _tmp53_ = 0; GeeArrayList* _tmp54_ = NULL; #line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7717,7 +7708,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_); #line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7717 "ImportPage.c" +#line 7708 "ImportPage.c" } #line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = fsid; @@ -7725,7 +7716,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY"); #line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp56_) { -#line 7725 "ImportPage.c" +#line 7716 "ImportPage.c" gint _tmp57_ = 0; GeeArrayList* _tmp58_ = NULL; #line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7736,7 +7727,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_); #line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7736 "ImportPage.c" +#line 7727 "ImportPage.c" } #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp59_ = fsid; @@ -7744,7 +7735,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony"); #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp60_) { -#line 7744 "ImportPage.c" +#line 7735 "ImportPage.c" gint _tmp61_ = 0; GeeArrayList* _tmp62_ = NULL; #line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7755,7 +7746,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_); #line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7755 "ImportPage.c" +#line 7746 "ImportPage.c" } #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp63_ = fsid; @@ -7763,7 +7754,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT"); #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp64_) { -#line 7763 "ImportPage.c" +#line 7754 "ImportPage.c" gint _tmp65_ = 0; GeeArrayList* _tmp66_ = NULL; #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7774,7 +7765,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_); #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7774 "ImportPage.c" +#line 7765 "ImportPage.c" } #line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp67_ = fsid; @@ -7782,7 +7773,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root"); #line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp68_) { -#line 7782 "ImportPage.c" +#line 7773 "ImportPage.c" gint _tmp69_ = 0; GeeArrayList* _tmp70_ = NULL; #line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7793,13 +7784,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_); #line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" got_well_known_dir = TRUE; -#line 7793 "ImportPage.c" +#line 7784 "ImportPage.c" } #line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp71_ = got_well_known_dir; #line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp71_) { -#line 7799 "ImportPage.c" +#line 7790 "ImportPage.c" gint _tmp72_ = 0; GeeArrayList* _tmp73_ = NULL; gboolean _tmp74_ = FALSE; @@ -7813,7 +7804,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { if (!_tmp74_) { #line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 7813 "ImportPage.c" +#line 7804 "ImportPage.c" } } } @@ -7860,7 +7851,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp85_ = res; #line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp85_ != GP_OK) { -#line 7860 "ImportPage.c" +#line 7851 "ImportPage.c" int _tmp86_ = 0; gchar* _tmp87_ = NULL; gchar* _tmp88_ = NULL; @@ -7874,13 +7865,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { g_warning ("ImportPage.vala:1256: Unable to unlock camera: %s", _tmp88_); #line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp88_); -#line 7874 "ImportPage.c" +#line 7865 "ImportPage.c" } #line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp89_ = self->priv->refresh_result; #line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp89_ == GP_OK) { -#line 7880 "ImportPage.c" +#line 7871 "ImportPage.c" SourceCollection* _tmp90_ = NULL; gint _tmp91_ = 0; #line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7889,7 +7880,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _tmp91_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_DATA_COLLECTION, DataCollection)); #line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp91_ == 0) { -#line 7889 "ImportPage.c" +#line 7880 "ImportPage.c" gchar* _tmp92_ = NULL; gchar* _tmp93_ = NULL; #line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -7900,17 +7891,17 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp93_); #line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp93_); -#line 7900 "ImportPage.c" +#line 7891 "ImportPage.c" } #line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, TRUE); -#line 7904 "ImportPage.c" +#line 7895 "ImportPage.c" } else { #line 1265 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_update_status (self, FALSE, FALSE); #line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_clear_all_import_sources (self); -#line 7910 "ImportPage.c" +#line 7901 "ImportPage.c" } #line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); @@ -7920,7 +7911,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { switch (_tmp94_) { #line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case GP_OK: -#line 7920 "ImportPage.c" +#line 7911 "ImportPage.c" { #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_OK; @@ -7928,11 +7919,11 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _g_object_unref0 (import_list); #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7928 "ImportPage.c" +#line 7919 "ImportPage.c" } #line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" case GP_ERROR_IO_LOCK: -#line 7932 "ImportPage.c" +#line 7923 "ImportPage.c" { #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = IMPORT_PAGE_REFRESH_RESULT_LOCKED; @@ -7940,7 +7931,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _g_object_unref0 (import_list); #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7940 "ImportPage.c" +#line 7931 "ImportPage.c" } default: { @@ -7950,12 +7941,12 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) { _g_object_unref0 (import_list); #line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 7950 "ImportPage.c" +#line 7941 "ImportPage.c" } } #line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_list); -#line 7955 "ImportPage.c" +#line 7946 "ImportPage.c" } @@ -7963,17 +7954,17 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; -#line 7973 "ImportPage.c" +#line 7964 "ImportPage.c" } @@ -7994,105 +7985,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 8006 "ImportPage.c" +#line 7997 "ImportPage.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 8015 "ImportPage.c" +#line 8006 "ImportPage.c" } -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 8021 "ImportPage.c" +#line 8012 "ImportPage.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 8030 "ImportPage.c" +#line 8021 "ImportPage.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 8036 "ImportPage.c" +#line 8027 "ImportPage.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 8045 "ImportPage.c" +#line 8036 "ImportPage.c" } else { -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 8049 "ImportPage.c" +#line 8040 "ImportPage.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 8057 "ImportPage.c" +#line 8048 "ImportPage.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 8066 "ImportPage.c" +#line 8057 "ImportPage.c" } else { -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 8070 "ImportPage.c" +#line 8061 "ImportPage.c" } -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; -#line 8092 "ImportPage.c" +#line 8083 "ImportPage.c" } @@ -8115,7 +8106,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) { offset = (glong) _tmp2_; #line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 8115 "ImportPage.c" +#line 8106 "ImportPage.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; const gchar* _tmp5_ = NULL; @@ -8132,7 +8123,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) { if (!(_tmp4_ >= ((glong) 0))) { #line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 8132 "ImportPage.c" +#line 8123 "ImportPage.c" } #line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = str; @@ -8144,7 +8135,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) { _tmp8_ = ch; #line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp7_ != _tmp8_) { -#line 8144 "ImportPage.c" +#line 8135 "ImportPage.c" const gchar* _tmp9_ = NULL; glong _tmp10_ = 0L; gchar* _tmp11_ = NULL; @@ -8158,7 +8149,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) { result = _tmp11_; #line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8158 "ImportPage.c" +#line 8149 "ImportPage.c" } } #line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -8167,7 +8158,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) { result = _tmp12_; #line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8167 "ImportPage.c" +#line 8158 "ImportPage.c" } @@ -8186,7 +8177,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { _tmp2_ = g_str_has_suffix (_tmp1_, "/"); #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp2_) { -#line 8186 "ImportPage.c" +#line 8177 "ImportPage.c" const gchar* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -8195,15 +8186,15 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { _tmp4_ = g_str_has_prefix (_tmp3_, "/"); #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = !_tmp4_; -#line 8195 "ImportPage.c" +#line 8186 "ImportPage.c" } else { #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; -#line 8199 "ImportPage.c" +#line 8190 "ImportPage.c" } #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { -#line 8203 "ImportPage.c" +#line 8194 "ImportPage.c" const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -8228,7 +8219,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { result = _tmp10_; #line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8228 "ImportPage.c" +#line 8219 "ImportPage.c" } else { gboolean _tmp11_ = FALSE; const gchar* _tmp12_ = NULL; @@ -8239,7 +8230,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { _tmp13_ = g_str_has_suffix (_tmp12_, "/"); #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp13_) { -#line 8239 "ImportPage.c" +#line 8230 "ImportPage.c" const gchar* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -8248,15 +8239,15 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { _tmp15_ = g_str_has_prefix (_tmp14_, "/"); #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = _tmp15_; -#line 8248 "ImportPage.c" +#line 8239 "ImportPage.c" } else { #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = FALSE; -#line 8252 "ImportPage.c" +#line 8243 "ImportPage.c" } #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp11_) { -#line 8256 "ImportPage.c" +#line 8247 "ImportPage.c" const gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; @@ -8281,7 +8272,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { result = _tmp21_; #line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8281 "ImportPage.c" +#line 8272 "ImportPage.c" } else { const gchar* _tmp22_ = NULL; const gchar* _tmp23_ = NULL; @@ -8296,7 +8287,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) { result = _tmp24_; #line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8296 "ImportPage.c" +#line 8287 "ImportPage.c" } } } @@ -8348,7 +8339,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) { result = NULL; #line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8348 "ImportPage.c" +#line 8339 "ImportPage.c" } #line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = fsid; @@ -8360,7 +8351,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) { result = NULL; #line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8360 "ImportPage.c" +#line 8351 "ImportPage.c" } #line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = sifs; @@ -8374,7 +8365,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) { _tmp12_ = (*_tmp11_).fields; #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) { -#line 8374 "ImportPage.c" +#line 8365 "ImportPage.c" CameraStorageInformation* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -8383,11 +8374,11 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) { _tmp14_ = (*_tmp13_).basedir; #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = _tmp14_; -#line 8383 "ImportPage.c" +#line 8374 "ImportPage.c" } else { #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp10_ = "/"; -#line 8387 "ImportPage.c" +#line 8378 "ImportPage.c" } #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = g_strdup (_tmp10_); @@ -8395,7 +8386,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) { result = _tmp15_; #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8395 "ImportPage.c" +#line 8386 "ImportPage.c" } @@ -8430,7 +8421,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f result = NULL; #line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8430 "ImportPage.c" +#line 8421 "ImportPage.c" } #line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp3_ = camera; @@ -8444,7 +8435,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f _tmp6_ = basedir; #line 1326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp6_ == NULL) { -#line 8444 "ImportPage.c" +#line 8435 "ImportPage.c" const gchar* _tmp7_ = NULL; gint _tmp8_ = 0; const gchar* _tmp9_ = NULL; @@ -8465,7 +8456,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f _g_free0 (basedir); #line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8465 "ImportPage.c" +#line 8456 "ImportPage.c" } #line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = basedir; @@ -8479,7 +8470,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f _g_free0 (basedir); #line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8479 "ImportPage.c" +#line 8470 "ImportPage.c" } @@ -8537,7 +8528,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp5_ = fulldir; #line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_ == NULL) { -#line 8537 "ImportPage.c" +#line 8528 "ImportPage.c" const gchar* _tmp6_ = NULL; #line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = dir; @@ -8549,7 +8540,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8549 "ImportPage.c" +#line 8540 "ImportPage.c" } #line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = gp_list_new (&_tmp7_); @@ -8563,7 +8554,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp9_ = self->priv->refresh_result; #line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp9_ != GP_OK) { -#line 8563 "ImportPage.c" +#line 8554 "ImportPage.c" int _tmp10_ = 0; gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; @@ -8585,7 +8576,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8585 "ImportPage.c" +#line 8576 "ImportPage.c" } #line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp13_ = self->priv->camera; @@ -8605,7 +8596,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp19_ = self->priv->refresh_result; #line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp19_ != GP_OK) { -#line 8605 "ImportPage.c" +#line 8596 "ImportPage.c" const gchar* _tmp20_ = NULL; int _tmp21_ = 0; gchar* _tmp22_ = NULL; @@ -8632,20 +8623,20 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8632 "ImportPage.c" +#line 8623 "ImportPage.c" } { gint ctr = 0; #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = 0; -#line 8638 "ImportPage.c" +#line 8629 "ImportPage.c" { gboolean _tmp24_ = FALSE; #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = TRUE; #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 8645 "ImportPage.c" +#line 8636 "ImportPage.c" gint _tmp26_ = 0; CameraList* _tmp27_ = NULL; gint _tmp28_ = 0; @@ -8658,13 +8649,13 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const int _tmp34_ = 0; #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp24_) { -#line 8658 "ImportPage.c" +#line 8649 "ImportPage.c" gint _tmp25_ = 0; #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp25_ = ctr; #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = _tmp25_ + 1; -#line 8664 "ImportPage.c" +#line 8655 "ImportPage.c" } #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = FALSE; @@ -8678,7 +8669,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const if (!(_tmp26_ < _tmp28_)) { #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 8678 "ImportPage.c" +#line 8669 "ImportPage.c" } #line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = files; @@ -8698,7 +8689,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp34_ = self->priv->refresh_result; #line 1364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp34_ != GP_OK) { -#line 8698 "ImportPage.c" +#line 8689 "ImportPage.c" gint _tmp35_ = 0; const gchar* _tmp36_ = NULL; int _tmp37_ = 0; @@ -8728,7 +8719,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 8728 "ImportPage.c" +#line 8719 "ImportPage.c" } { CameraFileInfo info = {0}; @@ -8768,12 +8759,12 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 8768 "ImportPage.c" +#line 8759 "ImportPage.c" goto __catch64_g_error; } #line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp40_) { -#line 8773 "ImportPage.c" +#line 8764 "ImportPage.c" const gchar* _tmp48_ = NULL; const gchar* _tmp49_ = NULL; #line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -8788,7 +8779,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (filename); #line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 8788 "ImportPage.c" +#line 8779 "ImportPage.c" } #line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp50_ = info; @@ -8798,7 +8789,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp52_ = _tmp51_.fields; #line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) { -#line 8798 "ImportPage.c" +#line 8789 "ImportPage.c" const gchar* _tmp53_ = NULL; const gchar* _tmp54_ = NULL; CameraFileInfo _tmp55_ = {0}; @@ -8822,7 +8813,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (filename); #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 8822 "ImportPage.c" +#line 8813 "ImportPage.c" } #line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp58_ = filename; @@ -8830,7 +8821,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp59_ = video_reader_is_supported_video_filename (_tmp58_); #line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp59_) { -#line 8830 "ImportPage.c" +#line 8821 "ImportPage.c" VideoImportSource* video_source = NULL; const gchar* _tmp60_ = NULL; Camera* _tmp61_ = NULL; @@ -8880,7 +8871,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (video_source); -#line 8880 "ImportPage.c" +#line 8871 "ImportPage.c" } else { PhotoFileFormat file_format = 0; CameraFileInfo _tmp74_ = {0}; @@ -8917,7 +8908,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp78_ = file_format; #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) { -#line 8917 "ImportPage.c" +#line 8908 "ImportPage.c" const gchar* _tmp79_ = NULL; PhotoFileFormat _tmp80_ = 0; PhotoFileFormat _tmp81_ = 0; @@ -8931,7 +8922,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp81_ = file_format; #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) { -#line 8931 "ImportPage.c" +#line 8922 "ImportPage.c" const gchar* _tmp82_ = NULL; const gchar* _tmp83_ = NULL; CameraFileInfo _tmp84_ = {0}; @@ -8956,7 +8947,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (filename); #line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 8955 "ImportPage.c" +#line 8946 "ImportPage.c" } } #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -8993,7 +8984,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp101_); -#line 8992 "ImportPage.c" +#line 8983 "ImportPage.c" } #line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp102_ = self->priv->progress_bar; @@ -9003,7 +8994,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const spin_event_loop (); #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" (info); -#line 9002 "ImportPage.c" +#line 8993 "ImportPage.c" } goto __finally64; __catch64_g_error: @@ -9049,7 +9040,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9048 "ImportPage.c" +#line 9039 "ImportPage.c" } __finally64: #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9066,11 +9057,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const g_clear_error (&_inner_error_); #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 9065 "ImportPage.c" +#line 9056 "ImportPage.c" } #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (filename); -#line 9069 "ImportPage.c" +#line 9060 "ImportPage.c" } } } @@ -9086,7 +9077,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp111_ = self->priv->refresh_result; #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp111_ != GP_OK) { -#line 9085 "ImportPage.c" +#line 9076 "ImportPage.c" int _tmp112_ = 0; gchar* _tmp113_ = NULL; gchar* _tmp114_ = NULL; @@ -9110,7 +9101,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9109 "ImportPage.c" +#line 9100 "ImportPage.c" } #line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp115_ = self->priv->camera; @@ -9130,7 +9121,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp121_ = self->priv->refresh_result; #line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp121_ != GP_OK) { -#line 9129 "ImportPage.c" +#line 9120 "ImportPage.c" const gchar* _tmp122_ = NULL; int _tmp123_ = 0; gchar* _tmp124_ = NULL; @@ -9159,20 +9150,20 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9158 "ImportPage.c" +#line 9149 "ImportPage.c" } { gint ctr = 0; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = 0; -#line 9164 "ImportPage.c" +#line 9155 "ImportPage.c" { gboolean _tmp126_ = FALSE; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp126_ = TRUE; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9171 "ImportPage.c" +#line 9162 "ImportPage.c" gint _tmp128_ = 0; CameraList* _tmp129_ = NULL; gint _tmp130_ = 0; @@ -9193,13 +9184,13 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gboolean _tmp148_ = FALSE; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp126_) { -#line 9192 "ImportPage.c" +#line 9183 "ImportPage.c" gint _tmp127_ = 0; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp127_ = ctr; #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ctr = _tmp127_ + 1; -#line 9198 "ImportPage.c" +#line 9189 "ImportPage.c" } #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp126_ = FALSE; @@ -9213,7 +9204,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const if (!(_tmp128_ < _tmp130_)) { #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9212 "ImportPage.c" +#line 9203 "ImportPage.c" } #line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp131_ = folders; @@ -9233,7 +9224,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _tmp136_ = self->priv->refresh_result; #line 1440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp136_ != GP_OK) { -#line 9232 "ImportPage.c" +#line 9223 "ImportPage.c" gint _tmp137_ = 0; int _tmp138_ = 0; gchar* _tmp139_ = NULL; @@ -9262,7 +9253,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9261 "ImportPage.c" +#line 9252 "ImportPage.c" } #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp141_ = fsid; @@ -9296,11 +9287,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9295 "ImportPage.c" +#line 9286 "ImportPage.c" } #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (subdir); -#line 9299 "ImportPage.c" +#line 9290 "ImportPage.c" } } } @@ -9314,7 +9305,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const _g_free0 (fulldir); #line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 9313 "ImportPage.c" +#line 9304 "ImportPage.c" } @@ -9323,19 +9314,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp g_return_if_fail (IS_IMPORT_PAGE (self)); #line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_return_if_fail (GEE_IS_ARRAY_LIST (import_list)); -#line 9322 "ImportPage.c" +#line 9313 "ImportPage.c" { gint i = 0; #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" i = 0; -#line 9327 "ImportPage.c" +#line 9318 "ImportPage.c" { gboolean _tmp0_ = FALSE; #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9334 "ImportPage.c" +#line 9325 "ImportPage.c" gint _tmp2_ = 0; GeeArrayList* _tmp3_ = NULL; gint _tmp4_ = 0; @@ -9361,13 +9352,13 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp PhotoImportSource* _tmp31_ = NULL; #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp0_) { -#line 9360 "ImportPage.c" +#line 9351 "ImportPage.c" gint _tmp1_ = 0; #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp1_ = i; #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" i = _tmp1_ + 1; -#line 9366 "ImportPage.c" +#line 9357 "ImportPage.c" } #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = FALSE; @@ -9383,7 +9374,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp if (!(_tmp2_ < _tmp5_)) { #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9382 "ImportPage.c" +#line 9373 "ImportPage.c" } #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp6_ = import_list; @@ -9399,7 +9390,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp if (_tmp10_ == NULL) { #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp9_); -#line 9398 "ImportPage.c" +#line 9389 "ImportPage.c" } #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" current = _tmp10_; @@ -9413,7 +9404,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp15_ = _tmp14_; #line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((_tmp12_ + 1) < _tmp15_) { -#line 9412 "ImportPage.c" +#line 9403 "ImportPage.c" GeeArrayList* _tmp16_ = NULL; gint _tmp17_ = 0; gpointer _tmp18_ = NULL; @@ -9433,19 +9424,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp if (_tmp20_ == NULL) { #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp19_); -#line 9432 "ImportPage.c" +#line 9423 "ImportPage.c" } #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp11_); #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = _tmp20_; -#line 9438 "ImportPage.c" +#line 9429 "ImportPage.c" } else { #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp11_); #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = NULL; -#line 9444 "ImportPage.c" +#line 9435 "ImportPage.c" } #line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp21_ = _g_object_ref0 (_tmp11_); @@ -9455,7 +9446,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp23_ = i; #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp23_ > 0) { -#line 9454 "ImportPage.c" +#line 9445 "ImportPage.c" GeeArrayList* _tmp24_ = NULL; gint _tmp25_ = 0; gpointer _tmp26_ = NULL; @@ -9475,19 +9466,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp if (_tmp28_ == NULL) { #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp27_); -#line 9474 "ImportPage.c" +#line 9465 "ImportPage.c" } #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp22_); #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = _tmp28_; -#line 9480 "ImportPage.c" +#line 9471 "ImportPage.c" } else { #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp22_); #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp22_ = NULL; -#line 9486 "ImportPage.c" +#line 9477 "ImportPage.c" } #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp29_ = _g_object_ref0 (_tmp22_); @@ -9497,7 +9488,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp31_ = current; #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp31_ != NULL) { -#line 9496 "ImportPage.c" +#line 9487 "ImportPage.c" PhotoImportSource* _tmp32_ = NULL; PhotoFileFormat _tmp33_ = 0; #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9506,15 +9497,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp33_ = photo_import_source_get_file_format (_tmp32_); #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW; -#line 9505 "ImportPage.c" +#line 9496 "ImportPage.c" } else { #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp30_ = FALSE; -#line 9509 "ImportPage.c" +#line 9500 "ImportPage.c" } #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp30_) { -#line 9513 "ImportPage.c" +#line 9504 "ImportPage.c" gchar* current_name = NULL; gchar* ext = NULL; PhotoImportSource* _tmp34_ = NULL; @@ -9552,7 +9543,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp40_ = next; #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp40_ != NULL) { -#line 9551 "ImportPage.c" +#line 9542 "ImportPage.c" PhotoImportSource* _tmp41_ = NULL; PhotoFileFormat _tmp42_ = 0; #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9561,15 +9552,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp42_ = photo_import_source_get_file_format (_tmp41_); #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF; -#line 9560 "ImportPage.c" +#line 9551 "ImportPage.c" } else { #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = FALSE; -#line 9564 "ImportPage.c" +#line 9555 "ImportPage.c" } #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp39_) { -#line 9568 "ImportPage.c" +#line 9559 "ImportPage.c" gchar* next_name = NULL; PhotoImportSource* _tmp43_ = NULL; gchar* _tmp44_ = NULL; @@ -9602,7 +9593,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp49_ = current_name; #line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (g_strcmp0 (_tmp48_, _tmp49_) == 0) { -#line 9601 "ImportPage.c" +#line 9592 "ImportPage.c" PhotoImportSource* _tmp50_ = NULL; PhotoImportSource* _tmp51_ = NULL; #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9613,17 +9604,17 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _g_object_unref0 (associated); #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = _tmp51_; -#line 9612 "ImportPage.c" +#line 9603 "ImportPage.c" } #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (next_name); -#line 9616 "ImportPage.c" +#line 9607 "ImportPage.c" } #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = prev; #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp53_ != NULL) { -#line 9622 "ImportPage.c" +#line 9613 "ImportPage.c" PhotoImportSource* _tmp54_ = NULL; PhotoFileFormat _tmp55_ = 0; #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9632,15 +9623,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp55_ = photo_import_source_get_file_format (_tmp54_); #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF; -#line 9631 "ImportPage.c" +#line 9622 "ImportPage.c" } else { #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = FALSE; -#line 9635 "ImportPage.c" +#line 9626 "ImportPage.c" } #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp52_) { -#line 9639 "ImportPage.c" +#line 9630 "ImportPage.c" gchar* prev_name = NULL; PhotoImportSource* _tmp56_ = NULL; gchar* _tmp57_ = NULL; @@ -9673,7 +9664,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp62_ = current_name; #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (g_strcmp0 (_tmp61_, _tmp62_) == 0) { -#line 9672 "ImportPage.c" +#line 9663 "ImportPage.c" PhotoImportSource* _tmp63_ = NULL; PhotoImportSource* _tmp64_ = NULL; #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9684,17 +9675,17 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _g_object_unref0 (associated); #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = _tmp64_; -#line 9683 "ImportPage.c" +#line 9674 "ImportPage.c" } #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (prev_name); -#line 9687 "ImportPage.c" +#line 9678 "ImportPage.c" } #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp65_ = associated; #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp65_ != NULL) { -#line 9693 "ImportPage.c" +#line 9684 "ImportPage.c" PhotoImportSource* _tmp66_ = NULL; gchar* _tmp67_ = NULL; gchar* _tmp68_ = NULL; @@ -9738,7 +9729,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp76_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_IMPORT_SOURCE, ImportSource)); #line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp76_) { -#line 9737 "ImportPage.c" +#line 9728 "ImportPage.c" PhotoImportSource* _tmp77_ = NULL; #line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_debug ("ImportPage.vala:1486: Unable to associate files"); @@ -9746,7 +9737,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _tmp77_ = current; #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source_set_associated (_tmp77_, NULL); -#line 9745 "ImportPage.c" +#line 9736 "ImportPage.c" } } #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9755,7 +9746,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _g_free0 (ext); #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (current_name); -#line 9754 "ImportPage.c" +#line 9745 "ImportPage.c" } #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (prev); @@ -9767,7 +9758,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp _g_object_unref0 (_tmp11_); #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (current); -#line 9766 "ImportPage.c" +#line 9757 "ImportPage.c" } } } @@ -9783,7 +9774,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_return_if_fail (GEE_IS_LIST (import_list)); #line 1495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" loaded_photos = 0; -#line 9782 "ImportPage.c" +#line 9773 "ImportPage.c" { GeeList* _import_source_list = NULL; GeeList* _tmp0_ = NULL; @@ -9811,7 +9802,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _import_source_index = -1; #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 9810 "ImportPage.c" +#line 9801 "ImportPage.c" gint _tmp5_ = 0; gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -9874,7 +9865,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i if (!(_tmp6_ < _tmp7_)) { #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 9873 "ImportPage.c" +#line 9864 "ImportPage.c" } #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = _import_source_list; @@ -9900,7 +9891,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp15_ = fulldir; #line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp15_ == NULL) { -#line 9899 "ImportPage.c" +#line 9890 "ImportPage.c" ImportSource* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; @@ -9923,7 +9914,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_object_unref0 (import_source); #line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 9921 "ImportPage.c" +#line 9912 "ImportPage.c" } #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = NULL; @@ -9931,7 +9922,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp20_ = import_source; #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 9929 "ImportPage.c" +#line 9920 "ImportPage.c" ImportSource* _tmp21_ = NULL; PhotoImportSource* _tmp22_ = NULL; PhotoImportSource* _tmp23_ = NULL; @@ -9945,15 +9936,15 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp19_ = _tmp23_ != NULL; #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp23_); -#line 9943 "ImportPage.c" +#line 9934 "ImportPage.c" } else { #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = FALSE; -#line 9947 "ImportPage.c" +#line 9938 "ImportPage.c" } #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp19_) { -#line 9951 "ImportPage.c" +#line 9942 "ImportPage.c" ImportSource* _tmp24_ = NULL; PhotoImportSource* _tmp25_ = NULL; #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -9964,7 +9955,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_object_unref0 (associated); #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" associated = _tmp25_; -#line 9962 "ImportPage.c" +#line 9953 "ImportPage.c" } #line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp26_ = self->priv->progress_bar; @@ -9998,7 +9989,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp35_ = video_reader_is_supported_video_filename (_tmp34_); #line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp35_) { -#line 9996 "ImportPage.c" +#line 9987 "ImportPage.c" { PhotoMetadata* _tmp36_ = NULL; GPSpinIdleWrapper* _tmp37_ = NULL; @@ -10024,7 +10015,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp36_ = _tmp42_; #line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10022 "ImportPage.c" +#line 10013 "ImportPage.c" goto __catch65_g_error; } #line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10037,7 +10028,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i metadata = _tmp43_; #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (_tmp36_); -#line 10035 "ImportPage.c" +#line 10026 "ImportPage.c" } goto __finally65; __catch65_g_error: @@ -10063,7 +10054,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_warning ("ImportPage.vala:1526: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_); #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10061 "ImportPage.c" +#line 10052 "ImportPage.c" } __finally65: #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10086,7 +10077,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_clear_error (&_inner_error_); #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10084 "ImportPage.c" +#line 10075 "ImportPage.c" } } #line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10095,7 +10086,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp48_ = metadata; #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp48_ != NULL) { -#line 10093 "ImportPage.c" +#line 10084 "ImportPage.c" guint8* flattened_sans_thumbnail = NULL; PhotoMetadata* _tmp49_ = NULL; gint _tmp50_ = 0; @@ -10121,7 +10112,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp53__length1 = flattened_sans_thumbnail_length1; #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp53_ != NULL) { -#line 10119 "ImportPage.c" +#line 10110 "ImportPage.c" guint8* _tmp54_ = NULL; gint _tmp54__length1 = 0; #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10130,15 +10121,15 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp54__length1 = flattened_sans_thumbnail_length1; #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = _tmp54__length1 > 0; -#line 10128 "ImportPage.c" +#line 10119 "ImportPage.c" } else { #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp52_ = FALSE; -#line 10132 "ImportPage.c" +#line 10123 "ImportPage.c" } #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp52_) { -#line 10136 "ImportPage.c" +#line 10127 "ImportPage.c" guint8* _tmp55_ = NULL; gint _tmp55__length1 = 0; guint8* _tmp56_ = NULL; @@ -10158,11 +10149,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_free0 (exif_only_md5); #line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" exif_only_md5 = _tmp57_; -#line 10156 "ImportPage.c" +#line 10147 "ImportPage.c" } #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL); -#line 10160 "ImportPage.c" +#line 10151 "ImportPage.c" } #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_raw = NULL; @@ -10174,7 +10165,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i preview_raw_length = (gsize) 0; #line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview = NULL; -#line 10172 "ImportPage.c" +#line 10163 "ImportPage.c" { gchar* preview_fulldir = NULL; const gchar* _tmp58_ = NULL; @@ -10210,7 +10201,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp62_ = associated; #line 1551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp62_ != NULL) { -#line 10208 "ImportPage.c" +#line 10199 "ImportPage.c" PhotoImportSource* _tmp63_ = NULL; gchar* _tmp64_ = NULL; PhotoImportSource* _tmp65_ = NULL; @@ -10231,7 +10222,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_free0 (preview_filename); #line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_filename = _tmp66_; -#line 10229 "ImportPage.c" +#line 10220 "ImportPage.c" } #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp68_ = import_page_spin_idle_context; @@ -10263,7 +10254,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_free0 (preview_filename); #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_fulldir); -#line 10261 "ImportPage.c" +#line 10252 "ImportPage.c" goto __catch66_g_error; } #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10280,7 +10271,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_free0 (preview_filename); #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (preview_fulldir); -#line 10278 "ImportPage.c" +#line 10269 "ImportPage.c" } goto __finally66; __catch66_g_error: @@ -10298,7 +10289,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp79_ = video_reader_is_supported_video_filename (_tmp78_); #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp79_) { -#line 10296 "ImportPage.c" +#line 10287 "ImportPage.c" const gchar* _tmp80_ = NULL; const gchar* _tmp81_ = NULL; GError* _tmp82_ = NULL; @@ -10313,11 +10304,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp83_ = _tmp82_->message; #line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" g_warning ("ImportPage.vala:1564: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_); -#line 10311 "ImportPage.c" +#line 10302 "ImportPage.c" } #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10315 "ImportPage.c" +#line 10306 "ImportPage.c" } __finally66: #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10346,7 +10337,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_clear_error (&_inner_error_); #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10344 "ImportPage.c" +#line 10335 "ImportPage.c" } #line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_md5 = NULL; @@ -10354,7 +10345,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp86_ = preview; #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp86_ != NULL) { -#line 10352 "ImportPage.c" +#line 10343 "ImportPage.c" guint8* _tmp87_ = NULL; gint _tmp87__length1 = 0; #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10363,29 +10354,29 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp87__length1 = preview_raw_length1; #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp85_ = _tmp87_ != NULL; -#line 10361 "ImportPage.c" +#line 10352 "ImportPage.c" } else { #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp85_ = FALSE; -#line 10365 "ImportPage.c" +#line 10356 "ImportPage.c" } #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp85_) { -#line 10369 "ImportPage.c" +#line 10360 "ImportPage.c" gsize _tmp88_ = 0UL; #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp88_ = preview_raw_length; #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp84_ = _tmp88_ > ((gsize) 0); -#line 10375 "ImportPage.c" +#line 10366 "ImportPage.c" } else { #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp84_ = FALSE; -#line 10379 "ImportPage.c" +#line 10370 "ImportPage.c" } #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp84_) { -#line 10383 "ImportPage.c" +#line 10374 "ImportPage.c" guint8* _tmp89_ = NULL; gint _tmp89__length1 = 0; gsize _tmp90_ = 0UL; @@ -10402,13 +10393,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_free0 (preview_md5); #line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" preview_md5 = _tmp91_; -#line 10400 "ImportPage.c" +#line 10391 "ImportPage.c" } #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp92_ = import_source; #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 10406 "ImportPage.c" +#line 10397 "ImportPage.c" ImportSource* _tmp93_ = NULL; GdkPixbuf* _tmp94_ = NULL; #line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10417,13 +10408,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp94_ = preview; #line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp93_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp93_) : NULL, _tmp94_); -#line 10415 "ImportPage.c" +#line 10406 "ImportPage.c" } #line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp95_ = import_source; #line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 10421 "ImportPage.c" +#line 10412 "ImportPage.c" ImportSource* _tmp96_ = NULL; GdkPixbuf* _tmp97_ = NULL; const gchar* _tmp98_ = NULL; @@ -10441,13 +10432,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _tmp100_ = exif_only_md5; #line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp96_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp96_) : NULL, _tmp97_, _tmp98_, _tmp99_, _tmp100_); -#line 10439 "ImportPage.c" +#line 10430 "ImportPage.c" } #line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp101_ = associated; #line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp101_ != NULL) { -#line 10445 "ImportPage.c" +#line 10436 "ImportPage.c" { PhotoMetadata* associated_metadata = NULL; GPSpinIdleWrapper* _tmp102_ = NULL; @@ -10495,7 +10486,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i associated_metadata = _tmp112_; #line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10493 "ImportPage.c" +#line 10484 "ImportPage.c" goto __catch67_g_error; } #line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10510,7 +10501,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL); #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (associated_metadata); -#line 10508 "ImportPage.c" +#line 10499 "ImportPage.c" } goto __finally67; __catch67_g_error: @@ -10552,7 +10543,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_free0 (_tmp119_); #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 10550 "ImportPage.c" +#line 10541 "ImportPage.c" } __finally67: #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10583,7 +10574,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i g_clear_error (&_inner_error_); #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10581 "ImportPage.c" +#line 10572 "ImportPage.c" } } #line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -10628,11 +10619,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i _g_free0 (filename); #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (import_source); -#line 10626 "ImportPage.c" +#line 10617 "ImportPage.c" } #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_import_source_list); -#line 10630 "ImportPage.c" +#line 10621 "ImportPage.c" } } @@ -10652,7 +10643,7 @@ static void import_page_on_hide_imported (ImportPage* self) { _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp1_) { -#line 10650 "ImportPage.c" +#line 10641 "ImportPage.c" ViewCollection* _tmp2_ = NULL; ViewCollection* _tmp3_ = NULL; ImportPageHideImportedViewFilter* _tmp4_ = NULL; @@ -10666,7 +10657,7 @@ static void import_page_on_hide_imported (ImportPage* self) { view_collection_install_view_filter (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_FILTER, ViewFilter)); #line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp3_); -#line 10664 "ImportPage.c" +#line 10655 "ImportPage.c" } else { ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; @@ -10681,7 +10672,7 @@ static void import_page_on_hide_imported (ImportPage* self) { view_collection_remove_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter)); #line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp6_); -#line 10679 "ImportPage.c" +#line 10670 "ImportPage.c" } #line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = config_facade_get_instance (); @@ -10695,7 +10686,7 @@ static void import_page_on_hide_imported (ImportPage* self) { configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp11_); #line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp9_); -#line 10693 "ImportPage.c" +#line 10684 "ImportPage.c" } @@ -10720,7 +10711,7 @@ static void import_page_on_import_selected (ImportPage* self) { _g_object_unref0 (_tmp3_); #line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp1_); -#line 10718 "ImportPage.c" +#line 10709 "ImportPage.c" } @@ -10745,7 +10736,7 @@ static void import_page_on_import_all (ImportPage* self) { _g_object_unref0 (_tmp3_); #line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _data_collection_unref0 (_tmp1_); -#line 10743 "ImportPage.c" +#line 10734 "ImportPage.c" } @@ -10754,28 +10745,28 @@ static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, g result = import_page_import_job_comparator ((ImportPage*) self, a, b); #line 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 10752 "ImportPage.c" +#line 10743 "ImportPage.c" } static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { #line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_import_reporter ((ImportPage*) self, manifest); -#line 10759 "ImportPage.c" +#line 10750 "ImportPage.c" } static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) { #line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_import_job_failed ((ImportPage*) self, _result_); -#line 10766 "ImportPage.c" +#line 10757 "ImportPage.c" } static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { #line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_close_import ((ImportPage*) self); -#line 10773 "ImportPage.c" +#line 10764 "ImportPage.c" } @@ -10817,7 +10808,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _tmp4_ = res; #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ != GP_OK) { -#line 10815 "ImportPage.c" +#line 10806 "ImportPage.c" const gchar* _tmp5_ = NULL; int _tmp6_ = 0; gchar* _tmp7_ = NULL; @@ -10844,7 +10835,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _g_free0 (_tmp8_); #line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 10842 "ImportPage.c" +#line 10833 "ImportPage.c" } #line 1634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp11_ = self->priv->refreshed; @@ -10864,7 +10855,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _tmp14_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" already_imported = _tmp14_; -#line 10862 "ImportPage.c" +#line 10853 "ImportPage.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp15_ = NULL; @@ -10877,7 +10868,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _object_it = _tmp16_; #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 10875 "ImportPage.c" +#line 10866 "ImportPage.c" GeeIterator* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; DataObject* object = NULL; @@ -10907,7 +10898,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { if (!_tmp18_) { #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 10905 "ImportPage.c" +#line 10896 "ImportPage.c" } #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = _object_it; @@ -10933,7 +10924,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _tmp26_ = import_preview_is_already_imported (_tmp25_); #line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp26_) { -#line 10931 "ImportPage.c" +#line 10922 "ImportPage.c" ImportSource* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; @@ -10986,7 +10977,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _g_object_unref0 (object); #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" continue; -#line 10983 "ImportPage.c" +#line 10974 "ImportPage.c" } #line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp38_ = import_page_null_context; @@ -11000,7 +10991,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _tmp42_ = import_file; #line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 10997 "ImportPage.c" +#line 10988 "ImportPage.c" ImportSource* _tmp43_ = NULL; PhotoImportSource* _tmp44_ = NULL; PhotoImportSource* _tmp45_ = NULL; @@ -11014,15 +11005,15 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _tmp41_ = _tmp45_ != NULL; #line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp45_); -#line 11011 "ImportPage.c" +#line 11002 "ImportPage.c" } else { #line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp41_ = FALSE; -#line 11015 "ImportPage.c" +#line 11006 "ImportPage.c" } #line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp41_) { -#line 11019 "ImportPage.c" +#line 11010 "ImportPage.c" ImportPageCameraImportJob* _tmp46_ = NULL; GPContextWrapper* _tmp47_ = NULL; ImportSource* _tmp48_ = NULL; @@ -11050,7 +11041,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _batch_import_job_unref0 (_tmp52_); #line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp50_); -#line 11047 "ImportPage.c" +#line 11038 "ImportPage.c" } #line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp53_ = jobs; @@ -11066,11 +11057,11 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _g_object_unref0 (preview); #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (object); -#line 11063 "ImportPage.c" +#line 11054 "ImportPage.c" } #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_object_it); -#line 11067 "ImportPage.c" +#line 11058 "ImportPage.c" } #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = jobs; @@ -11090,7 +11081,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _tmp61_ = _tmp60_; #line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp61_ > 0) { -#line 11087 "ImportPage.c" +#line 11078 "ImportPage.c" ImportPage* _tmp62_ = NULL; ImportPage* _tmp63_ = NULL; BatchImport* batch_import = NULL; @@ -11153,7 +11144,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _g_object_unref0 (_tmp74_); #line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (batch_import); -#line 11150 "ImportPage.c" +#line 11141 "ImportPage.c" } else { GeeArrayList* _tmp75_ = NULL; gint _tmp76_ = 0; @@ -11166,7 +11157,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { _tmp77_ = _tmp76_; #line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp77_ > 0) { -#line 11163 "ImportPage.c" +#line 11154 "ImportPage.c" GeeArrayList* _tmp78_ = NULL; ImportManifest* _tmp79_ = NULL; ImportManifest* _tmp80_ = NULL; @@ -11180,17 +11171,17 @@ static void import_page_import (ImportPage* self, GeeIterable* items) { import_page_import_reporter (self, _tmp80_); #line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_manifest_unref0 (_tmp80_); -#line 11177 "ImportPage.c" +#line 11168 "ImportPage.c" } #line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_close_import (self); -#line 11181 "ImportPage.c" +#line 11172 "ImportPage.c" } #line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (already_imported); #line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (jobs); -#line 11187 "ImportPage.c" +#line 11178 "ImportPage.c" } @@ -11211,7 +11202,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul if (_tmp2_ == NULL) { #line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = TRUE; -#line 11208 "ImportPage.c" +#line 11199 "ImportPage.c" } else { BatchImportResult* _tmp3_ = NULL; ImportResult _tmp4_ = 0; @@ -11221,13 +11212,13 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul _tmp4_ = _tmp3_->result; #line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS; -#line 11218 "ImportPage.c" +#line 11209 "ImportPage.c" } #line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp0_) { #line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11224 "ImportPage.c" +#line 11215 "ImportPage.c" } { BatchImportResult* _tmp5_ = NULL; @@ -11240,7 +11231,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul g_file_delete (_tmp6_, NULL, &_inner_error_); #line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11237 "ImportPage.c" +#line 11228 "ImportPage.c" goto __catch68_g_error; } } @@ -11276,7 +11267,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul _g_free0 (_tmp10_); #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 11273 "ImportPage.c" +#line 11264 "ImportPage.c" } __finally68: #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -11287,7 +11278,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul g_clear_error (&_inner_error_); #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11284 "ImportPage.c" +#line 11275 "ImportPage.c" } } @@ -11295,7 +11286,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul static gpointer _batch_import_job_ref0 (gpointer self) { #line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? batch_import_job_ref (self) : NULL; -#line 11292 "ImportPage.c" +#line 11283 "ImportPage.c" } @@ -11304,7 +11295,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 11301 "ImportPage.c" +#line 11292 "ImportPage.c" } @@ -11358,7 +11349,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _tmp5_ = _tmp4_; #line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp5_ > 0) { -#line 11355 "ImportPage.c" +#line 11346 "ImportPage.c" gchar* photos_string = NULL; ImportManifest* _tmp6_ = NULL; GeeList* _tmp7_ = NULL; @@ -11554,7 +11545,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _g_object_unref0 (local_ref); #line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11551 "ImportPage.c" +#line 11542 "ImportPage.c" } #line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _import_ui_question_params_unref0 (question); @@ -11568,7 +11559,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _g_free0 (videos_string); #line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (photos_string); -#line 11565 "ImportPage.c" +#line 11556 "ImportPage.c" } else { ImportManifest* _tmp59_ = NULL; #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -11579,7 +11570,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _g_object_unref0 (local_ref); #line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return; -#line 11576 "ImportPage.c" +#line 11567 "ImportPage.c" } #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp60_ = self->priv->import_sources; @@ -11587,7 +11578,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection)); #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" marker = _tmp61_; -#line 11584 "ImportPage.c" +#line 11575 "ImportPage.c" { GeeList* _batch_result_list = NULL; ImportManifest* _tmp62_ = NULL; @@ -11618,7 +11609,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _batch_result_index = -1; #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" while (TRUE) { -#line 11615 "ImportPage.c" +#line 11606 "ImportPage.c" gint _tmp68_ = 0; gint _tmp69_ = 0; gint _tmp70_ = 0; @@ -11646,7 +11637,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif if (!(_tmp69_ < _tmp70_)) { #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" break; -#line 11643 "ImportPage.c" +#line 11634 "ImportPage.c" } #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp71_ = _batch_result_list; @@ -11680,11 +11671,11 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _batch_import_job_unref0 (job); #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _batch_import_result_unref0 (batch_result); -#line 11677 "ImportPage.c" +#line 11668 "ImportPage.c" } #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_batch_result_list); -#line 11681 "ImportPage.c" +#line 11672 "ImportPage.c" } #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp81_ = app_window_get_instance (); @@ -11722,7 +11713,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _tmp92_ = error_count; #line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp92_ > 0) { -#line 11719 "ImportPage.c" +#line 11710 "ImportPage.c" gchar* error_string = NULL; gint _tmp93_ = 0; const gchar* _tmp94_ = NULL; @@ -11745,7 +11736,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif app_window_error_message (_tmp97_, NULL); #line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (error_string); -#line 11742 "ImportPage.c" +#line 11733 "ImportPage.c" } #line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp98_ = progress; @@ -11761,7 +11752,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif _g_object_unref0 (marker); #line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (local_ref); -#line 11758 "ImportPage.c" +#line 11749 "ImportPage.c" } @@ -11789,7 +11780,7 @@ static void import_page_close_import (ImportPage* self) { _tmp4_ = res; #line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp4_ != GP_OK) { -#line 11786 "ImportPage.c" +#line 11777 "ImportPage.c" int _tmp5_ = 0; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -11803,7 +11794,7 @@ static void import_page_close_import (ImportPage* self) { g_message ("ImportPage.vala:1770: Unable to unlock camera: %s", _tmp7_); #line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_free0 (_tmp7_); -#line 11800 "ImportPage.c" +#line 11791 "ImportPage.c" } #line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp8_ = self->priv->refreshed; @@ -11811,7 +11802,7 @@ static void import_page_close_import (ImportPage* self) { import_page_update_status (self, FALSE, _tmp8_); #line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" import_page_on_view_changed (self); -#line 11808 "ImportPage.c" +#line 11799 "ImportPage.c" } @@ -11829,14 +11820,14 @@ static void import_page_real_set_display_titles (CheckerboardPage* base, gboolea _tmp1_ = display; #line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_); -#line 11826 "ImportPage.c" +#line 11817 "ImportPage.c" } static gpointer _view_filter_ref0 (gpointer self) { #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? view_filter_ref (self) : NULL; -#line 11833 "ImportPage.c" +#line 11824 "ImportPage.c" } @@ -11855,7 +11846,7 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa result = _tmp1_; #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 11852 "ImportPage.c" +#line 11843 "ImportPage.c" } @@ -11877,14 +11868,14 @@ static ImportPageImportViewManager* import_page_import_view_manager_construct (G self->priv->owner = _tmp1_; #line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 11874 "ImportPage.c" +#line 11865 "ImportPage.c" } static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) { #line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_import_view_manager_construct (IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, owner); -#line 11881 "ImportPage.c" +#line 11872 "ImportPage.c" } @@ -11905,7 +11896,7 @@ static DataView* import_page_import_view_manager_real_create_view (ViewManager* result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 11902 "ImportPage.c" +#line 11893 "ImportPage.c" } @@ -11918,14 +11909,14 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate)); #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewManagerClass *) klass)->create_view = import_page_import_view_manager_real_create_view; -#line 11915 "ImportPage.c" +#line 11906 "ImportPage.c" } static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) { #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self); -#line 11922 "ImportPage.c" +#line 11913 "ImportPage.c" } @@ -11937,7 +11928,7 @@ static void import_page_import_view_manager_finalize (ViewManager* obj) { _g_object_unref0 (self->priv->owner); #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj); -#line 11934 "ImportPage.c" +#line 11925 "ImportPage.c" } @@ -11956,7 +11947,7 @@ static GType import_page_import_view_manager_get_type (void) { static gpointer _gp_context_wrapper_ref0 (gpointer self) { #line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self ? gp_context_wrapper_ref (self) : NULL; -#line 11953 "ImportPage.c" +#line 11944 "ImportPage.c" } @@ -12052,7 +12043,7 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType _tmp16_ = import_file; #line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 12049 "ImportPage.c" +#line 12040 "ImportPage.c" ImportSource* _tmp17_ = NULL; PhotoMetadata* _tmp18_ = NULL; #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12063,13 +12054,13 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType _media_metadata_unref0 (_tmp15_); #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = _tmp18_; -#line 12060 "ImportPage.c" +#line 12051 "ImportPage.c" } else { #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _media_metadata_unref0 (_tmp15_); #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp15_ = NULL; -#line 12066 "ImportPage.c" +#line 12057 "ImportPage.c" } #line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp19_ = _media_metadata_ref0 (_tmp15_); @@ -12087,14 +12078,14 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType _media_metadata_unref0 (_tmp15_); #line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 12084 "ImportPage.c" +#line 12075 "ImportPage.c" } static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) { #line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_camera_import_job_construct (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, context, import_file, duplicated_file); -#line 12091 "ImportPage.c" +#line 12082 "ImportPage.c" } @@ -12109,7 +12100,7 @@ static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraI result = _tmp0_; #line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12106 "ImportPage.c" +#line 12097 "ImportPage.c" } @@ -12128,7 +12119,7 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B result = _tmp1_; #line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12125 "ImportPage.c" +#line 12116 "ImportPage.c" } @@ -12143,23 +12134,23 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat _tmp1_ = self->priv->import_file; #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 12140 "ImportPage.c" +#line 12131 "ImportPage.c" time_t _tmp2_ = 0; #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = import_page_camera_import_job_get_exposure_time (self); #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = _tmp2_; -#line 12146 "ImportPage.c" +#line 12137 "ImportPage.c" } else { #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp0_ = (time_t) 0; -#line 12150 "ImportPage.c" +#line 12141 "ImportPage.c" } #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = _tmp0_; #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12156 "ImportPage.c" +#line 12147 "ImportPage.c" } @@ -12178,7 +12169,7 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor result = _tmp1_; #line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12175 "ImportPage.c" +#line 12166 "ImportPage.c" } @@ -12197,7 +12188,7 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp result = _tmp1_; #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12194 "ImportPage.c" +#line 12185 "ImportPage.c" } @@ -12216,7 +12207,7 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b result = _tmp1_; #line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12213 "ImportPage.c" +#line 12204 "ImportPage.c" } @@ -12235,7 +12226,7 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base) result = _tmp1_; #line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12232 "ImportPage.c" +#line 12223 "ImportPage.c" } @@ -12255,7 +12246,7 @@ static void import_page_camera_import_job_real_set_associated (BatchImportJob* b _batch_import_job_unref0 (self->priv->associated); #line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated = _tmp1_; -#line 12252 "ImportPage.c" +#line 12243 "ImportPage.c" } @@ -12273,7 +12264,7 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI result = _tmp1_; #line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12270 "ImportPage.c" +#line 12261 "ImportPage.c" } @@ -12286,7 +12277,7 @@ static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* result = FALSE; #line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12283 "ImportPage.c" +#line 12274 "ImportPage.c" } @@ -12312,21 +12303,21 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp if (filesize) { #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *filesize = _vala_filesize; -#line 12309 "ImportPage.c" +#line 12300 "ImportPage.c" } #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (file) { #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file = _vala_file; -#line 12315 "ImportPage.c" +#line 12306 "ImportPage.c" } else { #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file); -#line 12319 "ImportPage.c" +#line 12310 "ImportPage.c" } #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12323 "ImportPage.c" +#line 12314 "ImportPage.c" } @@ -12352,7 +12343,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _vala_copy_to_library = FALSE; #line 554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" dest_file = NULL; -#line 12349 "ImportPage.c" +#line 12340 "ImportPage.c" { gboolean collision = FALSE; GFile* _tmp0_ = NULL; @@ -12376,7 +12367,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp0_ = _tmp5_; #line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12373 "ImportPage.c" +#line 12364 "ImportPage.c" goto __catch69_g_error; } #line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12389,7 +12380,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base dest_file = _tmp6_; #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp0_); -#line 12386 "ImportPage.c" +#line 12377 "ImportPage.c" } goto __finally69; __catch69_g_error: @@ -12420,7 +12411,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_free0 (_tmp9_); #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 12417 "ImportPage.c" +#line 12408 "ImportPage.c" } __finally69: #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12431,13 +12422,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_object_unref0 (dest_file); #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12428 "ImportPage.c" +#line 12419 "ImportPage.c" } #line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp12_ = dest_file; #line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp12_ == NULL) { -#line 12434 "ImportPage.c" +#line 12425 "ImportPage.c" ImportSource* _tmp13_ = NULL; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; @@ -12459,27 +12450,27 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base if (file_to_import) { #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 12456 "ImportPage.c" +#line 12447 "ImportPage.c" } else { #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 12460 "ImportPage.c" +#line 12451 "ImportPage.c" } #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 12466 "ImportPage.c" +#line 12457 "ImportPage.c" } #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12470 "ImportPage.c" +#line 12461 "ImportPage.c" } #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp16_ = dest_file; #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_blacklist_file (_tmp16_, "CameraImportJob.prepare"); -#line 12476 "ImportPage.c" +#line 12467 "ImportPage.c" { GPContextWrapper* _tmp17_ = NULL; GPContext* _tmp18_ = NULL; @@ -12503,7 +12494,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base gp_save_image (_tmp18_, _tmp19_, _tmp20_, _tmp21_, _tmp22_, &_inner_error_); #line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12500 "ImportPage.c" +#line 12491 "ImportPage.c" goto __finally70; } } @@ -12514,7 +12505,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp23_ = dest_file; #line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_unblacklist_file (_tmp23_); -#line 12511 "ImportPage.c" +#line 12502 "ImportPage.c" } #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -12524,13 +12515,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_object_unref0 (dest_file); #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12521 "ImportPage.c" +#line 12512 "ImportPage.c" } #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp24_ = self->priv->associated; #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp24_ != NULL) { -#line 12527 "ImportPage.c" +#line 12518 "ImportPage.c" BackingPhotoRow* _tmp39_ = NULL; GFile* assoc_dest = NULL; BackingPhotoRow* _tmp42_ = NULL; @@ -12572,7 +12563,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp25_ = _tmp33_; #line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12569 "ImportPage.c" +#line 12560 "ImportPage.c" goto __catch71_g_error; } #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12585,7 +12576,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base self->priv->associated_file = _tmp34_; #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _backing_photo_row_unref0 (_tmp25_); -#line 12582 "ImportPage.c" +#line 12573 "ImportPage.c" } goto __finally71; __catch71_g_error: @@ -12612,7 +12603,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base ": %s", _tmp36_, _tmp38_); #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_error_free0 (err); -#line 12608 "ImportPage.c" +#line 12599 "ImportPage.c" } __finally71: #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12623,13 +12614,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_object_unref0 (dest_file); #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12619 "ImportPage.c" +#line 12610 "ImportPage.c" } #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp39_ = self->priv->associated_file; #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp39_ == NULL) { -#line 12625 "ImportPage.c" +#line 12616 "ImportPage.c" ImportPageCameraImportJob* _tmp40_ = NULL; const gchar* _tmp41_ = NULL; #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -12646,21 +12637,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base if (file_to_import) { #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 12642 "ImportPage.c" +#line 12633 "ImportPage.c" } else { #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 12646 "ImportPage.c" +#line 12637 "ImportPage.c" } #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 12652 "ImportPage.c" +#line 12643 "ImportPage.c" } #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12656 "ImportPage.c" +#line 12647 "ImportPage.c" } #line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp42_ = self->priv->associated_file; @@ -12674,7 +12665,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp45_ = assoc_dest; #line 596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_blacklist_file (_tmp45_, "CameraImportJob.prepare"); -#line 12670 "ImportPage.c" +#line 12661 "ImportPage.c" { GPContextWrapper* _tmp46_ = NULL; GPContext* _tmp47_ = NULL; @@ -12704,7 +12695,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base gp_save_image (_tmp47_, _tmp48_, _tmp50_, _tmp52_, _tmp53_, &_inner_error_); #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12700 "ImportPage.c" +#line 12691 "ImportPage.c" goto __finally72; } } @@ -12715,7 +12706,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _tmp54_ = assoc_dest; #line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" library_monitor_unblacklist_file (_tmp54_); -#line 12711 "ImportPage.c" +#line 12702 "ImportPage.c" } #line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -12727,11 +12718,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base _g_object_unref0 (dest_file); #line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12723 "ImportPage.c" +#line 12714 "ImportPage.c" } #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (assoc_dest); -#line 12727 "ImportPage.c" +#line 12718 "ImportPage.c" } #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp55_ = dest_file; @@ -12751,21 +12742,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base if (file_to_import) { #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *file_to_import = _vala_file_to_import; -#line 12747 "ImportPage.c" +#line 12738 "ImportPage.c" } else { #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_vala_file_to_import); -#line 12751 "ImportPage.c" +#line 12742 "ImportPage.c" } #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (copy_to_library) { #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" *copy_to_library = _vala_copy_to_library; -#line 12757 "ImportPage.c" +#line 12748 "ImportPage.c" } #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12761 "ImportPage.c" +#line 12752 "ImportPage.c" } @@ -12787,7 +12778,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas _tmp0_ = source; #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) { -#line 12783 "ImportPage.c" +#line 12774 "ImportPage.c" Photo* photo = NULL; MediaSource* _tmp1_ = NULL; Photo* _tmp2_ = NULL; @@ -12802,7 +12793,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas _tmp3_ = self->priv->associated_file; #line 617 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp3_ != NULL) { -#line 12798 "ImportPage.c" +#line 12789 "ImportPage.c" Photo* _tmp4_ = NULL; BackingPhotoRow* _tmp5_ = NULL; Photo* _tmp6_ = NULL; @@ -12823,7 +12814,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas _g_object_unref0 (photo); #line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return FALSE; -#line 12819 "ImportPage.c" +#line 12810 "ImportPage.c" } #line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ret = TRUE; @@ -12839,17 +12830,17 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas photo_set_raw_developer (_tmp6_, _tmp9_); #line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (_tmp8_); -#line 12835 "ImportPage.c" +#line 12826 "ImportPage.c" } #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 12839 "ImportPage.c" +#line 12830 "ImportPage.c" } #line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" result = ret; #line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12845 "ImportPage.c" +#line 12836 "ImportPage.c" } @@ -12882,7 +12873,7 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC ((BatchImportJobClass *) klass)->prepare = import_page_camera_import_job_real_prepare; #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((BatchImportJobClass *) klass)->complete = import_page_camera_import_job_real_complete; -#line 12878 "ImportPage.c" +#line 12869 "ImportPage.c" } @@ -12893,7 +12884,7 @@ static void import_page_camera_import_job_instance_init (ImportPageCameraImportJ self->priv->associated = NULL; #line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->associated_file = NULL; -#line 12889 "ImportPage.c" +#line 12880 "ImportPage.c" } @@ -12921,7 +12912,7 @@ static void import_page_camera_import_job_finalize (BatchImportJob* obj) { _g_object_unref0 (self->priv->duplicated_file); #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj); -#line 12917 "ImportPage.c" +#line 12908 "ImportPage.c" } @@ -12946,7 +12937,7 @@ static guint import_page_import_page_search_view_filter_real_get_criteria (Searc result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA); #line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 12942 "ImportPage.c" +#line 12933 "ImportPage.c" } @@ -12954,19 +12945,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; -#line 12962 "ImportPage.c" +#line 12953 "ImportPage.c" } @@ -12993,27 +12984,27 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _tmp3_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) { -#line 12989 "ImportPage.c" +#line 12980 "ImportPage.c" gboolean _tmp4_ = FALSE; #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp4_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = _tmp4_; -#line 12995 "ImportPage.c" +#line 12986 "ImportPage.c" } else { #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp2_ = FALSE; -#line 12999 "ImportPage.c" +#line 12990 "ImportPage.c" } #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp2_) { -#line 13003 "ImportPage.c" +#line 12994 "ImportPage.c" ImportSource* _tmp5_ = NULL; #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp5_ = source; #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) { -#line 13009 "ImportPage.c" +#line 13000 "ImportPage.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; #line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -13028,7 +13019,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13024 "ImportPage.c" +#line 13015 "ImportPage.c" } } else { ImportSource* _tmp8_ = NULL; @@ -13036,7 +13027,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _tmp8_ = source; #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) { -#line 13032 "ImportPage.c" +#line 13023 "ImportPage.c" PhotoImportSource* photo = NULL; ImportSource* _tmp9_ = NULL; PhotoImportSource* _tmp10_ = NULL; @@ -13054,7 +13045,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _tmp12_ = photo_import_source_get_file_format (_tmp11_); #line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) { -#line 13050 "ImportPage.c" +#line 13041 "ImportPage.c" PhotoImportSource* _tmp13_ = NULL; PhotoImportSource* _tmp14_ = NULL; PhotoImportSource* _tmp15_ = NULL; @@ -13071,7 +13062,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (_tmp15_); #line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp16_) { -#line 13067 "ImportPage.c" +#line 13058 "ImportPage.c" gboolean _tmp17_ = FALSE; gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; @@ -13081,7 +13072,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _tmp19_ = _tmp18_; #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (!_tmp19_) { -#line 13077 "ImportPage.c" +#line 13068 "ImportPage.c" gboolean _tmp20_ = FALSE; gboolean _tmp21_ = FALSE; #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" @@ -13090,11 +13081,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _tmp21_ = _tmp20_; #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = !_tmp21_; -#line 13086 "ImportPage.c" +#line 13077 "ImportPage.c" } else { #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp17_ = FALSE; -#line 13090 "ImportPage.c" +#line 13081 "ImportPage.c" } #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if (_tmp17_) { @@ -13106,7 +13097,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13102 "ImportPage.c" +#line 13093 "ImportPage.c" } } else { gboolean _tmp22_ = FALSE; @@ -13125,7 +13116,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13121 "ImportPage.c" +#line 13112 "ImportPage.c" } } } else { @@ -13145,12 +13136,12 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13141 "ImportPage.c" +#line 13132 "ImportPage.c" } } #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _g_object_unref0 (photo); -#line 13146 "ImportPage.c" +#line 13137 "ImportPage.c" } } } @@ -13158,7 +13149,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _tmp26_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) { -#line 13154 "ImportPage.c" +#line 13145 "ImportPage.c" const gchar* keywords = NULL; ImportSource* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; @@ -13184,11 +13175,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13180 "ImportPage.c" +#line 13171 "ImportPage.c" } #line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" _tmp32_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp31_); -#line 13184 "ImportPage.c" +#line 13175 "ImportPage.c" { gchar** word_collection = NULL; gint word_collection_length1 = 0; @@ -13200,11 +13191,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF word_collection_length1 = _tmp31_; #line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) { -#line 13196 "ImportPage.c" +#line 13187 "ImportPage.c" const gchar* word = NULL; #line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" word = word_collection[word_it]; -#line 13200 "ImportPage.c" +#line 13191 "ImportPage.c" { const gchar* _tmp33_ = NULL; const gchar* _tmp34_ = NULL; @@ -13223,7 +13214,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13219 "ImportPage.c" +#line 13210 "ImportPage.c" } } } @@ -13235,7 +13226,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF _g_object_unref0 (source); #line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13231 "ImportPage.c" +#line 13222 "ImportPage.c" } @@ -13245,14 +13236,14 @@ static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type); #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 13241 "ImportPage.c" +#line 13232 "ImportPage.c" } static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) { #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_import_page_search_view_filter_construct (IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER); -#line 13248 "ImportPage.c" +#line 13239 "ImportPage.c" } @@ -13263,7 +13254,7 @@ static void import_page_import_page_search_view_filter_class_init (ImportPageImp ((SearchViewFilterClass *) klass)->get_criteria = import_page_import_page_search_view_filter_real_get_criteria; #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewFilterClass *) klass)->predicate = import_page_import_page_search_view_filter_real_predicate; -#line 13259 "ImportPage.c" +#line 13250 "ImportPage.c" } @@ -13300,7 +13291,7 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter result = !_tmp1_; #line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return result; -#line 13296 "ImportPage.c" +#line 13287 "ImportPage.c" } @@ -13310,14 +13301,14 @@ static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_c self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type); #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return self; -#line 13306 "ImportPage.c" +#line 13297 "ImportPage.c" } static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) { #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER); -#line 13313 "ImportPage.c" +#line 13304 "ImportPage.c" } @@ -13326,7 +13317,7 @@ static void import_page_hide_imported_view_filter_class_init (ImportPageHideImpo import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass); #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" ((ViewFilterClass *) klass)->predicate = import_page_hide_imported_view_filter_real_predicate; -#line 13322 "ImportPage.c" +#line 13313 "ImportPage.c" } @@ -13375,7 +13366,7 @@ static void import_page_class_init (ImportPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = import_page_real_get_search_view_filter; #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (klass)->finalize = import_page_finalize; -#line 13371 "ImportPage.c" +#line 13362 "ImportPage.c" } @@ -13420,7 +13411,7 @@ static void import_page_instance_init (ImportPage * self) { _tmp3_ = import_page_hide_imported_view_filter_new (); #line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" self->priv->hide_imported_filter = _tmp3_; -#line 13416 "ImportPage.c" +#line 13407 "ImportPage.c" } @@ -13474,7 +13465,7 @@ static void import_page_finalize (GObject* obj) { _core_tracker_unref0 (self->priv->tracker); #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala" G_OBJECT_CLASS (import_page_parent_class)->finalize (obj); -#line 13470 "ImportPage.c" +#line 13461 "ImportPage.c" } -- cgit v1.2.3