From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/Upgrades.c | 210 ++++++++++++++++++++++++++------------------------------- 1 file changed, 97 insertions(+), 113 deletions(-) (limited to 'src/Upgrades.c') diff --git a/src/Upgrades.c b/src/Upgrades.c index 80ae01f..0c4acc4 100644 --- a/src/Upgrades.c +++ b/src/Upgrades.c @@ -17,6 +17,7 @@ #include #include #include +#include "shotwell-graphics-processor.h" #include @@ -129,16 +130,6 @@ typedef struct _EventID EventID; #define TYPE_ORIENTATION (orientation_get_type ()) -#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ()) -#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap)) -#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass)) -#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP)) -#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP)) -#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass)) - -typedef struct _KeyValueMap KeyValueMap; -typedef struct _KeyValueMapClass KeyValueMapClass; - #define TYPE_RATING (rating_get_type ()) #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ()) @@ -533,13 +524,6 @@ GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); GType orientation_get_type (void) G_GNUC_CONST; -gpointer key_value_map_ref (gpointer instance); -void key_value_map_unref (gpointer instance); -GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_key_value_map (GValue* value, gpointer v_object); -void value_take_key_value_map (GValue* value, gpointer v_object); -gpointer value_get_key_value_map (const GValue* value); -GType key_value_map_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); @@ -602,7 +586,7 @@ static Upgrades* upgrades_construct (GType object_type) { _application_unref0 (_tmp3_); #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala" if (_tmp5_) { -#line 606 "Upgrades.c" +#line 590 "Upgrades.c" FixupRawThumbnailsTask* _tmp6_; FixupRawThumbnailsTask* _tmp7_; #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -613,18 +597,18 @@ static Upgrades* upgrades_construct (GType object_type) { upgrades_add (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_UPGRADE_TASK, UpgradeTask)); #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_tmp7_); -#line 617 "Upgrades.c" +#line 601 "Upgrades.c" } #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 621 "Upgrades.c" +#line 605 "Upgrades.c" } static Upgrades* upgrades_new (void) { #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala" return upgrades_construct (TYPE_UPGRADES); -#line 628 "Upgrades.c" +#line 612 "Upgrades.c" } @@ -641,14 +625,14 @@ void upgrades_init (void) { _upgrades_unref0 (upgrades_instance); #line 26 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_instance = _tmp1_; -#line 645 "Upgrades.c" +#line 629 "Upgrades.c" } static gpointer _upgrades_ref0 (gpointer self) { #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala" return self ? upgrades_ref (self) : NULL; -#line 652 "Upgrades.c" +#line 636 "Upgrades.c" } @@ -664,7 +648,7 @@ Upgrades* upgrades_get_instance (void) { result = _tmp1_; #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 668 "Upgrades.c" +#line 652 "Upgrades.c" } @@ -679,21 +663,21 @@ guint64 upgrades_get_step_count (Upgrades* self) { result = _tmp0_; #line 35 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 683 "Upgrades.c" +#line 667 "Upgrades.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" return self ? g_object_ref (self) : NULL; -#line 690 "Upgrades.c" +#line 674 "Upgrades.c" } 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 697 "Upgrades.c" +#line 681 "Upgrades.c" { GeeLinkedList* _task_list = NULL; GeeLinkedList* _tmp0_; @@ -721,7 +705,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 725 "Upgrades.c" +#line 709 "Upgrades.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -744,7 +728,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 748 "Upgrades.c" +#line 732 "Upgrades.c" } #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp8_ = _task_list; @@ -764,11 +748,11 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta upgrade_task_execute (_tmp11_, _tmp12_, _tmp12__target); #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (task); -#line 768 "Upgrades.c" +#line 752 "Upgrades.c" } #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_task_list); -#line 772 "Upgrades.c" +#line 756 "Upgrades.c" } } @@ -797,14 +781,14 @@ static void upgrades_add (Upgrades* self, UpgradeTask* task) { _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 801 "Upgrades.c" +#line 785 "Upgrades.c" } static void value_upgrades_init (GValue* value) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 808 "Upgrades.c" +#line 792 "Upgrades.c" } @@ -813,7 +797,7 @@ static void value_upgrades_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" upgrades_unref (value->data[0].v_pointer); -#line 817 "Upgrades.c" +#line 801 "Upgrades.c" } } @@ -823,11 +807,11 @@ static void value_upgrades_copy_value (const GValue* src_value, GValue* dest_val 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 827 "Upgrades.c" +#line 811 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" dest_value->data[0].v_pointer = NULL; -#line 831 "Upgrades.c" +#line 815 "Upgrades.c" } } @@ -835,37 +819,37 @@ static void value_upgrades_copy_value (const GValue* src_value, GValue* dest_val 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 839 "Upgrades.c" +#line 823 "Upgrades.c" } 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 846 "Upgrades.c" +#line 830 "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 853 "Upgrades.c" +#line 837 "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 857 "Upgrades.c" +#line 841 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = upgrades_ref (object); -#line 861 "Upgrades.c" +#line 845 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 865 "Upgrades.c" +#line 849 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return NULL; -#line 869 "Upgrades.c" +#line 853 "Upgrades.c" } @@ -876,25 +860,25 @@ static gchar* value_upgrades_lcopy_value (const GValue* value, guint n_collect_v 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 880 "Upgrades.c" +#line 864 "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 886 "Upgrades.c" +#line 870 "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 890 "Upgrades.c" +#line 874 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" *object_p = upgrades_ref (value->data[0].v_pointer); -#line 894 "Upgrades.c" +#line 878 "Upgrades.c" } #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return NULL; -#line 898 "Upgrades.c" +#line 882 "Upgrades.c" } @@ -908,7 +892,7 @@ 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 912 "Upgrades.c" +#line 896 "Upgrades.c" } @@ -917,7 +901,7 @@ gpointer value_get_upgrades (const GValue* value) { 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 921 "Upgrades.c" +#line 905 "Upgrades.c" } @@ -937,17 +921,17 @@ 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 941 "Upgrades.c" +#line 925 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 945 "Upgrades.c" +#line 929 "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 951 "Upgrades.c" +#line 935 "Upgrades.c" } } @@ -966,17 +950,17 @@ 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 970 "Upgrades.c" +#line 954 "Upgrades.c" } else { #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" value->data[0].v_pointer = NULL; -#line 974 "Upgrades.c" +#line 958 "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 980 "Upgrades.c" +#line 964 "Upgrades.c" } } @@ -988,7 +972,7 @@ static void upgrades_class_init (UpgradesClass * klass) { ((UpgradesClass *) klass)->finalize = upgrades_finalize; #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" g_type_class_add_private (klass, sizeof (UpgradesPrivate)); -#line 992 "Upgrades.c" +#line 976 "Upgrades.c" } @@ -1004,7 +988,7 @@ 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 1008 "Upgrades.c" +#line 992 "Upgrades.c" } @@ -1016,7 +1000,7 @@ 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 1020 "Upgrades.c" +#line 1004 "Upgrades.c" } @@ -1041,7 +1025,7 @@ gpointer upgrades_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala" return instance; -#line 1045 "Upgrades.c" +#line 1029 "Upgrades.c" } @@ -1054,7 +1038,7 @@ 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 1058 "Upgrades.c" +#line 1042 "Upgrades.c" } } @@ -1064,7 +1048,7 @@ guint64 upgrade_task_get_step_count (UpgradeTask* self) { 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 1068 "Upgrades.c" +#line 1052 "Upgrades.c" } @@ -1073,7 +1057,7 @@ void upgrade_task_execute (UpgradeTask* self, ProgressMonitor monitor, void* mon 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 1077 "Upgrades.c" +#line 1061 "Upgrades.c" } @@ -1084,7 +1068,7 @@ static void upgrade_task_base_init (UpgradeTaskIface * iface) { if (!initialized) { #line 53 "/home/jens/Source/shotwell/src/Upgrades.vala" initialized = TRUE; -#line 1088 "Upgrades.c" +#line 1072 "Upgrades.c" } } @@ -1109,7 +1093,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { 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 1113 "Upgrades.c" +#line 1097 "Upgrades.c" { guint64 _tmp0_ = 0ULL; GFile* _tmp1_; @@ -1122,15 +1106,15 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { _tmp0_ = _tmp2_; #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1126 "Upgrades.c" - goto __catch595_g_error; +#line 1110 "Upgrades.c" + goto __catch604_g_error; } #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" self->priv->num_mimics = _tmp0_; -#line 1131 "Upgrades.c" +#line 1115 "Upgrades.c" } - goto __finally595; - __catch595_g_error: + goto __finally604; + __catch604_g_error: { GError* e = NULL; GError* _tmp3_; @@ -1147,12 +1131,12 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { g_debug ("Upgrades.vala:75: Error on deleting mimics: %s", _tmp4_); #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_error_free0 (e); -#line 1151 "Upgrades.c" +#line 1135 "Upgrades.c" } - __finally595: + __finally604: #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1156 "Upgrades.c" +#line 1140 "Upgrades.c" guint64 _tmp5_ = 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); @@ -1160,7 +1144,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { g_clear_error (&_inner_error_); #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" return _tmp5_; -#line 1164 "Upgrades.c" +#line 1148 "Upgrades.c" } #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp6_ = self->priv->num_mimics; @@ -1168,7 +1152,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { result = _tmp6_; #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala" return result; -#line 1172 "Upgrades.c" +#line 1156 "Upgrades.c" } @@ -1177,7 +1161,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor 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 1181 "Upgrades.c" +#line 1165 "Upgrades.c" { GFile* _tmp0_; ProgressMonitor _tmp1_; @@ -1196,8 +1180,8 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor delete_all_files (_tmp0_, NULL, _tmp1_, _tmp1__target, _tmp2_, NULL, &_inner_error_); #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1200 "Upgrades.c" - goto __catch596_g_error; +#line 1184 "Upgrades.c" + goto __catch605_g_error; } #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp3_ = self->priv->mimic_dir; @@ -1205,12 +1189,12 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor g_file_delete (_tmp3_, NULL, &_inner_error_); #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1209 "Upgrades.c" - goto __catch596_g_error; +#line 1193 "Upgrades.c" + goto __catch605_g_error; } } - goto __finally596; - __catch596_g_error: + goto __finally605; + __catch605_g_error: { GError* e = NULL; GError* _tmp4_; @@ -1227,9 +1211,9 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor g_debug ("Upgrades.vala:85: Could not delete mimics: %s", _tmp5_); #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_error_free0 (e); -#line 1231 "Upgrades.c" +#line 1215 "Upgrades.c" } - __finally596: + __finally605: #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1238,7 +1222,7 @@ 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 1242 "Upgrades.c" +#line 1226 "Upgrades.c" } } @@ -1249,14 +1233,14 @@ MimicsRemovalTask* mimics_removal_task_construct (GType object_type) { self = (MimicsRemovalTask*) g_object_new (object_type, NULL); #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 1253 "Upgrades.c" +#line 1237 "Upgrades.c" } 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 1260 "Upgrades.c" +#line 1244 "Upgrades.c" } @@ -1267,7 +1251,7 @@ static void mimics_removal_task_class_init (MimicsRemovalTaskClass * klass) { 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 1271 "Upgrades.c" +#line 1255 "Upgrades.c" } @@ -1278,7 +1262,7 @@ static void mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface * 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 1282 "Upgrades.c" +#line 1266 "Upgrades.c" } @@ -1300,7 +1284,7 @@ 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 1304 "Upgrades.c" +#line 1288 "Upgrades.c" } @@ -1312,7 +1296,7 @@ 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 1316 "Upgrades.c" +#line 1300 "Upgrades.c" } @@ -1338,7 +1322,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 1342 "Upgrades.c" +#line 1326 "Upgrades.c" { GeeArrayList* _phr_list = NULL; PhotoTable* _tmp0_; @@ -1374,7 +1358,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 1378 "Upgrades.c" +#line 1362 "Upgrades.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -1397,7 +1381,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 1401 "Upgrades.c" +#line 1385 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp10_ = _phr_list; @@ -1415,27 +1399,27 @@ 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 1419 "Upgrades.c" +#line 1403 "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 1425 "Upgrades.c" +#line 1409 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _photo_row_unref0 (phr); -#line 1429 "Upgrades.c" +#line 1413 "Upgrades.c" } #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_phr_list); -#line 1433 "Upgrades.c" +#line 1417 "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 1439 "Upgrades.c" +#line 1423 "Upgrades.c" } @@ -1445,7 +1429,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM 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 1449 "Upgrades.c" +#line 1433 "Upgrades.c" { GeeArrayList* _phr_list = NULL; PhotoTable* _tmp0_; @@ -1481,7 +1465,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 1485 "Upgrades.c" +#line 1469 "Upgrades.c" gint _tmp7_; gint _tmp8_; gint _tmp9_; @@ -1505,7 +1489,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 1509 "Upgrades.c" +#line 1493 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp10_ = _phr_list; @@ -1523,7 +1507,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 1527 "Upgrades.c" +#line 1511 "Upgrades.c" PhotoRow* _tmp17_; RawDeveloper _tmp18_; #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1532,15 +1516,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 1536 "Upgrades.c" +#line 1520 "Upgrades.c" } else { #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp13_ = FALSE; -#line 1540 "Upgrades.c" +#line 1524 "Upgrades.c" } #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala" if (_tmp13_) { -#line 1544 "Upgrades.c" +#line 1528 "Upgrades.c" LibraryPhotoSourceCollection* _tmp19_; PhotoRow* _tmp20_; PhotoID _tmp21_; @@ -1560,15 +1544,15 @@ 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 1564 "Upgrades.c" +#line 1548 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _photo_row_unref0 (phr); -#line 1568 "Upgrades.c" +#line 1552 "Upgrades.c" } #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala" _g_object_unref0 (_phr_list); -#line 1572 "Upgrades.c" +#line 1556 "Upgrades.c" } } @@ -1579,21 +1563,21 @@ FixupRawThumbnailsTask* fixup_raw_thumbnails_task_construct (GType object_type) self = (FixupRawThumbnailsTask*) g_object_new (object_type, NULL); #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala" return self; -#line 1583 "Upgrades.c" +#line 1567 "Upgrades.c" } 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 1590 "Upgrades.c" +#line 1574 "Upgrades.c" } 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 1597 "Upgrades.c" +#line 1581 "Upgrades.c" } @@ -1604,7 +1588,7 @@ static void fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIf 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 1608 "Upgrades.c" +#line 1592 "Upgrades.c" } -- cgit v1.2.3