From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/Upgrades.c | 600 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 371 insertions(+), 229 deletions(-) (limited to 'src/Upgrades.c') diff --git a/src/Upgrades.c b/src/Upgrades.c index 0c4acc4..f8844af 100644 --- a/src/Upgrades.c +++ b/src/Upgrades.c @@ -1,4 +1,4 @@ -/* Upgrades.c generated by valac 0.36.6, the Vala compiler +/* Upgrades.c generated by valac 0.40.4, the Vala compiler * generated from Upgrades.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -10,6 +10,7 @@ /* moving or deleting files. This occurs after the UI is shown, so it's not appropriate*/ /* for database updates and such.*/ + #include #include #include @@ -74,8 +75,18 @@ typedef struct _FixupRawThumbnailsTaskClass FixupRawThumbnailsTaskClass; #define _upgrades_unref0(var) ((var == NULL) ? NULL : (var = (upgrades_unref (var), NULL))) typedef struct _ParamSpecUpgrades ParamSpecUpgrades; typedef struct _MimicsRemovalTaskPrivate MimicsRemovalTaskPrivate; +enum { + MIMICS_REMOVAL_TASK_0_PROPERTY, + MIMICS_REMOVAL_TASK_NUM_PROPERTIES +}; +static GParamSpec* mimics_removal_task_properties[MIMICS_REMOVAL_TASK_NUM_PROPERTIES]; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _FixupRawThumbnailsTaskPrivate FixupRawThumbnailsTaskPrivate; +enum { + FIXUP_RAW_THUMBNAILS_TASK_0_PROPERTY, + FIXUP_RAW_THUMBNAILS_TASK_NUM_PROPERTIES +}; +static GParamSpec* fixup_raw_thumbnails_task_properties[FIXUP_RAW_THUMBNAILS_TASK_NUM_PROPERTIES]; #define TYPE_PHOTO_ROW (photo_row_get_type ()) #define PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_ROW, PhotoRow)) @@ -441,27 +452,37 @@ static UpgradeTaskIface * fixup_raw_thumbnails_task_upgrade_task_parent_iface = gpointer upgrades_ref (gpointer instance); void upgrades_unref (gpointer instance); -GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_upgrades (GValue* value, gpointer v_object); -void value_take_upgrades (GValue* value, gpointer v_object); +GParamSpec* param_spec_upgrades (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_upgrades (GValue* value, + gpointer v_object); +void value_take_upgrades (GValue* value, + gpointer v_object); gpointer value_get_upgrades (const GValue* value); GType upgrades_get_type (void) G_GNUC_CONST; GType upgrade_task_get_type (void) G_GNUC_CONST; #define UPGRADES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_UPGRADES, UpgradesPrivate)) -enum { - UPGRADES_DUMMY_PROPERTY -}; static Upgrades* upgrades_new (void); static Upgrades* upgrades_construct (GType object_type); -static void upgrades_add (Upgrades* self, UpgradeTask* task); +static void upgrades_add (Upgrades* self, + UpgradeTask* task); MimicsRemovalTask* mimics_removal_task_new (void); MimicsRemovalTask* mimics_removal_task_construct (GType object_type); GType mimics_removal_task_get_type (void) G_GNUC_CONST; gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); @@ -472,36 +493,55 @@ GType fixup_raw_thumbnails_task_get_type (void) G_GNUC_CONST; void upgrades_init (void); Upgrades* upgrades_get_instance (void); guint64 upgrades_get_step_count (Upgrades* self); -void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target); -void upgrade_task_execute (UpgradeTask* self, ProgressMonitor monitor, void* monitor_target); +void upgrades_execute (Upgrades* self, + ProgressMonitor monitor, + void* monitor_target); +void upgrade_task_execute (UpgradeTask* self, + ProgressMonitor monitor, + void* monitor_target); guint64 upgrade_task_get_step_count (UpgradeTask* self); static void upgrades_finalize (Upgrades * obj); #define MIMICS_REMOVAL_TASK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTaskPrivate)) -enum { - MIMICS_REMOVAL_TASK_DUMMY_PROPERTY -}; GFile* app_dirs_get_data_dir (void); static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base); -guint64 count_files_in_directory (GFile* dir, GError** error); -static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target); -void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error); +guint64 count_files_in_directory (GFile* dir, + GError** error); +static void mimics_removal_task_real_execute (UpgradeTask* base, + ProgressMonitor monitor, + void* monitor_target); +void delete_all_files (GFile* dir, + GeeSet* exceptions, + ProgressMonitor monitor, + void* monitor_target, + guint64 file_count, + GCancellable* cancellable, + GError** error); static void mimics_removal_task_finalize (GObject * obj); -enum { - FIXUP_RAW_THUMBNAILS_TASK_DUMMY_PROPERTY -}; static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base); gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; @@ -512,9 +552,15 @@ PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; GType import_id_get_type (void) G_GNUC_CONST; @@ -533,16 +579,24 @@ GType photo_file_format_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target); +static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, + ProgressMonitor monitor, + void* monitor_target); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; void thumbnail_cache_remove (ThumbnailSource* source); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -553,17 +607,19 @@ GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id); +LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, + PhotoID* photo_id); -static Upgrades* upgrades_construct (GType object_type) { +static Upgrades* +upgrades_construct (GType object_type) +{ Upgrades* self = NULL; MimicsRemovalTask* _tmp0_; MimicsRemovalTask* _tmp1_; Application* _tmp2_; Application* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala" self = (Upgrades*) g_type_create_instance (object_type); #line 17 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -580,39 +636,41 @@ static Upgrades* upgrades_construct (GType object_type) { _tmp3_ = _tmp2_; #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp4_ = application_get_raw_thumbs_fix_required (_tmp3_); -#line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp5_ = _tmp4_; #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" _application_unref0 (_tmp3_); #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" - if (_tmp5_) { -#line 590 "Upgrades.c" + if (_tmp4_) { +#line 644 "Upgrades.c" + FixupRawThumbnailsTask* _tmp5_; FixupRawThumbnailsTask* _tmp6_; - FixupRawThumbnailsTask* _tmp7_; #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp6_ = fixup_raw_thumbnails_task_new (); + _tmp5_ = fixup_raw_thumbnails_task_new (); #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" - upgrades_add (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_UPGRADE_TASK, UpgradeTask)); + upgrades_add (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_UPGRADE_TASK, UpgradeTask)); #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" - _g_object_unref0 (_tmp7_); -#line 601 "Upgrades.c" + _g_object_unref0 (_tmp6_); +#line 655 "Upgrades.c" } #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 605 "Upgrades.c" +#line 659 "Upgrades.c" } -static Upgrades* upgrades_new (void) { +static Upgrades* +upgrades_new (void) +{ #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala" return upgrades_construct (TYPE_UPGRADES); -#line 612 "Upgrades.c" +#line 668 "Upgrades.c" } -void upgrades_init (void) { +void +upgrades_init (void) +{ Upgrades* _tmp0_; Upgrades* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -625,18 +683,22 @@ void upgrades_init (void) { _upgrades_unref0 (upgrades_instance); #line 26 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_instance = _tmp1_; -#line 629 "Upgrades.c" +#line 687 "Upgrades.c" } -static gpointer _upgrades_ref0 (gpointer self) { +static gpointer +_upgrades_ref0 (gpointer self) +{ #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala" return self ? upgrades_ref (self) : NULL; -#line 636 "Upgrades.c" +#line 696 "Upgrades.c" } -Upgrades* upgrades_get_instance (void) { +Upgrades* +upgrades_get_instance (void) +{ Upgrades* result = NULL; Upgrades* _tmp0_; Upgrades* _tmp1_; @@ -648,11 +710,13 @@ Upgrades* upgrades_get_instance (void) { result = _tmp1_; #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 652 "Upgrades.c" +#line 714 "Upgrades.c" } -guint64 upgrades_get_step_count (Upgrades* self) { +guint64 +upgrades_get_step_count (Upgrades* self) +{ guint64 result = 0ULL; guint64 _tmp0_; #line 34 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -663,21 +727,27 @@ guint64 upgrades_get_step_count (Upgrades* self) { result = _tmp0_; #line 35 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 667 "Upgrades.c" +#line 731 "Upgrades.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" return self ? g_object_ref (self) : NULL; -#line 674 "Upgrades.c" +#line 740 "Upgrades.c" } -void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target) { +void +upgrades_execute (Upgrades* self, + ProgressMonitor monitor, + void* monitor_target) +{ #line 39 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (IS_UPGRADES (self)); -#line 681 "Upgrades.c" +#line 751 "Upgrades.c" { GeeLinkedList* _task_list = NULL; GeeLinkedList* _tmp0_; @@ -705,7 +775,7 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta _task_index = -1; #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" while (TRUE) { -#line 709 "Upgrades.c" +#line 779 "Upgrades.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -714,8 +784,6 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta gint _tmp9_; gpointer _tmp10_; UpgradeTask* _tmp11_; - ProgressMonitor _tmp12_; - void* _tmp12__target; #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp5_ = _task_index; #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -728,7 +796,7 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta if (!(_tmp6_ < _tmp7_)) { #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" break; -#line 732 "Upgrades.c" +#line 800 "Upgrades.c" } #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp8_ = _task_list; @@ -741,28 +809,24 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta #line 41 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp11_ = task; #line 41 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp12_ = monitor; -#line 41 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp12__target = monitor_target; -#line 41 "/home/jens/Source/shotwell/src/Upgrades.vala" - upgrade_task_execute (_tmp11_, _tmp12_, _tmp12__target); + upgrade_task_execute (_tmp11_, monitor, monitor_target); #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (task); -#line 752 "Upgrades.c" +#line 816 "Upgrades.c" } #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_task_list); -#line 756 "Upgrades.c" +#line 820 "Upgrades.c" } } -static void upgrades_add (Upgrades* self, UpgradeTask* task) { +static void +upgrades_add (Upgrades* self, + UpgradeTask* task) +{ guint64 _tmp0_; - UpgradeTask* _tmp1_; - guint64 _tmp2_; - GeeLinkedList* _tmp3_; - UpgradeTask* _tmp4_; + GeeLinkedList* _tmp1_; #line 44 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (IS_UPGRADES (self)); #line 44 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -770,119 +834,138 @@ static void upgrades_add (Upgrades* self, UpgradeTask* task) { #line 45 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp0_ = self->priv->total_steps; #line 45 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp1_ = task; -#line 45 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp2_ = upgrade_task_get_step_count (_tmp1_); -#line 45 "/home/jens/Source/shotwell/src/Upgrades.vala" - self->priv->total_steps = _tmp0_ + _tmp2_; + self->priv->total_steps = _tmp0_ + upgrade_task_get_step_count (task); #line 46 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp3_ = self->priv->task_list; + _tmp1_ = self->priv->task_list; #line 46 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp4_ = task; -#line 46 "/home/jens/Source/shotwell/src/Upgrades.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 785 "Upgrades.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), task); +#line 843 "Upgrades.c" } -static void value_upgrades_init (GValue* value) { +static void +value_upgrades_init (GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 792 "Upgrades.c" +#line 852 "Upgrades.c" } -static void value_upgrades_free_value (GValue* value) { +static void +value_upgrades_free_value (GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_unref (value->data[0].v_pointer); -#line 801 "Upgrades.c" +#line 863 "Upgrades.c" } } -static void value_upgrades_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_upgrades_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (src_value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" dest_value->data[0].v_pointer = upgrades_ref (src_value->data[0].v_pointer); -#line 811 "Upgrades.c" +#line 876 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" dest_value->data[0].v_pointer = NULL; -#line 815 "Upgrades.c" +#line 880 "Upgrades.c" } } -static gpointer value_upgrades_peek_pointer (const GValue* value) { +static gpointer +value_upgrades_peek_pointer (const GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return value->data[0].v_pointer; -#line 823 "Upgrades.c" +#line 890 "Upgrades.c" } -static gchar* value_upgrades_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_upgrades_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (collect_values[0].v_pointer) { -#line 830 "Upgrades.c" +#line 902 "Upgrades.c" Upgrades * object; object = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (object->parent_instance.g_class == NULL) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 837 "Upgrades.c" +#line 909 "Upgrades.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.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 841 "Upgrades.c" +#line 913 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = upgrades_ref (object); -#line 845 "Upgrades.c" +#line 917 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 849 "Upgrades.c" +#line 921 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return NULL; -#line 853 "Upgrades.c" +#line 925 "Upgrades.c" } -static gchar* value_upgrades_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_upgrades_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ Upgrades ** object_p; object_p = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (!object_p) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 864 "Upgrades.c" +#line 941 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (!value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" *object_p = NULL; -#line 870 "Upgrades.c" +#line 947 "Upgrades.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" *object_p = value->data[0].v_pointer; -#line 874 "Upgrades.c" +#line 951 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" *object_p = upgrades_ref (value->data[0].v_pointer); -#line 878 "Upgrades.c" +#line 955 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return NULL; -#line 882 "Upgrades.c" +#line 959 "Upgrades.c" } -GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_upgrades (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecUpgrades* spec; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_UPGRADES), NULL); @@ -892,20 +975,25 @@ GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return G_PARAM_SPEC (spec); -#line 896 "Upgrades.c" +#line 979 "Upgrades.c" } -gpointer value_get_upgrades (const GValue* value) { +gpointer +value_get_upgrades (const GValue* value) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES), NULL); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return value->data[0].v_pointer; -#line 905 "Upgrades.c" +#line 990 "Upgrades.c" } -void value_set_upgrades (GValue* value, gpointer v_object) { +void +value_set_upgrades (GValue* value, + gpointer v_object) +{ Upgrades * old; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES)); @@ -921,22 +1009,25 @@ void value_set_upgrades (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_ref (value->data[0].v_pointer); -#line 925 "Upgrades.c" +#line 1013 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 929 "Upgrades.c" +#line 1017 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (old) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_unref (old); -#line 935 "Upgrades.c" +#line 1023 "Upgrades.c" } } -void value_take_upgrades (GValue* value, gpointer v_object) { +void +value_take_upgrades (GValue* value, + gpointer v_object) +{ Upgrades * old; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES)); @@ -950,33 +1041,37 @@ void value_take_upgrades (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = v_object; -#line 954 "Upgrades.c" +#line 1045 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 958 "Upgrades.c" +#line 1049 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" if (old) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_unref (old); -#line 964 "Upgrades.c" +#line 1055 "Upgrades.c" } } -static void upgrades_class_init (UpgradesClass * klass) { +static void +upgrades_class_init (UpgradesClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" ((UpgradesClass *) klass)->finalize = upgrades_finalize; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_type_class_add_private (klass, sizeof (UpgradesPrivate)); -#line 976 "Upgrades.c" +#line 1069 "Upgrades.c" } -static void upgrades_instance_init (Upgrades * self) { +static void +upgrades_instance_init (Upgrades * self) +{ GeeLinkedList* _tmp0_; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" self->priv = UPGRADES_GET_PRIVATE (self); @@ -988,11 +1083,13 @@ static void upgrades_instance_init (Upgrades * self) { self->priv->task_list = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" self->ref_count = 1; -#line 992 "Upgrades.c" +#line 1087 "Upgrades.c" } -static void upgrades_finalize (Upgrades * obj) { +static void +upgrades_finalize (Upgrades * obj) +{ Upgrades * self; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UPGRADES, Upgrades); @@ -1000,11 +1097,13 @@ static void upgrades_finalize (Upgrades * obj) { g_signal_handlers_destroy (self); #line 13 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (self->priv->task_list); -#line 1004 "Upgrades.c" +#line 1101 "Upgrades.c" } -GType upgrades_get_type (void) { +GType +upgrades_get_type (void) +{ static volatile gsize upgrades_type_id__volatile = 0; if (g_once_init_enter (&upgrades_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_upgrades_init, value_upgrades_free_value, value_upgrades_copy_value, value_upgrades_peek_pointer, "p", value_upgrades_collect_value, "p", value_upgrades_lcopy_value }; @@ -1018,18 +1117,22 @@ GType upgrades_get_type (void) { } -gpointer upgrades_ref (gpointer instance) { +gpointer +upgrades_ref (gpointer instance) +{ Upgrades * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_atomic_int_inc (&self->ref_count); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return instance; -#line 1029 "Upgrades.c" +#line 1130 "Upgrades.c" } -void upgrades_unref (gpointer instance) { +void +upgrades_unref (gpointer instance) +{ Upgrades * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1038,42 +1141,52 @@ void upgrades_unref (gpointer instance) { UPGRADES_GET_CLASS (self)->finalize (self); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1042 "Upgrades.c" +#line 1145 "Upgrades.c" } } -guint64 upgrade_task_get_step_count (UpgradeTask* self) { +guint64 +upgrade_task_get_step_count (UpgradeTask* self) +{ #line 55 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_val_if_fail (IS_UPGRADE_TASK (self), 0ULL); #line 55 "/home/jens/Source/shotwell/src/Upgrades.vala" return UPGRADE_TASK_GET_INTERFACE (self)->get_step_count (self); -#line 1052 "Upgrades.c" +#line 1157 "Upgrades.c" } -void upgrade_task_execute (UpgradeTask* self, ProgressMonitor monitor, void* monitor_target) { +void +upgrade_task_execute (UpgradeTask* self, + ProgressMonitor monitor, + void* monitor_target) +{ #line 60 "/home/jens/Source/shotwell/src/Upgrades.vala" g_return_if_fail (IS_UPGRADE_TASK (self)); #line 60 "/home/jens/Source/shotwell/src/Upgrades.vala" UPGRADE_TASK_GET_INTERFACE (self)->execute (self, monitor, monitor_target); -#line 1061 "Upgrades.c" +#line 1170 "Upgrades.c" } -static void upgrade_task_base_init (UpgradeTaskIface * iface) { +static void +upgrade_task_base_init (UpgradeTaskIface * iface) +{ #line 53 "/home/jens/Source/shotwell/src/Upgrades.vala" static gboolean initialized = FALSE; #line 53 "/home/jens/Source/shotwell/src/Upgrades.vala" if (!initialized) { #line 53 "/home/jens/Source/shotwell/src/Upgrades.vala" initialized = TRUE; -#line 1072 "Upgrades.c" +#line 1183 "Upgrades.c" } } -GType upgrade_task_get_type (void) { +GType +upgrade_task_get_type (void) +{ static volatile gsize upgrade_task_type_id__volatile = 0; if (g_once_init_enter (&upgrade_task_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (UpgradeTaskIface), (GBaseInitFunc) upgrade_task_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1086,110 +1199,107 @@ GType upgrade_task_get_type (void) { } -static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { +static guint64 +mimics_removal_task_real_get_step_count (UpgradeTask* base) +{ MimicsRemovalTask * self; guint64 result = 0ULL; - guint64 _tmp6_; + guint64 _tmp5_; GError * _inner_error_ = NULL; #line 71 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask); -#line 1097 "Upgrades.c" +#line 1212 "Upgrades.c" { guint64 _tmp0_ = 0ULL; GFile* _tmp1_; - guint64 _tmp2_; #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp1_ = self->priv->mimic_dir; #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp2_ = count_files_in_directory (_tmp1_, &_inner_error_); -#line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp0_ = _tmp2_; + _tmp0_ = count_files_in_directory (_tmp1_, &_inner_error_); #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1110 "Upgrades.c" +#line 1222 "Upgrades.c" goto __catch604_g_error; } #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" self->priv->num_mimics = _tmp0_; -#line 1115 "Upgrades.c" +#line 1227 "Upgrades.c" } goto __finally604; __catch604_g_error: { GError* e = NULL; - GError* _tmp3_; - const gchar* _tmp4_; + GError* _tmp2_; + const gchar* _tmp3_; #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" e = _inner_error_; #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" _inner_error_ = NULL; #line 75 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp3_ = e; + _tmp2_ = e; #line 75 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp4_ = _tmp3_->message; + _tmp3_ = _tmp2_->message; #line 75 "/home/jens/Source/shotwell/src/Upgrades.vala" - g_debug ("Upgrades.vala:75: Error on deleting mimics: %s", _tmp4_); + g_debug ("Upgrades.vala:75: Error on deleting mimics: %s", _tmp3_); #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_error_free0 (e); -#line 1135 "Upgrades.c" +#line 1247 "Upgrades.c" } __finally604: #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1140 "Upgrades.c" - guint64 _tmp5_ = 0ULL; +#line 1252 "Upgrades.c" + guint64 _tmp4_ = 0ULL; #line 72 "/home/jens/Source/shotwell/src/Upgrades.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 72 "/home/jens/Source/shotwell/src/Upgrades.vala" g_clear_error (&_inner_error_); #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" - return _tmp5_; -#line 1148 "Upgrades.c" + return _tmp4_; +#line 1260 "Upgrades.c" } #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp6_ = self->priv->num_mimics; + _tmp5_ = self->priv->num_mimics; #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala" - result = _tmp6_; + result = _tmp5_; #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 1156 "Upgrades.c" +#line 1268 "Upgrades.c" } -static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target) { +static void +mimics_removal_task_real_execute (UpgradeTask* base, + ProgressMonitor monitor, + void* monitor_target) +{ MimicsRemovalTask * self; GError * _inner_error_ = NULL; #line 80 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask); -#line 1165 "Upgrades.c" +#line 1281 "Upgrades.c" { GFile* _tmp0_; - ProgressMonitor _tmp1_; - void* _tmp1__target; - guint64 _tmp2_; - GFile* _tmp3_; + guint64 _tmp1_; + GFile* _tmp2_; #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp0_ = self->priv->mimic_dir; #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp1_ = monitor; + _tmp1_ = self->priv->num_mimics; #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp1__target = monitor_target; -#line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp2_ = self->priv->num_mimics; -#line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" - delete_all_files (_tmp0_, NULL, _tmp1_, _tmp1__target, _tmp2_, NULL, &_inner_error_); + delete_all_files (_tmp0_, NULL, monitor, monitor_target, _tmp1_, NULL, &_inner_error_); #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1184 "Upgrades.c" +#line 1294 "Upgrades.c" goto __catch605_g_error; } #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp3_ = self->priv->mimic_dir; + _tmp2_ = self->priv->mimic_dir; #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" - g_file_delete (_tmp3_, NULL, &_inner_error_); + g_file_delete (_tmp2_, NULL, &_inner_error_); #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1193 "Upgrades.c" +#line 1303 "Upgrades.c" goto __catch605_g_error; } } @@ -1197,21 +1307,21 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor __catch605_g_error: { GError* e = NULL; - GError* _tmp4_; - const gchar* _tmp5_; + GError* _tmp3_; + const gchar* _tmp4_; #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" e = _inner_error_; #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" _inner_error_ = NULL; #line 85 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp4_ = e; + _tmp3_ = e; #line 85 "/home/jens/Source/shotwell/src/Upgrades.vala" - _tmp5_ = _tmp4_->message; + _tmp4_ = _tmp3_->message; #line 85 "/home/jens/Source/shotwell/src/Upgrades.vala" - g_debug ("Upgrades.vala:85: Could not delete mimics: %s", _tmp5_); + g_debug ("Upgrades.vala:85: Could not delete mimics: %s", _tmp4_); #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_error_free0 (e); -#line 1215 "Upgrades.c" +#line 1325 "Upgrades.c" } __finally605: #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1222,51 +1332,61 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor g_clear_error (&_inner_error_); #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" return; -#line 1226 "Upgrades.c" +#line 1336 "Upgrades.c" } } -MimicsRemovalTask* mimics_removal_task_construct (GType object_type) { +MimicsRemovalTask* +mimics_removal_task_construct (GType object_type) +{ MimicsRemovalTask * self = NULL; #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" self = (MimicsRemovalTask*) g_object_new (object_type, NULL); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 1237 "Upgrades.c" +#line 1349 "Upgrades.c" } -MimicsRemovalTask* mimics_removal_task_new (void) { +MimicsRemovalTask* +mimics_removal_task_new (void) +{ #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" return mimics_removal_task_construct (TYPE_MIMICS_REMOVAL_TASK); -#line 1244 "Upgrades.c" +#line 1358 "Upgrades.c" } -static void mimics_removal_task_class_init (MimicsRemovalTaskClass * klass) { +static void +mimics_removal_task_class_init (MimicsRemovalTaskClass * klass) +{ #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" mimics_removal_task_parent_class = g_type_class_peek_parent (klass); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" g_type_class_add_private (klass, sizeof (MimicsRemovalTaskPrivate)); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" G_OBJECT_CLASS (klass)->finalize = mimics_removal_task_finalize; -#line 1255 "Upgrades.c" +#line 1371 "Upgrades.c" } -static void mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface * iface) { +static void +mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface * iface) +{ #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" mimics_removal_task_upgrade_task_parent_iface = g_type_interface_peek_parent (iface); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" iface->get_step_count = (guint64 (*) (UpgradeTask *)) mimics_removal_task_real_get_step_count; #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) mimics_removal_task_real_execute; -#line 1266 "Upgrades.c" +#line 1384 "Upgrades.c" } -static void mimics_removal_task_instance_init (MimicsRemovalTask * self) { +static void +mimics_removal_task_instance_init (MimicsRemovalTask * self) +{ GFile* _tmp0_; GFile* _tmp1_; GFile* _tmp2_; @@ -1284,11 +1404,13 @@ static void mimics_removal_task_instance_init (MimicsRemovalTask * self) { _g_object_unref0 (_tmp1_); #line 69 "/home/jens/Source/shotwell/src/Upgrades.vala" self->priv->num_mimics = (guint64) 0; -#line 1288 "Upgrades.c" +#line 1408 "Upgrades.c" } -static void mimics_removal_task_finalize (GObject * obj) { +static void +mimics_removal_task_finalize (GObject * obj) +{ MimicsRemovalTask * self; #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask); @@ -1296,11 +1418,13 @@ static void mimics_removal_task_finalize (GObject * obj) { _g_object_unref0 (self->priv->mimic_dir); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" G_OBJECT_CLASS (mimics_removal_task_parent_class)->finalize (obj); -#line 1300 "Upgrades.c" +#line 1422 "Upgrades.c" } -GType mimics_removal_task_get_type (void) { +GType +mimics_removal_task_get_type (void) +{ static volatile gsize mimics_removal_task_type_id__volatile = 0; if (g_once_init_enter (&mimics_removal_task_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MimicsRemovalTaskClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) mimics_removal_task_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MimicsRemovalTask), 0, (GInstanceInitFunc) mimics_removal_task_instance_init, NULL }; @@ -1314,7 +1438,9 @@ GType mimics_removal_task_get_type (void) { } -static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) { +static guint64 +fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) +{ FixupRawThumbnailsTask * self; guint64 result = 0ULL; gint num_raw_files = 0; @@ -1322,7 +1448,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask); #line 95 "/home/jens/Source/shotwell/src/Upgrades.vala" num_raw_files = 0; -#line 1326 "Upgrades.c" +#line 1452 "Upgrades.c" { GeeArrayList* _phr_list = NULL; PhotoTable* _tmp0_; @@ -1358,7 +1484,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) _phr_index = -1; #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" while (TRUE) { -#line 1362 "Upgrades.c" +#line 1488 "Upgrades.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -1381,7 +1507,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) if (!(_tmp8_ < _tmp9_)) { #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" break; -#line 1385 "Upgrades.c" +#line 1511 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp10_ = _phr_list; @@ -1399,37 +1525,41 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base) _tmp15_ = _tmp14_->file_format; #line 98 "/home/jens/Source/shotwell/src/Upgrades.vala" if (_tmp15_ == PHOTO_FILE_FORMAT_RAW) { -#line 1403 "Upgrades.c" +#line 1529 "Upgrades.c" gint _tmp16_; #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp16_ = num_raw_files; #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala" num_raw_files = _tmp16_ + 1; -#line 1409 "Upgrades.c" +#line 1535 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _photo_row_unref0 (phr); -#line 1413 "Upgrades.c" +#line 1539 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_phr_list); -#line 1417 "Upgrades.c" +#line 1543 "Upgrades.c" } #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala" result = (guint64) num_raw_files; #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 1423 "Upgrades.c" +#line 1549 "Upgrades.c" } -static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target) { +static void +fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, + ProgressMonitor monitor, + void* monitor_target) +{ FixupRawThumbnailsTask * self; #line 104 "/home/jens/Source/shotwell/src/Upgrades.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask); #line 105 "/home/jens/Source/shotwell/src/Upgrades.vala" g_debug ("Upgrades.vala:105: Executing thumbnail deletion and fixup"); -#line 1433 "Upgrades.c" +#line 1563 "Upgrades.c" { GeeArrayList* _phr_list = NULL; PhotoTable* _tmp0_; @@ -1465,7 +1595,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM _phr_index = -1; #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" while (TRUE) { -#line 1469 "Upgrades.c" +#line 1599 "Upgrades.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -1489,7 +1619,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM if (!(_tmp8_ < _tmp9_)) { #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" break; -#line 1493 "Upgrades.c" +#line 1623 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp10_ = _phr_list; @@ -1507,7 +1637,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM _tmp16_ = _tmp15_->file_format; #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala" if (_tmp16_ == PHOTO_FILE_FORMAT_RAW) { -#line 1511 "Upgrades.c" +#line 1641 "Upgrades.c" PhotoRow* _tmp17_; RawDeveloper _tmp18_; #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1516,15 +1646,15 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM _tmp18_ = _tmp17_->developer; #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp13_ = _tmp18_ == RAW_DEVELOPER_CAMERA; -#line 1520 "Upgrades.c" +#line 1650 "Upgrades.c" } else { #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp13_ = FALSE; -#line 1524 "Upgrades.c" +#line 1654 "Upgrades.c" } #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala" if (_tmp13_) { -#line 1528 "Upgrades.c" +#line 1658 "Upgrades.c" LibraryPhotoSourceCollection* _tmp19_; PhotoRow* _tmp20_; PhotoID _tmp21_; @@ -1544,59 +1674,71 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_tmp23_); -#line 1548 "Upgrades.c" +#line 1678 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _photo_row_unref0 (phr); -#line 1552 "Upgrades.c" +#line 1682 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_phr_list); -#line 1556 "Upgrades.c" +#line 1686 "Upgrades.c" } } -FixupRawThumbnailsTask* fixup_raw_thumbnails_task_construct (GType object_type) { +FixupRawThumbnailsTask* +fixup_raw_thumbnails_task_construct (GType object_type) +{ FixupRawThumbnailsTask * self = NULL; #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" self = (FixupRawThumbnailsTask*) g_object_new (object_type, NULL); #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 1567 "Upgrades.c" +#line 1699 "Upgrades.c" } -FixupRawThumbnailsTask* fixup_raw_thumbnails_task_new (void) { +FixupRawThumbnailsTask* +fixup_raw_thumbnails_task_new (void) +{ #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" return fixup_raw_thumbnails_task_construct (TYPE_FIXUP_RAW_THUMBNAILS_TASK); -#line 1574 "Upgrades.c" +#line 1708 "Upgrades.c" } -static void fixup_raw_thumbnails_task_class_init (FixupRawThumbnailsTaskClass * klass) { +static void +fixup_raw_thumbnails_task_class_init (FixupRawThumbnailsTaskClass * klass) +{ #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" fixup_raw_thumbnails_task_parent_class = g_type_class_peek_parent (klass); -#line 1581 "Upgrades.c" +#line 1717 "Upgrades.c" } -static void fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIface * iface) { +static void +fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIface * iface) +{ #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" fixup_raw_thumbnails_task_upgrade_task_parent_iface = g_type_interface_peek_parent (iface); #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" iface->get_step_count = (guint64 (*) (UpgradeTask *)) fixup_raw_thumbnails_task_real_get_step_count; #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) fixup_raw_thumbnails_task_real_execute; -#line 1592 "Upgrades.c" +#line 1730 "Upgrades.c" } -static void fixup_raw_thumbnails_task_instance_init (FixupRawThumbnailsTask * self) { +static void +fixup_raw_thumbnails_task_instance_init (FixupRawThumbnailsTask * self) +{ } -GType fixup_raw_thumbnails_task_get_type (void) { +GType +fixup_raw_thumbnails_task_get_type (void) +{ static volatile gsize fixup_raw_thumbnails_task_type_id__volatile = 0; if (g_once_init_enter (&fixup_raw_thumbnails_task_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (FixupRawThumbnailsTaskClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fixup_raw_thumbnails_task_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FixupRawThumbnailsTask), 0, (GInstanceInitFunc) fixup_raw_thumbnails_task_instance_init, NULL }; -- cgit v1.2.3