diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
| commit | dfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch) | |
| tree | dee893916166ac1c8b479b74e7f341429945260e /src/Dialogs.c | |
| parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/Dialogs.c')
| -rw-r--r-- | src/Dialogs.c | 527 |
1 files changed, 265 insertions, 262 deletions
diff --git a/src/Dialogs.c b/src/Dialogs.c index 6ebebf4..7447399 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -1,4 +1,4 @@ -/* Dialogs.c generated by valac 0.34.4, the Vala compiler +/* Dialogs.c generated by valac 0.34.7, the Vala compiler * generated from Dialogs.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2942,7 +2942,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp2_ = _current_text_list; #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp4_ = _tmp3_; #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -4189,7 +4189,7 @@ static void export_dialog_instance_init (ExportDialog * self) { #line 157 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv->table = _tmp0_; #line 162 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 162 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv->format_options = _tmp1_; #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -9317,7 +9317,7 @@ static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_class_add_private (klass, sizeof (TextEntryDialogMediatorPrivate)); #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = text_entry_dialog_mediator_real_on_modify_validate; + ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) text_entry_dialog_mediator_real_on_modify_validate; #line 9307 "Dialogs.c" } @@ -9679,7 +9679,7 @@ static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMed #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_class_add_private (klass, sizeof (MultiTextEntryDialogMediatorPrivate)); #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = multi_text_entry_dialog_mediator_real_on_modify_validate; + ((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(MultiTextEntryDialogMediator*, const gchar*)) multi_text_entry_dialog_mediator_real_on_modify_validate; #line 9669 "Dialogs.c" } @@ -10773,7 +10773,7 @@ static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_class_add_private (klass, sizeof (EntryMultiCompletionPrivate)); #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((GtkEntryCompletionClass *) klass)->match_selected = entry_multi_completion_real_match_selected; + ((GtkEntryCompletionClass *) klass)->match_selected = (gboolean (*)(GtkEntryCompletion*, GtkTreeModel*, GtkTreeIter*)) entry_multi_completion_real_match_selected; #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala" G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize; #line 10765 "Dialogs.c" @@ -11365,7 +11365,7 @@ static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDi #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_class_add_private (klass, sizeof (SetBackgroundSlideshowDialogPrivate)); #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((GObjectClass *) klass)->constructed = set_background_slideshow_dialog_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) set_background_slideshow_dialog_real_constructed; #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala" G_OBJECT_CLASS (klass)->finalize = set_background_slideshow_dialog_finalize; #line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -12157,7 +12157,7 @@ static void event_rename_dialog_class_init (EventRenameDialogClass * klass) { #line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala" event_rename_dialog_parent_class = g_type_class_peek_parent (klass); #line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((EventRenameDialogClass *) klass)->execute = event_rename_dialog_real_execute; + ((EventRenameDialogClass *) klass)->execute = (gchar* (*)(EventRenameDialog*)) event_rename_dialog_real_execute; #line 12147 "Dialogs.c" } @@ -12256,9 +12256,9 @@ static void edit_title_dialog_class_init (EditTitleDialogClass * klass) { #line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala" edit_title_dialog_parent_class = g_type_class_peek_parent (klass); #line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((EditTitleDialogClass *) klass)->execute = edit_title_dialog_real_execute; + ((EditTitleDialogClass *) klass)->execute = (gchar* (*)(EditTitleDialog*)) edit_title_dialog_real_execute; #line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_title_dialog_real_on_modify_validate; + ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) edit_title_dialog_real_on_modify_validate; #line 12248 "Dialogs.c" } @@ -12383,9 +12383,9 @@ static void edit_comment_dialog_class_init (EditCommentDialogClass * klass) { #line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala" edit_comment_dialog_parent_class = g_type_class_peek_parent (klass); #line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((EditCommentDialogClass *) klass)->execute = edit_comment_dialog_real_execute; + ((EditCommentDialogClass *) klass)->execute = (gchar* (*)(EditCommentDialog*)) edit_comment_dialog_real_execute; #line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_comment_dialog_real_on_modify_validate; + ((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(MultiTextEntryDialogMediator*, const gchar*)) edit_comment_dialog_real_on_modify_validate; #line 12375 "Dialogs.c" } @@ -13462,7 +13462,7 @@ static void progress_dialog_class_init (ProgressDialogClass * klass) { #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_class_add_private (klass, sizeof (ProgressDialogPrivate)); #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((GtkWidgetClass *) klass)->realize = progress_dialog_real_realize; + ((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) progress_dialog_real_realize; #line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala" G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize; #line 13454 "Dialogs.c" @@ -15611,7 +15611,7 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp6_ = objects; #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp8_ = _tmp7_; #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -15667,7 +15667,7 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, #line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp20_ = objects; #line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp22_ = _tmp21_; #line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -15989,7 +15989,7 @@ static void add_tags_dialog_class_init (AddTagsDialogClass * klass) { #line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala" add_tags_dialog_parent_class = g_type_class_peek_parent (klass); #line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = add_tags_dialog_real_on_modify_validate; + ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) add_tags_dialog_real_on_modify_validate; #line 15977 "Dialogs.c" } @@ -16085,7 +16085,7 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) { #line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala" terminal_tags = _tmp5_; #line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala" tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 16075 "Dialogs.c" @@ -16302,7 +16302,7 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) { #line 16286 "Dialogs.c" } #line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala" new_tags = _tmp2_; #line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -16445,7 +16445,7 @@ static void modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) { #line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala" modify_tags_dialog_parent_class = g_type_class_peek_parent (klass); #line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala" - ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = modify_tags_dialog_real_on_modify_validate; + ((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) modify_tags_dialog_real_on_modify_validate; #line 16433 "Dialogs.c" } @@ -17528,6 +17528,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { gboolean _tmp2_ = FALSE; GFile* _tmp3_ = NULL; GFileType _tmp4_ = 0; + gboolean _tmp13_ = FALSE; GError * _inner_error_ = NULL; #line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = app_dirs_get_import_dir (); @@ -17545,7 +17546,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { _g_object_unref0 (system_pictures); #line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 17532 "Dialogs.c" +#line 17533 "Dialogs.c" } #line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp3_ = system_pictures; @@ -17559,7 +17560,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { _g_object_unref0 (system_pictures); #line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 17546 "Dialogs.c" +#line 17547 "Dialogs.c" } { GFileEnumerator* syspics_child_enum = NULL; @@ -17579,7 +17580,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { syspics_child_enum = _tmp6_; #line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17566 "Dialogs.c" +#line 17567 "Dialogs.c" goto __catch426_g_error; } #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -17592,7 +17593,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (syspics_child_enum); -#line 17579 "Dialogs.c" +#line 17580 "Dialogs.c" goto __catch426_g_error; } #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -17615,7 +17616,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { _g_object_unref0 (system_pictures); #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 17602 "Dialogs.c" +#line 17603 "Dialogs.c" } goto __finally426; __catch426_g_error: @@ -17633,7 +17634,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { _g_object_unref0 (system_pictures); #line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 17620 "Dialogs.c" +#line 17621 "Dialogs.c" } __finally426: #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -17643,8 +17644,8 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) { #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala" g_clear_error (&_inner_error_); #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala" - return FALSE; -#line 17631 "Dialogs.c" + return _tmp13_; +#line 17632 "Dialogs.c" } @@ -17655,7 +17656,7 @@ static void welcome_dialog_class_init (WelcomeDialogClass * klass) { g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate)); #line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala" G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize; -#line 17642 "Dialogs.c" +#line 17643 "Dialogs.c" } @@ -17686,7 +17687,7 @@ static void welcome_dialog_instance_init (WelcomeDialog * self) { self->priv->import_content_already_installed = FALSE; #line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv->ok_clicked = FALSE; -#line 17673 "Dialogs.c" +#line 17674 "Dialogs.c" } @@ -17716,7 +17717,7 @@ static void welcome_dialog_finalize (GObject* obj) { _g_object_unref0 (self->priv->import_meta_host); #line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala" G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj); -#line 17703 "Dialogs.c" +#line 17704 "Dialogs.c" } @@ -17737,21 +17738,21 @@ static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget result = preferences_dialog_on_delete ((PreferencesDialog*) self); #line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 17724 "Dialogs.c" +#line 17725 "Dialogs.c" } static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_close ((PreferencesDialog*) self); -#line 17731 "Dialogs.c" +#line 17732 "Dialogs.c" } static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { #line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_value_changed ((PreferencesDialog*) self); -#line 17738 "Dialogs.c" +#line 17739 "Dialogs.c" } @@ -17760,7 +17761,7 @@ static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_ev result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event); #line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 17747 "Dialogs.c" +#line 17748 "Dialogs.c" } @@ -17769,49 +17770,49 @@ static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_lin result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri); #line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 17756 "Dialogs.c" +#line 17757 "Dialogs.c" } static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self); -#line 17763 "Dialogs.c" +#line 17764 "Dialogs.c" } static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self); -#line 17770 "Dialogs.c" +#line 17771 "Dialogs.c" } static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { #line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self); -#line 17777 "Dialogs.c" +#line 17778 "Dialogs.c" } static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self); -#line 17784 "Dialogs.c" +#line 17785 "Dialogs.c" } static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self); -#line 17791 "Dialogs.c" +#line 17792 "Dialogs.c" } static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self); -#line 17798 "Dialogs.c" +#line 17799 "Dialogs.c" } @@ -17820,7 +17821,7 @@ static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _ result = preferences_dialog_map_event ((PreferencesDialog*) self); #line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 17807 "Dialogs.c" +#line 17808 "Dialogs.c" } @@ -17966,7 +17967,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) { _tmp5_ = use_header; #line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!_tmp5_) { -#line 17953 "Dialogs.c" +#line 17954 "Dialogs.c" GtkWidget* null_titlebar = NULL; GtkDialog* _tmp6_ = NULL; GtkWidget* _tmp7_ = NULL; @@ -17980,7 +17981,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) { gtk_window_set_titlebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp7_); #line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (null_titlebar); -#line 17967 "Dialogs.c" +#line 17968 "Dialogs.c" } #line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp8_ = self->priv->dialog; @@ -18104,7 +18105,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) { _tmp45_ = help_path; #line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp45_ == NULL) { -#line 18091 "Dialogs.c" +#line 18092 "Dialogs.c" GtkLabel* _tmp46_ = NULL; const gchar* _tmp47_ = NULL; gchar* _tmp48_ = NULL; @@ -18129,7 +18130,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) { _g_free0 (_tmp51_); #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (_tmp49_); -#line 18116 "Dialogs.c" +#line 18117 "Dialogs.c" } else { GtkLabel* _tmp52_ = NULL; const gchar* _tmp53_ = NULL; @@ -18160,7 +18161,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) { _tmp58_ = pattern_help; #line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala" g_signal_connect (_tmp58_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self); -#line 18147 "Dialogs.c" +#line 18148 "Dialogs.c" } #line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp59_ = self->priv->builder; @@ -18384,14 +18385,14 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) { _g_object_unref0 (pattern_help); #line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 18371 "Dialogs.c" +#line 18372 "Dialogs.c" } static PreferencesDialog* preferences_dialog_new (void) { #line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala" return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG); -#line 18378 "Dialogs.c" +#line 18379 "Dialogs.c" } @@ -18498,7 +18499,7 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) { gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_); #line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp22_); -#line 18485 "Dialogs.c" +#line 18486 "Dialogs.c" } @@ -18509,7 +18510,7 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE); #line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala" g_return_val_if_fail (ignore != NULL, FALSE); -#line 18496 "Dialogs.c" +#line 18497 "Dialogs.c" { AppWindow* _tmp0_ = NULL; AppWindow* _tmp1_ = NULL; @@ -18526,7 +18527,7 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel _g_object_unref0 (_tmp1_); #line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18513 "Dialogs.c" +#line 18514 "Dialogs.c" goto __catch427_g_error; } } @@ -18548,24 +18549,26 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel g_message ("Dialogs.vala:2403: Unable to launch help: %s", _tmp4_); #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_error_free0 (e); -#line 18535 "Dialogs.c" +#line 18536 "Dialogs.c" } __finally427: #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 18541 "Dialogs.c" + gboolean _tmp5_ = FALSE; #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala" g_clear_error (&_inner_error_); #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala" - return FALSE; -#line 18546 "Dialogs.c" + return _tmp5_; +#line 18549 "Dialogs.c" } #line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala" result = TRUE; #line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 18552 "Dialogs.c" +#line 18555 "Dialogs.c" } @@ -18634,15 +18637,15 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, if (external_apps) { #line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala" *external_apps = _vala_external_apps; -#line 18621 "Dialogs.c" +#line 18624 "Dialogs.c" } else { #line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_vala_external_apps); -#line 18625 "Dialogs.c" +#line 18628 "Dialogs.c" } #line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 18629 "Dialogs.c" +#line 18632 "Dialogs.c" } #line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); @@ -18690,7 +18693,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, combo_store = _tmp17_; #line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala" current_app = -1; -#line 18677 "Dialogs.c" +#line 18680 "Dialogs.c" { GeeIterator* _app_it = NULL; SortedList* _tmp18_ = NULL; @@ -18703,7 +18706,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, _app_it = _tmp19_; #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 18690 "Dialogs.c" +#line 18693 "Dialogs.c" GeeIterator* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; GAppInfo* app = NULL; @@ -18731,7 +18734,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, if (!_tmp21_) { #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 18718 "Dialogs.c" +#line 18721 "Dialogs.c" } #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp22_ = _app_it; @@ -18753,14 +18756,14 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, _tmp28_ = _g_object_ref0 (_tmp27_); #line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala" app_icon = _tmp28_; -#line 18740 "Dialogs.c" +#line 18743 "Dialogs.c" { GIcon* _tmp29_ = NULL; #line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp29_ = app_icon; #line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) { -#line 18747 "Dialogs.c" +#line 18750 "Dialogs.c" GdkPixbuf* _tmp30_ = NULL; GIcon* _tmp31_ = NULL; GFile* _tmp32_ = NULL; @@ -18790,7 +18793,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, _tmp30_ = _tmp36_; #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18777 "Dialogs.c" +#line 18780 "Dialogs.c" goto __catch428_g_error; } #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -18809,14 +18812,14 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL; #line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp30_); -#line 18796 "Dialogs.c" +#line 18799 "Dialogs.c" } else { GIcon* _tmp41_ = NULL; #line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp41_ = app_icon; #line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) { -#line 18803 "Dialogs.c" +#line 18806 "Dialogs.c" GdkPixbuf* icon_pixbuf = NULL; GtkIconTheme* _tmp42_ = NULL; GIcon* _tmp43_ = NULL; @@ -18842,7 +18845,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, icon_pixbuf = _tmp47_; #line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18829 "Dialogs.c" +#line 18832 "Dialogs.c" goto __catch428_g_error; } #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -18861,7 +18864,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL; #line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (icon_pixbuf); -#line 18848 "Dialogs.c" +#line 18851 "Dialogs.c" } } } @@ -18891,7 +18894,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, _g_free0 (_tmp55_); #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_error_free0 (_error_); -#line 18878 "Dialogs.c" +#line 18881 "Dialogs.c" } __finally428: #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -18914,7 +18917,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, g_clear_error (&_inner_error_); #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 18901 "Dialogs.c" +#line 18904 "Dialogs.c" } #line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp56_ = combo_store; @@ -18940,7 +18943,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, _tmp63_ = current_app_executable; #line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala" if (g_strcmp0 (_tmp62_, _tmp63_) == 0) { -#line 18927 "Dialogs.c" +#line 18930 "Dialogs.c" SortedList* _tmp64_ = NULL; GAppInfo* _tmp65_ = NULL; gint _tmp66_ = 0; @@ -18952,17 +18955,17 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, _tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_); #line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala" current_app = _tmp66_; -#line 18939 "Dialogs.c" +#line 18942 "Dialogs.c" } #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (app_icon); #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (app); -#line 18945 "Dialogs.c" +#line 18948 "Dialogs.c" } #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_app_it); -#line 18949 "Dialogs.c" +#line 18952 "Dialogs.c" } #line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp67_ = combo_box; @@ -18974,7 +18977,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, _tmp69_ = current_app; #line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp69_ != -1) { -#line 18961 "Dialogs.c" +#line 18964 "Dialogs.c" GtkComboBox* _tmp70_ = NULL; gint _tmp71_ = 0; #line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -18983,7 +18986,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, _tmp71_ = current_app; #line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_combo_box_set_active (_tmp70_, _tmp71_); -#line 18970 "Dialogs.c" +#line 18973 "Dialogs.c" } #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (combo_store); @@ -18995,11 +18998,11 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, if (external_apps) { #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala" *external_apps = _vala_external_apps; -#line 18982 "Dialogs.c" +#line 18985 "Dialogs.c" } else { #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_vala_external_apps); -#line 18986 "Dialogs.c" +#line 18989 "Dialogs.c" } } @@ -19037,11 +19040,11 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo _tmp4_ = pattern; #line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala" if (NULL != _tmp4_) { -#line 19024 "Dialogs.c" +#line 19027 "Dialogs.c" gint i = 0; #line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala" i = 0; -#line 19028 "Dialogs.c" +#line 19031 "Dialogs.c" { GeeArrayList* _pf_list = NULL; GeeArrayList* _tmp5_ = NULL; @@ -19060,7 +19063,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp7_ = _pf_list; #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp9_ = _tmp8_; #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -19069,7 +19072,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo _pf_index = -1; #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" while (TRUE) { -#line 19056 "Dialogs.c" +#line 19059 "Dialogs.c" gint _tmp10_ = 0; gint _tmp11_ = 0; gint _tmp12_ = 0; @@ -19093,7 +19096,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo if (!(_tmp11_ < _tmp12_)) { #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 19080 "Dialogs.c" +#line 19083 "Dialogs.c" } #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp13_ = _pf_list; @@ -19111,7 +19114,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo _tmp18_ = pattern; #line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala" if (g_strcmp0 (_tmp17_, _tmp18_) == 0) { -#line 19098 "Dialogs.c" +#line 19101 "Dialogs.c" GtkComboBox* _tmp19_ = NULL; gint _tmp20_ = 0; #line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -19126,7 +19129,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo _preferences_dialog_path_format_unref0 (pf); #line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala" break; -#line 19113 "Dialogs.c" +#line 19116 "Dialogs.c" } #line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp21_ = i; @@ -19134,11 +19137,11 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo i = _tmp21_ + 1; #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" _preferences_dialog_path_format_unref0 (pf); -#line 19121 "Dialogs.c" +#line 19124 "Dialogs.c" } #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_pf_list); -#line 19125 "Dialogs.c" +#line 19128 "Dialogs.c" } } else { gchar* s = NULL; @@ -19166,7 +19169,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo _tmp27_ = is_string_empty (_tmp26_); #line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!_tmp27_) { -#line 19153 "Dialogs.c" +#line 19156 "Dialogs.c" GtkComboBox* _tmp28_ = NULL; GeeArrayList* _tmp29_ = NULL; gint _tmp30_ = 0; @@ -19176,36 +19179,36 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp29_ = self->priv->path_formats; #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp31_ = _tmp30_; #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1); #line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala" found = TRUE; -#line 19170 "Dialogs.c" +#line 19173 "Dialogs.c" } #line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (s); -#line 19174 "Dialogs.c" +#line 19177 "Dialogs.c" } #line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp32_ = found; #line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!_tmp32_) { -#line 19180 "Dialogs.c" +#line 19183 "Dialogs.c" GtkComboBox* _tmp33_ = NULL; #line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp33_ = combo_box; #line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_combo_box_set_active (_tmp33_, 0); -#line 19186 "Dialogs.c" +#line 19189 "Dialogs.c" } #line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_dir_pattern_combo_changed (self); #line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (pattern); -#line 19192 "Dialogs.c" +#line 19195 "Dialogs.c" } @@ -19226,7 +19229,7 @@ void preferences_dialog_show (void) { _tmp0_ = preferences_dialog_preferences_dialog; #line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp0_ == NULL) { -#line 19213 "Dialogs.c" +#line 19216 "Dialogs.c" PreferencesDialog* _tmp1_ = NULL; #line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp1_ = preferences_dialog_new (); @@ -19234,7 +19237,7 @@ void preferences_dialog_show (void) { _preferences_dialog_unref0 (preferences_dialog_preferences_dialog); #line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_preferences_dialog = _tmp1_; -#line 19221 "Dialogs.c" +#line 19224 "Dialogs.c" } #line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp2_ = preferences_dialog_preferences_dialog; @@ -19270,7 +19273,7 @@ void preferences_dialog_show (void) { _tmp12_ = _tmp11_->priv->dialog; #line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow)); -#line 19257 "Dialogs.c" +#line 19260 "Dialogs.c" } @@ -19317,7 +19320,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { _tmp5_ = autoimport; #line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp5_ != NULL) { -#line 19304 "Dialogs.c" +#line 19307 "Dialogs.c" ConfigFacade* _tmp6_ = NULL; ConfigFacade* _tmp7_ = NULL; GtkCheckButton* _tmp8_ = NULL; @@ -19337,7 +19340,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { configuration_facade_set_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_); #line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp7_); -#line 19324 "Dialogs.c" +#line 19327 "Dialogs.c" } #line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp11_ = self->priv->builder; @@ -19351,7 +19354,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { _tmp14_ = commit_metadata; #line 2519 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp14_ != NULL) { -#line 19338 "Dialogs.c" +#line 19341 "Dialogs.c" ConfigFacade* _tmp15_ = NULL; ConfigFacade* _tmp16_ = NULL; GtkCheckButton* _tmp17_ = NULL; @@ -19371,19 +19374,19 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { configuration_facade_set_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp19_); #line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp16_); -#line 19358 "Dialogs.c" +#line 19361 "Dialogs.c" } #line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp20_ = self->priv->lib_dir; #line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp20_ != NULL) { -#line 19364 "Dialogs.c" +#line 19367 "Dialogs.c" const gchar* _tmp21_ = NULL; #line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp21_ = self->priv->lib_dir; #line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala" app_dirs_set_import_dir (_tmp21_); -#line 19370 "Dialogs.c" +#line 19373 "Dialogs.c" } #line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp22_ = self->priv->path_formats; @@ -19401,7 +19404,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { _tmp27_ = _tmp26_->pattern; #line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala" if (NULL == _tmp27_) { -#line 19388 "Dialogs.c" +#line 19391 "Dialogs.c" ConfigFacade* _tmp28_ = NULL; ConfigFacade* _tmp29_ = NULL; GtkEntry* _tmp30_ = NULL; @@ -19431,7 +19434,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL); #line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp34_); -#line 19418 "Dialogs.c" +#line 19421 "Dialogs.c" } else { ConfigFacade* _tmp35_ = NULL; ConfigFacade* _tmp36_ = NULL; @@ -19449,7 +19452,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp38_); #line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp36_); -#line 19436 "Dialogs.c" +#line 19439 "Dialogs.c" } #line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala" _preferences_dialog_path_format_unref0 (pf); @@ -19457,7 +19460,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) { _g_object_unref0 (commit_metadata); #line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (autoimport); -#line 19444 "Dialogs.c" +#line 19447 "Dialogs.c" } @@ -19476,7 +19479,7 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) { result = TRUE; #line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 19463 "Dialogs.c" +#line 19466 "Dialogs.c" } #line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_commit_on_close (self); @@ -19488,7 +19491,7 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) { result = _tmp2_; #line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 19475 "Dialogs.c" +#line 19478 "Dialogs.c" } @@ -19503,7 +19506,7 @@ static void preferences_dialog_on_close (PreferencesDialog* self) { if (!_tmp0_) { #line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 19490 "Dialogs.c" +#line 19493 "Dialogs.c" } #line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp1_ = self->priv->dialog; @@ -19511,7 +19514,7 @@ static void preferences_dialog_on_close (PreferencesDialog* self) { gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); #line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_commit_on_close (self); -#line 19498 "Dialogs.c" +#line 19501 "Dialogs.c" } @@ -19532,7 +19535,7 @@ static void preferences_dialog_on_value_changed (PreferencesDialog* self) { _tmp3_ = gtk_adjustment_get_value (_tmp2_); #line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0); -#line 19519 "Dialogs.c" +#line 19522 "Dialogs.c" } @@ -19552,7 +19555,7 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G _tmp3_ = _tmp2_->button; #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp3_ == ((guint) 1)) { -#line 19539 "Dialogs.c" +#line 19542 "Dialogs.c" GdkEventButton* _tmp4_ = NULL; GdkEventType _tmp5_ = 0; #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -19561,15 +19564,15 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G _tmp5_ = _tmp4_->type; #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp1_ = _tmp5_ == GDK_BUTTON_PRESS; -#line 19548 "Dialogs.c" +#line 19551 "Dialogs.c" } else { #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp1_ = FALSE; -#line 19552 "Dialogs.c" +#line 19555 "Dialogs.c" } #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp1_) { -#line 19556 "Dialogs.c" +#line 19559 "Dialogs.c" GdkEventButton* _tmp6_ = NULL; GdkModifierType _tmp7_ = 0; gboolean _tmp8_ = FALSE; @@ -19581,15 +19584,15 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G _tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK); #line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _tmp8_; -#line 19568 "Dialogs.c" +#line 19571 "Dialogs.c" } else { #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = FALSE; -#line 19572 "Dialogs.c" +#line 19575 "Dialogs.c" } #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp0_) { -#line 19576 "Dialogs.c" +#line 19579 "Dialogs.c" GtkScale* _tmp9_ = NULL; GtkAdjustment* _tmp10_ = NULL; gdouble _tmp11_ = 0.0; @@ -19613,13 +19616,13 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G result = TRUE; #line 2563 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 19600 "Dialogs.c" +#line 19603 "Dialogs.c" } #line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala" result = FALSE; #line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 19606 "Dialogs.c" +#line 19609 "Dialogs.c" } @@ -19649,7 +19652,7 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* _tmp5_ = _tmp4_->pattern; #line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala" if (NULL == _tmp5_) { -#line 19636 "Dialogs.c" +#line 19639 "Dialogs.c" gchar* dir_pattern = NULL; ConfigFacade* _tmp6_ = NULL; ConfigFacade* _tmp7_ = NULL; @@ -19679,7 +19682,7 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* _tmp11_ = is_string_empty (_tmp10_); #line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp11_) { -#line 19666 "Dialogs.c" +#line 19669 "Dialogs.c" gchar* _tmp12_ = NULL; #line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp12_ = g_strdup (""); @@ -19687,7 +19690,7 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* _g_free0 (dir_pattern); #line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala" dir_pattern = _tmp12_; -#line 19674 "Dialogs.c" +#line 19677 "Dialogs.c" } #line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp13_ = self->priv->dir_pattern_entry; @@ -19705,7 +19708,7 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE); #line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (dir_pattern); -#line 19692 "Dialogs.c" +#line 19695 "Dialogs.c" } else { GtkEntry* _tmp17_ = NULL; PreferencesDialogPathFormat* _tmp18_ = NULL; @@ -19728,11 +19731,11 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* _tmp21_ = self->priv->dir_pattern_entry; #line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 19715 "Dialogs.c" +#line 19718 "Dialogs.c" } #line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala" _preferences_dialog_path_format_unref0 (pf); -#line 19719 "Dialogs.c" +#line 19722 "Dialogs.c" } @@ -19766,7 +19769,7 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* _tmp7_ = is_string_empty (_tmp6_); #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp7_) { -#line 19753 "Dialogs.c" +#line 19756 "Dialogs.c" GtkEntry* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; @@ -19781,15 +19784,15 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* _tmp11_ = is_string_empty (_tmp10_); #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp5_ = !_tmp11_; -#line 19768 "Dialogs.c" +#line 19771 "Dialogs.c" } else { #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp5_ = FALSE; -#line 19772 "Dialogs.c" +#line 19775 "Dialogs.c" } #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp5_) { -#line 19776 "Dialogs.c" +#line 19779 "Dialogs.c" GtkLabel* _tmp12_ = NULL; const gchar* _tmp13_ = NULL; GtkEntry* _tmp14_ = NULL; @@ -19810,7 +19813,7 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* gtk_entry_set_icon_activatable (_tmp15_, GTK_ENTRY_ICON_SECONDARY, FALSE); #line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_set_allow_closing (self, FALSE); -#line 19797 "Dialogs.c" +#line 19800 "Dialogs.c" } else { GtkLabel* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; @@ -19827,11 +19830,11 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* gtk_entry_set_icon_from_icon_name (_tmp18_, GTK_ENTRY_ICON_SECONDARY, NULL); #line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_set_allow_closing (self, TRUE); -#line 19814 "Dialogs.c" +#line 19817 "Dialogs.c" } #line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (example); -#line 19818 "Dialogs.c" +#line 19821 "Dialogs.c" } @@ -19851,7 +19854,7 @@ static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gbool _tmp2_ = allow; #line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv->allow_closing = _tmp2_; -#line 19838 "Dialogs.c" +#line 19841 "Dialogs.c" } @@ -19866,7 +19869,7 @@ static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) { result = _tmp0_; #line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 19853 "Dialogs.c" +#line 19856 "Dialogs.c" } @@ -19889,7 +19892,7 @@ static void preferences_dialog_set_background_color (PreferencesDialog* self, gd config_facade_set_bg_color (_tmp1_, &_tmp3_); #line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp1_); -#line 19876 "Dialogs.c" +#line 19879 "Dialogs.c" } @@ -19920,7 +19923,7 @@ static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble co *result = color; #line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 19907 "Dialogs.c" +#line 19910 "Dialogs.c" } @@ -19955,7 +19958,7 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) _tmp5_ = _tmp4_; #line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp2_ < _tmp5_) { -#line 19942 "Dialogs.c" +#line 19945 "Dialogs.c" GtkComboBox* _tmp6_ = NULL; gint _tmp7_ = 0; #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -19964,7 +19967,7 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) _tmp7_ = gtk_combo_box_get_active (_tmp6_); #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _tmp7_; -#line 19951 "Dialogs.c" +#line 19954 "Dialogs.c" } else { SortedList* _tmp8_ = NULL; gint _tmp9_ = 0; @@ -19977,7 +19980,7 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) _tmp10_ = _tmp9_; #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _tmp10_; -#line 19964 "Dialogs.c" +#line 19967 "Dialogs.c" } #line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala" photo_app_choice_index = _tmp0_; @@ -20011,7 +20014,7 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) _g_free0 (_tmp18_); #line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (app); -#line 19998 "Dialogs.c" +#line 20001 "Dialogs.c" } @@ -20044,7 +20047,7 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) { _tmp5_ = _tmp4_; #line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp2_ < _tmp5_) { -#line 20031 "Dialogs.c" +#line 20034 "Dialogs.c" GtkComboBox* _tmp6_ = NULL; gint _tmp7_ = 0; #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -20053,7 +20056,7 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) { _tmp7_ = gtk_combo_box_get_active (_tmp6_); #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _tmp7_; -#line 20040 "Dialogs.c" +#line 20043 "Dialogs.c" } else { SortedList* _tmp8_ = NULL; gint _tmp9_ = 0; @@ -20066,7 +20069,7 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) { _tmp10_ = _tmp9_; #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _tmp10_; -#line 20053 "Dialogs.c" +#line 20056 "Dialogs.c" } #line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala" raw_app_choice_index = _tmp0_; @@ -20092,7 +20095,7 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) { g_debug ("Dialogs.vala:2645: setting external raw editor to: %s", _tmp16_); #line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (app); -#line 20079 "Dialogs.c" +#line 20082 "Dialogs.c" } @@ -20112,13 +20115,13 @@ static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDial result = RAW_DEVELOPER_CAMERA; #line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 20099 "Dialogs.c" +#line 20102 "Dialogs.c" } #line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala" result = RAW_DEVELOPER_SHOTWELL; #line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 20105 "Dialogs.c" +#line 20108 "Dialogs.c" } @@ -20130,20 +20133,20 @@ static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, _tmp0_ = d; #line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp0_ == RAW_DEVELOPER_CAMERA) { -#line 20117 "Dialogs.c" +#line 20120 "Dialogs.c" GtkComboBoxText* _tmp1_ = NULL; #line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp1_ = self->priv->default_raw_developer_combo; #line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 20123 "Dialogs.c" +#line 20126 "Dialogs.c" } else { GtkComboBoxText* _tmp2_ = NULL; #line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp2_ = self->priv->default_raw_developer_combo; #line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1); -#line 20130 "Dialogs.c" +#line 20133 "Dialogs.c" } } @@ -20164,7 +20167,7 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_); #line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp1_); -#line 20151 "Dialogs.c" +#line 20154 "Dialogs.c" } @@ -20181,14 +20184,14 @@ static void preferences_dialog_on_current_folder_changed (PreferencesDialog* sel _g_free0 (self->priv->lib_dir); #line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv->lib_dir = _tmp1_; -#line 20168 "Dialogs.c" +#line 20171 "Dialogs.c" } static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) { #line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self); -#line 20175 "Dialogs.c" +#line 20178 "Dialogs.c" } @@ -20205,7 +20208,7 @@ static gboolean preferences_dialog_map_event (PreferencesDialog* self) { result = TRUE; #line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 20192 "Dialogs.c" +#line 20195 "Dialogs.c" } @@ -20241,7 +20244,7 @@ static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, cons gtk_combo_box_text_append_text (_tmp4_, _tmp5_); #line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala" _preferences_dialog_path_format_unref0 (pf); -#line 20228 "Dialogs.c" +#line 20231 "Dialogs.c" } @@ -20264,7 +20267,7 @@ static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) { configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_); #line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (_tmp1_); -#line 20251 "Dialogs.c" +#line 20254 "Dialogs.c" } @@ -20296,21 +20299,21 @@ static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GT self->pattern = _tmp3_; #line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala" return self; -#line 20283 "Dialogs.c" +#line 20286 "Dialogs.c" } static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) { #line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala" return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern); -#line 20290 "Dialogs.c" +#line 20293 "Dialogs.c" } static void preferences_dialog_value_path_format_init (GValue* value) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 20297 "Dialogs.c" +#line 20300 "Dialogs.c" } @@ -20319,7 +20322,7 @@ static void preferences_dialog_value_path_format_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_path_format_unref (value->data[0].v_pointer); -#line 20306 "Dialogs.c" +#line 20309 "Dialogs.c" } } @@ -20329,11 +20332,11 @@ static void preferences_dialog_value_path_format_copy_value (const GValue* src_v if (src_value->data[0].v_pointer) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer); -#line 20316 "Dialogs.c" +#line 20319 "Dialogs.c" } else { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = NULL; -#line 20320 "Dialogs.c" +#line 20323 "Dialogs.c" } } @@ -20341,37 +20344,37 @@ static void preferences_dialog_value_path_format_copy_value (const GValue* src_v static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 20328 "Dialogs.c" +#line 20331 "Dialogs.c" } static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" if (collect_values[0].v_pointer) { -#line 20335 "Dialogs.c" +#line 20338 "Dialogs.c" PreferencesDialogPathFormat* object; object = collect_values[0].v_pointer; #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" if (object->parent_instance.g_class == NULL) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 20342 "Dialogs.c" +#line 20345 "Dialogs.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 20346 "Dialogs.c" +#line 20349 "Dialogs.c" } #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = preferences_dialog_path_format_ref (object); -#line 20350 "Dialogs.c" +#line 20353 "Dialogs.c" } else { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 20354 "Dialogs.c" +#line 20357 "Dialogs.c" } #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 20358 "Dialogs.c" +#line 20361 "Dialogs.c" } @@ -20382,25 +20385,25 @@ static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* va if (!object_p) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 20369 "Dialogs.c" +#line 20372 "Dialogs.c" } #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!value->data[0].v_pointer) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = NULL; -#line 20375 "Dialogs.c" +#line 20378 "Dialogs.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = value->data[0].v_pointer; -#line 20379 "Dialogs.c" +#line 20382 "Dialogs.c" } else { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer); -#line 20383 "Dialogs.c" +#line 20386 "Dialogs.c" } #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 20387 "Dialogs.c" +#line 20390 "Dialogs.c" } @@ -20414,7 +20417,7 @@ static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return G_PARAM_SPEC (spec); -#line 20401 "Dialogs.c" +#line 20404 "Dialogs.c" } @@ -20423,7 +20426,7 @@ static gpointer preferences_dialog_value_get_path_format (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL); #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 20410 "Dialogs.c" +#line 20413 "Dialogs.c" } @@ -20443,17 +20446,17 @@ static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_ value->data[0].v_pointer = v_object; #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_path_format_ref (value->data[0].v_pointer); -#line 20430 "Dialogs.c" +#line 20433 "Dialogs.c" } else { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 20434 "Dialogs.c" +#line 20437 "Dialogs.c" } #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_path_format_unref (old); -#line 20440 "Dialogs.c" +#line 20443 "Dialogs.c" } } @@ -20472,17 +20475,17 @@ static void preferences_dialog_value_take_path_format (GValue* value, gpointer v g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = v_object; -#line 20459 "Dialogs.c" +#line 20462 "Dialogs.c" } else { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 20463 "Dialogs.c" +#line 20466 "Dialogs.c" } #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_path_format_unref (old); -#line 20469 "Dialogs.c" +#line 20472 "Dialogs.c" } } @@ -20492,14 +20495,14 @@ static void preferences_dialog_path_format_class_init (PreferencesDialogPathForm preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass); #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" ((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize; -#line 20479 "Dialogs.c" +#line 20482 "Dialogs.c" } static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) { #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" self->ref_count = 1; -#line 20486 "Dialogs.c" +#line 20489 "Dialogs.c" } @@ -20513,7 +20516,7 @@ static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat _g_free0 (self->name); #line 2271 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (self->pattern); -#line 20500 "Dialogs.c" +#line 20503 "Dialogs.c" } @@ -20538,7 +20541,7 @@ static gpointer preferences_dialog_path_format_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" return instance; -#line 20525 "Dialogs.c" +#line 20528 "Dialogs.c" } @@ -20551,7 +20554,7 @@ static void preferences_dialog_path_format_unref (gpointer instance) { PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self); #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_free_instance ((GTypeInstance *) self); -#line 20538 "Dialogs.c" +#line 20541 "Dialogs.c" } } @@ -20559,7 +20562,7 @@ static void preferences_dialog_path_format_unref (gpointer instance) { static void value_preferences_dialog_init (GValue* value) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 20546 "Dialogs.c" +#line 20549 "Dialogs.c" } @@ -20568,7 +20571,7 @@ static void value_preferences_dialog_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_unref (value->data[0].v_pointer); -#line 20555 "Dialogs.c" +#line 20558 "Dialogs.c" } } @@ -20578,11 +20581,11 @@ static void value_preferences_dialog_copy_value (const GValue* src_value, GValue if (src_value->data[0].v_pointer) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = preferences_dialog_ref (src_value->data[0].v_pointer); -#line 20565 "Dialogs.c" +#line 20568 "Dialogs.c" } else { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" dest_value->data[0].v_pointer = NULL; -#line 20569 "Dialogs.c" +#line 20572 "Dialogs.c" } } @@ -20590,37 +20593,37 @@ static void value_preferences_dialog_copy_value (const GValue* src_value, GValue static gpointer value_preferences_dialog_peek_pointer (const GValue* value) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 20577 "Dialogs.c" +#line 20580 "Dialogs.c" } static gchar* value_preferences_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" if (collect_values[0].v_pointer) { -#line 20584 "Dialogs.c" +#line 20587 "Dialogs.c" PreferencesDialog* object; object = collect_values[0].v_pointer; #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" if (object->parent_instance.g_class == NULL) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 20591 "Dialogs.c" +#line 20594 "Dialogs.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 20595 "Dialogs.c" +#line 20598 "Dialogs.c" } #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = preferences_dialog_ref (object); -#line 20599 "Dialogs.c" +#line 20602 "Dialogs.c" } else { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 20603 "Dialogs.c" +#line 20606 "Dialogs.c" } #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 20607 "Dialogs.c" +#line 20610 "Dialogs.c" } @@ -20631,25 +20634,25 @@ static gchar* value_preferences_dialog_lcopy_value (const GValue* value, guint n if (!object_p) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 20618 "Dialogs.c" +#line 20621 "Dialogs.c" } #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!value->data[0].v_pointer) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = NULL; -#line 20624 "Dialogs.c" +#line 20627 "Dialogs.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = value->data[0].v_pointer; -#line 20628 "Dialogs.c" +#line 20631 "Dialogs.c" } else { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" *object_p = preferences_dialog_ref (value->data[0].v_pointer); -#line 20632 "Dialogs.c" +#line 20635 "Dialogs.c" } #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return NULL; -#line 20636 "Dialogs.c" +#line 20639 "Dialogs.c" } @@ -20663,7 +20666,7 @@ GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return G_PARAM_SPEC (spec); -#line 20650 "Dialogs.c" +#line 20653 "Dialogs.c" } @@ -20672,7 +20675,7 @@ gpointer value_get_preferences_dialog (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG), NULL); #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return value->data[0].v_pointer; -#line 20659 "Dialogs.c" +#line 20662 "Dialogs.c" } @@ -20692,17 +20695,17 @@ void value_set_preferences_dialog (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_ref (value->data[0].v_pointer); -#line 20679 "Dialogs.c" +#line 20682 "Dialogs.c" } else { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 20683 "Dialogs.c" +#line 20686 "Dialogs.c" } #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_unref (old); -#line 20689 "Dialogs.c" +#line 20692 "Dialogs.c" } } @@ -20721,17 +20724,17 @@ void value_take_preferences_dialog (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = v_object; -#line 20708 "Dialogs.c" +#line 20711 "Dialogs.c" } else { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" value->data[0].v_pointer = NULL; -#line 20712 "Dialogs.c" +#line 20715 "Dialogs.c" } #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" if (old) { #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" preferences_dialog_unref (old); -#line 20718 "Dialogs.c" +#line 20721 "Dialogs.c" } } @@ -20743,7 +20746,7 @@ static void preferences_dialog_class_init (PreferencesDialogClass * klass) { ((PreferencesDialogClass *) klass)->finalize = preferences_dialog_finalize; #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_class_add_private (klass, sizeof (PreferencesDialogPrivate)); -#line 20730 "Dialogs.c" +#line 20733 "Dialogs.c" } @@ -20758,7 +20761,7 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) { #line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv->lib_dir = NULL; #line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, preferences_dialog_path_format_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, (GDestroyNotify) preferences_dialog_path_format_unref, NULL, NULL, NULL); #line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala" self->priv->path_formats = _tmp0_; #line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -20771,7 +20774,7 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) { self->priv->plugins_mediator = _tmp2_; #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" self->ref_count = 1; -#line 20758 "Dialogs.c" +#line 20761 "Dialogs.c" } @@ -20817,7 +20820,7 @@ static void preferences_dialog_finalize (PreferencesDialog* obj) { _plugins_manifest_widget_mediator_unref0 (self->priv->plugins_mediator); #line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (self->priv->default_raw_developer_combo); -#line 20804 "Dialogs.c" +#line 20807 "Dialogs.c" } @@ -20842,7 +20845,7 @@ gpointer preferences_dialog_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" return instance; -#line 20829 "Dialogs.c" +#line 20832 "Dialogs.c" } @@ -20855,7 +20858,7 @@ void preferences_dialog_unref (gpointer instance) { PREFERENCES_DIALOG_GET_CLASS (self)->finalize (self); #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala" g_type_free_instance ((GTypeInstance *) self); -#line 20842 "Dialogs.c" +#line 20845 "Dialogs.c" } } @@ -20922,7 +20925,7 @@ GtkResponseType copy_files_dialog (void) { _g_free0 (msg); #line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 20908 "Dialogs.c" +#line 20911 "Dialogs.c" } @@ -20943,20 +20946,20 @@ void remove_photos_from_library (GeeCollection* photos) { _tmp3_ = _tmp2_; #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp3_ == 1) { -#line 20929 "Dialogs.c" +#line 20932 "Dialogs.c" const gchar* _tmp4_ = NULL; #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp4_ = _ ("Removing Photo From Library"); #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _tmp4_; -#line 20935 "Dialogs.c" +#line 20938 "Dialogs.c" } else { const gchar* _tmp5_ = NULL; #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp5_ = _ ("Removing Photos From Library"); #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp0_ = _tmp5_; -#line 20942 "Dialogs.c" +#line 20945 "Dialogs.c" } #line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp6_ = photos; @@ -20964,7 +20967,7 @@ void remove_photos_from_library (GeeCollection* photos) { _tmp7_ = _ ("Remove From Library"); #line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala" remove_from_app (_tmp6_, _tmp7_, _tmp0_); -#line 20950 "Dialogs.c" +#line 20953 "Dialogs.c" } @@ -20973,7 +20976,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala" return result; -#line 20959 "Dialogs.c" +#line 20962 "Dialogs.c" } @@ -21060,14 +21063,14 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g if (_tmp2_ == 0) { #line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 21046 "Dialogs.c" +#line 21049 "Dialogs.c" } #line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala" photos = _tmp3_; #line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala" videos = _tmp4_; #line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -21088,7 +21091,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _tmp11_ = _tmp10_; #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!_tmp11_) { -#line 21074 "Dialogs.c" +#line 21077 "Dialogs.c" GeeArrayList* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; gboolean _tmp14_ = FALSE; @@ -21100,15 +21103,15 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _tmp14_ = _tmp13_; #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp8_ = !_tmp14_; -#line 21086 "Dialogs.c" +#line 21089 "Dialogs.c" } else { #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp8_ = FALSE; -#line 21090 "Dialogs.c" +#line 21093 "Dialogs.c" } #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp8_) { -#line 21094 "Dialogs.c" +#line 21097 "Dialogs.c" GeeCollection* _tmp15_ = NULL; gint _tmp16_ = 0; gint _tmp17_ = 0; @@ -21143,7 +21146,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _g_free0 (user_message); #line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala" user_message = _tmp22_; -#line 21123 "Dialogs.c" +#line 21126 "Dialogs.c" } else { GeeArrayList* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; @@ -21156,7 +21159,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _tmp25_ = _tmp24_; #line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala" if (!_tmp25_) { -#line 21136 "Dialogs.c" +#line 21139 "Dialogs.c" GeeCollection* _tmp26_ = NULL; gint _tmp27_ = 0; gint _tmp28_ = 0; @@ -21191,7 +21194,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _g_free0 (user_message); #line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala" user_message = _tmp33_; -#line 21165 "Dialogs.c" +#line 21168 "Dialogs.c" } else { GeeCollection* _tmp34_ = NULL; gint _tmp35_ = 0; @@ -21227,7 +21230,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _g_free0 (user_message); #line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala" user_message = _tmp41_; -#line 21195 "Dialogs.c" +#line 21198 "Dialogs.c" } } #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -21256,17 +21259,17 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _tmp52_ = _result_; #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp52_ != GTK_RESPONSE_YES) { -#line 21224 "Dialogs.c" +#line 21227 "Dialogs.c" GtkResponseType _tmp53_ = 0; #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp53_ = _result_; #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp51_ = _tmp53_ != GTK_RESPONSE_NO; -#line 21230 "Dialogs.c" +#line 21233 "Dialogs.c" } else { #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp51_ = FALSE; -#line 21234 "Dialogs.c" +#line 21237 "Dialogs.c" } #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp51_) { @@ -21278,7 +21281,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _g_object_unref0 (photos); #line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala" return; -#line 21246 "Dialogs.c" +#line 21249 "Dialogs.c" } #line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp54_ = _result_; @@ -21308,7 +21311,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _tmp59_ = _tmp58_; #line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp59_ >= 20) { -#line 21276 "Dialogs.c" +#line 21279 "Dialogs.c" AppWindow* _tmp60_ = NULL; AppWindow* _tmp61_ = NULL; const gchar* _tmp62_ = NULL; @@ -21346,14 +21349,14 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g monitor_target = g_object_ref (_tmp64_); #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala" monitor_target_destroy_notify = g_object_unref; -#line 21314 "Dialogs.c" +#line 21317 "Dialogs.c" } #line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp65_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp65_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala" not_removed_photos = _tmp65_; #line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp66_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp66_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala" not_removed_videos = _tmp66_; #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -21387,13 +21390,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp77_ = not_removed_photos; #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp79_ = _tmp78_; #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp80_ = not_removed_videos; #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp82_ = _tmp81_; #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -21402,21 +21405,21 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _tmp84_ = delete_backing; #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp84_) { -#line 21370 "Dialogs.c" +#line 21373 "Dialogs.c" gint _tmp85_ = 0; #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp85_ = num_not_removed; #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp83_ = _tmp85_ > 0; -#line 21376 "Dialogs.c" +#line 21379 "Dialogs.c" } else { #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp83_ = FALSE; -#line 21380 "Dialogs.c" +#line 21383 "Dialogs.c" } #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp83_) { -#line 21384 "Dialogs.c" +#line 21387 "Dialogs.c" gchar* not_deleted_message = NULL; gint _tmp86_ = 0; const gchar* _tmp87_ = NULL; @@ -21462,7 +21465,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _tmp96_ = result_delete; #line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala" if (GTK_RESPONSE_YES == _tmp96_) { -#line 21428 "Dialogs.c" +#line 21431 "Dialogs.c" GeeArrayList* not_deleted_photos = NULL; GeeArrayList* _tmp97_ = NULL; GeeArrayList* not_deleted_videos = NULL; @@ -21486,11 +21489,11 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g gint _tmp112_ = 0; gint _tmp113_ = 0; #line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp97_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp97_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala" not_deleted_photos = _tmp97_; #line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp98_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp98_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala" not_deleted_videos = _tmp98_; #line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -21520,13 +21523,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp107_ = not_deleted_photos; #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp109_ = _tmp108_; #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp110_ = not_deleted_videos; #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp111_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp111_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp112_ = _tmp111_; #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -21535,7 +21538,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _tmp113_ = num_not_deleted; #line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp113_ > 0) { -#line 21501 "Dialogs.c" +#line 21504 "Dialogs.c" gchar* delete_failed_message = NULL; gint _tmp114_ = 0; const gchar* _tmp115_ = NULL; @@ -21569,29 +21572,29 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _g_object_unref0 (_tmp121_); #line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (delete_failed_message); -#line 21535 "Dialogs.c" +#line 21538 "Dialogs.c" } #line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (not_deleted_videos); #line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (not_deleted_photos); -#line 21541 "Dialogs.c" +#line 21544 "Dialogs.c" } #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_free0 (not_deleted_message); -#line 21545 "Dialogs.c" +#line 21548 "Dialogs.c" } #line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp122_ = progress; #line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala" if (_tmp122_ != NULL) { -#line 21551 "Dialogs.c" +#line 21554 "Dialogs.c" ProgressDialog* _tmp123_ = NULL; #line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp123_ = progress; #line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala" progress_dialog_close (_tmp123_); -#line 21557 "Dialogs.c" +#line 21560 "Dialogs.c" } #line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp124_ = app_window_get_instance (); @@ -21621,7 +21624,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g _g_object_unref0 (videos); #line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala" _g_object_unref0 (photos); -#line 21587 "Dialogs.c" +#line 21590 "Dialogs.c" } |