summaryrefslogtreecommitdiff
path: root/src/Tombstone.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:55:20 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:55:20 +0100
commitf6140ff1c9ec493d947da5b346508846e7a1a06f (patch)
treec01b9164ee4b0d46b6670ccee45f6181c6237d7f /src/Tombstone.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parent2492891f112caac6076ce49721d9d5d78a152c3a (diff)
Update upstream source from tag 'upstream/0.26.4'
Update to upstream version '0.26.4' with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4
Diffstat (limited to 'src/Tombstone.c')
-rw-r--r--src/Tombstone.c1147
1 files changed, 556 insertions, 591 deletions
diff --git a/src/Tombstone.c b/src/Tombstone.c
index d660e10..7c57055 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1,4 +1,4 @@
-/* Tombstone.c generated by valac 0.34.7, the Vala compiler
+/* Tombstone.c generated by valac 0.36.6, the Vala compiler
* generated from Tombstone.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -367,7 +367,9 @@ struct _TombstoneSourceCollectionAsyncScanData {
int _state_;
GObject* _source_object_;
GAsyncResult* _res_;
- GSimpleAsyncResult* _async_result;
+ GTask* _async_result;
+ GAsyncReadyCallback _callback_;
+ gboolean _task_complete_;
TombstoneSourceCollection* self;
DirectoryMonitor* monitor;
GCancellable* cancellable;
@@ -609,6 +611,7 @@ void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, D
static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_);
static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, GAsyncResult* _res_);
static void tombstone_source_collection_async_scan_data_free (gpointer _data);
+static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollectionAsyncScanData* _data_);
Marker* data_collection_start_marking (DataCollection* self);
GeeCollection* data_collection_get_all (DataCollection* self);
@@ -617,7 +620,7 @@ static void tombstone_source_collection_async_scan_ready (GObject* source_object
void marker_mark (Marker* self, DataObject* object);
static gboolean _tombstone_source_collection_async_scan_co_gsource_func (gpointer self);
gint marker_get_count (Marker* self);
-static void tombstone_source_collection_finalize (DataCollection* obj);
+static void tombstone_source_collection_finalize (DataCollection * obj);
gpointer tombstoned_file_ref (gpointer instance);
void tombstoned_file_unref (gpointer instance);
GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -630,7 +633,7 @@ enum {
};
TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5);
TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5);
-static void tombstoned_file_finalize (TombstonedFile* obj);
+static void tombstoned_file_finalize (TombstonedFile * obj);
gpointer source_holding_tank_ref (gpointer instance);
void source_holding_tank_unref (gpointer instance);
GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -705,7 +708,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
static void tombstone_real_destroy (DataSource* base);
void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error);
void data_source_destroy (DataSource* self);
-static void tombstone_finalize (GObject* obj);
+static void tombstone_finalize (GObject * obj);
static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -715,7 +718,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
result = file_hash ((GFile*) v);
#line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 719 "Tombstone.c"
+#line 722 "Tombstone.c"
}
@@ -724,7 +727,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
result = file_equal ((GFile*) a, (GFile*) b);
#line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 728 "Tombstone.c"
+#line 731 "Tombstone.c"
}
@@ -733,7 +736,7 @@ static gint64 _tombstone_source_collection_get_tombstone_id_get_source_database_
result = tombstone_source_collection_get_tombstone_id (source);
#line 12 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 737 "Tombstone.c"
+#line 740 "Tombstone.c"
}
@@ -743,21 +746,21 @@ TombstoneSourceCollection* tombstone_source_collection_construct (GType object_t
self = (TombstoneSourceCollection*) database_source_collection_construct (object_type, "Tombstones", _tombstone_source_collection_get_tombstone_id_get_source_database_key, NULL);
#line 11 "/home/jens/Source/shotwell/src/Tombstone.vala"
return self;
-#line 747 "Tombstone.c"
+#line 750 "Tombstone.c"
}
TombstoneSourceCollection* tombstone_source_collection_new (void) {
#line 11 "/home/jens/Source/shotwell/src/Tombstone.vala"
return tombstone_source_collection_construct (TYPE_TOMBSTONE_SOURCE_COLLECTION);
-#line 754 "Tombstone.c"
+#line 757 "Tombstone.c"
}
static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
TombstoneSourceCollection * self;
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
#line 15 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection);
#line 15 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -768,15 +771,15 @@ static gboolean tombstone_source_collection_real_holds_type_of_source (SourceCol
result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_TOMBSTONE);
#line 16 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 772 "Tombstone.c"
+#line 775 "Tombstone.c"
}
static gint64 tombstone_source_collection_get_tombstone_id (DataSource* source) {
gint64 result = 0LL;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
TombstoneID _tmp1_ = {0};
- gint64 _tmp2_ = 0LL;
+ gint64 _tmp2_;
#line 19 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
#line 20 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -789,23 +792,23 @@ static gint64 tombstone_source_collection_get_tombstone_id (DataSource* source)
result = _tmp2_;
#line 20 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 793 "Tombstone.c"
+#line 796 "Tombstone.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 27 "/home/jens/Source/shotwell/src/Tombstone.vala"
return self ? g_object_ref (self) : NULL;
-#line 800 "Tombstone.c"
+#line 803 "Tombstone.c"
}
static void tombstone_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) {
TombstoneSourceCollection * self;
- GeeIterable* _tmp0_ = NULL;
- GeeIterable* _tmp14_ = NULL;
- GeeIterable* _tmp36_ = NULL;
- GeeIterable* _tmp37_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterable* _tmp14_;
+ GeeIterable* _tmp36_;
+ GeeIterable* _tmp37_;
#line 23 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection);
#line 23 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -816,11 +819,11 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
_tmp0_ = added;
#line 25 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_tmp0_ != NULL) {
-#line 820 "Tombstone.c"
+#line 823 "Tombstone.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeIterable* _tmp1_;
+ GeeIterator* _tmp2_;
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp1_ = added;
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -829,20 +832,20 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
_object_it = _tmp2_;
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
while (TRUE) {
-#line 833 "Tombstone.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 836 "Tombstone.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataObject* object = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
Tombstone* tombstone = NULL;
- DataObject* _tmp7_ = NULL;
- Tombstone* _tmp8_ = NULL;
- GeeHashMap* _tmp9_ = NULL;
- Tombstone* _tmp10_ = NULL;
- GFile* _tmp11_ = NULL;
- GFile* _tmp12_ = NULL;
- Tombstone* _tmp13_ = NULL;
+ DataObject* _tmp7_;
+ Tombstone* _tmp8_;
+ GeeHashMap* _tmp9_;
+ Tombstone* _tmp10_;
+ GFile* _tmp11_;
+ GFile* _tmp12_;
+ Tombstone* _tmp13_;
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp3_ = _object_it;
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -851,7 +854,7 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
if (!_tmp4_) {
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 855 "Tombstone.c"
+#line 858 "Tombstone.c"
}
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp5_ = _object_it;
@@ -883,22 +886,22 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
_g_object_unref0 (tombstone);
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (object);
-#line 887 "Tombstone.c"
+#line 890 "Tombstone.c"
}
#line 26 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_object_it);
-#line 891 "Tombstone.c"
+#line 894 "Tombstone.c"
}
}
#line 33 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp14_ = removed;
#line 33 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_tmp14_ != NULL) {
-#line 898 "Tombstone.c"
+#line 901 "Tombstone.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp15_ = NULL;
- GeeIterator* _tmp16_ = NULL;
+ GeeIterable* _tmp15_;
+ GeeIterator* _tmp16_;
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp15_ = removed;
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -907,21 +910,21 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
_object_it = _tmp16_;
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
while (TRUE) {
-#line 911 "Tombstone.c"
- GeeIterator* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 914 "Tombstone.c"
+ GeeIterator* _tmp17_;
+ gboolean _tmp18_;
DataObject* object = NULL;
- GeeIterator* _tmp19_ = NULL;
- gpointer _tmp20_ = NULL;
+ GeeIterator* _tmp19_;
+ gpointer _tmp20_;
Tombstone* tombstone = NULL;
- DataObject* _tmp21_ = NULL;
- Tombstone* _tmp22_ = NULL;
- GeeHashMap* _tmp23_ = NULL;
- Tombstone* _tmp24_ = NULL;
- GFile* _tmp25_ = NULL;
- GFile* _tmp26_ = NULL;
- gboolean _tmp27_ = FALSE;
- gboolean _tmp28_ = FALSE;
+ DataObject* _tmp21_;
+ Tombstone* _tmp22_;
+ GeeHashMap* _tmp23_;
+ Tombstone* _tmp24_;
+ GFile* _tmp25_;
+ GFile* _tmp26_;
+ gboolean _tmp27_;
+ gboolean _tmp28_;
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp17_ = _object_it;
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -930,7 +933,7 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
if (!_tmp18_) {
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 934 "Tombstone.c"
+#line 937 "Tombstone.c"
}
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp19_ = _object_it;
@@ -960,15 +963,15 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
_g_object_unref0 (_tmp26_);
#line 38 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_tmp28_) {
-#line 964 "Tombstone.c"
+#line 967 "Tombstone.c"
gboolean is_removed = FALSE;
- GeeHashMap* _tmp29_ = NULL;
- Tombstone* _tmp30_ = NULL;
- GFile* _tmp31_ = NULL;
- GFile* _tmp32_ = NULL;
- gboolean _tmp33_ = FALSE;
- gboolean _tmp34_ = FALSE;
- gboolean _tmp35_ = FALSE;
+ GeeHashMap* _tmp29_;
+ Tombstone* _tmp30_;
+ GFile* _tmp31_;
+ GFile* _tmp32_;
+ gboolean _tmp33_;
+ gboolean _tmp34_;
+ gboolean _tmp35_;
#line 40 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp29_ = self->priv->file_map;
#line 40 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -989,17 +992,17 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
_tmp35_ = is_removed;
#line 41 "/home/jens/Source/shotwell/src/Tombstone.vala"
_vala_assert (_tmp35_, "is_removed");
-#line 993 "Tombstone.c"
+#line 996 "Tombstone.c"
}
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (tombstone);
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (object);
-#line 999 "Tombstone.c"
+#line 1002 "Tombstone.c"
}
#line 34 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_object_it);
-#line 1003 "Tombstone.c"
+#line 1006 "Tombstone.c"
}
}
#line 49 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1008,7 +1011,7 @@ static void tombstone_source_collection_real_notify_contents_altered (DataCollec
_tmp37_ = removed;
#line 49 "/home/jens/Source/shotwell/src/Tombstone.vala"
DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp36_, _tmp37_);
-#line 1012 "Tombstone.c"
+#line 1015 "Tombstone.c"
}
@@ -1018,15 +1021,15 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection);
#line 52 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (GEE_IS_MAP (items));
-#line 1022 "Tombstone.c"
+#line 1025 "Tombstone.c"
{
GeeIterator* _object_it = NULL;
- GeeMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = items;
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1045,21 +1048,21 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
_object_it = _tmp5_;
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
while (TRUE) {
-#line 1049 "Tombstone.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 1052 "Tombstone.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
DataObject* object = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
Alteration* alteration = NULL;
- GeeMap* _tmp10_ = NULL;
- DataObject* _tmp11_ = NULL;
- gpointer _tmp12_ = NULL;
- Alteration* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+ GeeMap* _tmp10_;
+ DataObject* _tmp11_;
+ gpointer _tmp12_;
+ Alteration* _tmp13_;
+ gboolean _tmp14_;
Tombstone* tombstone = NULL;
- DataObject* _tmp15_ = NULL;
- Tombstone* _tmp16_ = NULL;
+ DataObject* _tmp15_;
+ Tombstone* _tmp16_;
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp6_ = _object_it;
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1068,7 +1071,7 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
if (!_tmp7_) {
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 1072 "Tombstone.c"
+#line 1075 "Tombstone.c"
}
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp8_ = _object_it;
@@ -1096,7 +1099,7 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
_g_object_unref0 (object);
#line 56 "/home/jens/Source/shotwell/src/Tombstone.vala"
continue;
-#line 1100 "Tombstone.c"
+#line 1103 "Tombstone.c"
}
#line 58 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp15_ = object;
@@ -1104,14 +1107,14 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_TOMBSTONE, Tombstone));
#line 58 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstone = _tmp16_;
-#line 1108 "Tombstone.c"
+#line 1111 "Tombstone.c"
{
GeeIterator* _detail_it = NULL;
- Alteration* _tmp17_ = NULL;
- GeeCollection* _tmp18_ = NULL;
- GeeCollection* _tmp19_ = NULL;
- GeeIterator* _tmp20_ = NULL;
- GeeIterator* _tmp21_ = NULL;
+ Alteration* _tmp17_;
+ GeeCollection* _tmp18_;
+ GeeCollection* _tmp19_;
+ GeeIterator* _tmp20_;
+ GeeIterator* _tmp21_;
#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp17_ = alteration;
#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1128,25 +1131,25 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
_detail_it = _tmp21_;
#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
while (TRUE) {
-#line 1132 "Tombstone.c"
- GeeIterator* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
+#line 1135 "Tombstone.c"
+ GeeIterator* _tmp22_;
+ gboolean _tmp23_;
gchar* detail = NULL;
- GeeIterator* _tmp24_ = NULL;
- gpointer _tmp25_ = NULL;
+ GeeIterator* _tmp24_;
+ gpointer _tmp25_;
GFile* old_file = NULL;
- const gchar* _tmp26_ = NULL;
- GFile* _tmp27_ = NULL;
+ const gchar* _tmp26_;
+ GFile* _tmp27_;
gboolean removed = FALSE;
- GeeHashMap* _tmp28_ = NULL;
- GFile* _tmp29_ = NULL;
- gboolean _tmp30_ = FALSE;
- gboolean _tmp31_ = FALSE;
- GeeHashMap* _tmp32_ = NULL;
- Tombstone* _tmp33_ = NULL;
- GFile* _tmp34_ = NULL;
- GFile* _tmp35_ = NULL;
- Tombstone* _tmp36_ = NULL;
+ GeeHashMap* _tmp28_;
+ GFile* _tmp29_;
+ gboolean _tmp30_;
+ gboolean _tmp31_;
+ GeeHashMap* _tmp32_;
+ Tombstone* _tmp33_;
+ GFile* _tmp34_;
+ GFile* _tmp35_;
+ Tombstone* _tmp36_;
#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp22_ = _detail_it;
#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1155,7 +1158,7 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
if (!_tmp23_) {
#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 1159 "Tombstone.c"
+#line 1162 "Tombstone.c"
}
#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp24_ = _detail_it;
@@ -1201,11 +1204,11 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
_g_free0 (detail);
#line 68 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 1205 "Tombstone.c"
+#line 1208 "Tombstone.c"
}
#line 60 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_detail_it);
-#line 1209 "Tombstone.c"
+#line 1212 "Tombstone.c"
}
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (tombstone);
@@ -1213,20 +1216,20 @@ static void tombstone_source_collection_real_notify_items_altered (DataCollectio
_alteration_unref0 (alteration);
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (object);
-#line 1217 "Tombstone.c"
+#line 1220 "Tombstone.c"
}
#line 53 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_object_it);
-#line 1221 "Tombstone.c"
+#line 1224 "Tombstone.c"
}
}
Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file) {
Tombstone* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ GFile* _tmp1_;
+ gpointer _tmp2_;
#line 73 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self), NULL);
#line 73 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1241,15 +1244,15 @@ Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self,
result = (Tombstone*) _tmp2_;
#line 74 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 1245 "Tombstone.c"
+#line 1248 "Tombstone.c"
}
gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file) {
gboolean result = FALSE;
- GeeHashMap* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GeeHashMap* _tmp0_;
+ GFile* _tmp1_;
+ gboolean _tmp2_;
#line 77 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self), FALSE);
#line 77 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1264,14 +1267,14 @@ gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, G
result = _tmp2_;
#line 78 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 1268 "Tombstone.c"
+#line 1271 "Tombstone.c"
}
void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone) {
- Tombstone* _tmp0_ = NULL;
- Marker* _tmp1_ = NULL;
- Marker* _tmp2_ = NULL;
+ Tombstone* _tmp0_;
+ Marker* _tmp1_;
+ Marker* _tmp2_;
#line 81 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self));
#line 81 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1286,14 +1289,14 @@ void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tom
source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp2_, FALSE, NULL, NULL, NULL);
#line 82 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_tmp2_);
-#line 1290 "Tombstone.c"
+#line 1293 "Tombstone.c"
}
void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self, GeeCollection* tombstones) {
Marker* marker = NULL;
- GeeCollection* _tmp0_ = NULL;
- Marker* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ Marker* _tmp1_;
GError * _inner_error_ = NULL;
#line 85 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self));
@@ -1311,7 +1314,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
database_table_begin_transaction ();
#line 91 "/home/jens/Source/shotwell/src/Tombstone.vala"
source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), marker, FALSE, NULL, NULL, NULL);
-#line 1315 "Tombstone.c"
+#line 1318 "Tombstone.c"
{
#line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
database_table_commit_transaction (&_inner_error_);
@@ -1319,8 +1322,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1323 "Tombstone.c"
- goto __catch547_database_error;
+#line 1326 "Tombstone.c"
+ goto __catch548_database_error;
}
#line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (marker);
@@ -1330,14 +1333,14 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
g_clear_error (&_inner_error_);
#line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 1334 "Tombstone.c"
+#line 1337 "Tombstone.c"
}
}
- goto __finally547;
- __catch547_database_error:
+ goto __finally548;
+ __catch548_database_error:
{
GError* err = NULL;
- GError* _tmp2_ = NULL;
+ GError* _tmp2_;
#line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
err = _inner_error_;
#line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1348,9 +1351,9 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
app_window_database_error (_tmp2_);
#line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_error_free0 (err);
-#line 1352 "Tombstone.c"
+#line 1355 "Tombstone.c"
}
- __finally547:
+ __finally548:
#line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1361,19 +1364,19 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
g_clear_error (&_inner_error_);
#line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 1365 "Tombstone.c"
+#line 1368 "Tombstone.c"
}
#line 99 "/home/jens/Source/shotwell/src/Tombstone.vala"
data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 85 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (marker);
-#line 1371 "Tombstone.c"
+#line 1374 "Tombstone.c"
}
void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable) {
- DirectoryMonitor* _tmp0_ = NULL;
- GCancellable* _tmp1_ = NULL;
+ DirectoryMonitor* _tmp0_;
+ GCancellable* _tmp1_;
#line 108 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (IS_TOMBSTONE_SOURCE_COLLECTION (self));
#line 108 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1386,7 +1389,7 @@ void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, D
_tmp1_ = cancellable;
#line 109 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstone_source_collection_async_scan (self, _tmp0_, _tmp1_, NULL, NULL);
-#line 1390 "Tombstone.c"
+#line 1393 "Tombstone.c"
}
@@ -1401,30 +1404,54 @@ static void tombstone_source_collection_async_scan_data_free (gpointer _data) {
_data_collection_unref0 (_data_->self);
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_slice_free (TombstoneSourceCollectionAsyncScanData, _data_);
-#line 1405 "Tombstone.c"
+#line 1408 "Tombstone.c"
+}
+
+
+static void tombstone_source_collection_async_scan_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+ TombstoneSourceCollectionAsyncScanData* _task_data_;
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ _task_data_ = g_task_get_task_data (G_TASK (res));
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ if (_task_data_->_callback_ != NULL) {
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ _task_data_->_callback_ (source_object, res, user_data);
+#line 1420 "Tombstone.c"
+ }
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ _task_data_->_task_complete_ = TRUE;
+#line 1424 "Tombstone.c"
}
static gpointer _data_collection_ref0 (gpointer self) {
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
return self ? data_collection_ref (self) : NULL;
-#line 1412 "Tombstone.c"
+#line 1431 "Tombstone.c"
}
static void tombstone_source_collection_async_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) {
TombstoneSourceCollectionAsyncScanData* _data_;
- TombstoneSourceCollection* _tmp0_ = NULL;
- DirectoryMonitor* _tmp1_ = NULL;
- DirectoryMonitor* _tmp2_ = NULL;
- GCancellable* _tmp3_ = NULL;
- GCancellable* _tmp4_ = NULL;
+ TombstoneSourceCollection* _tmp0_;
+ DirectoryMonitor* _tmp1_;
+ DirectoryMonitor* _tmp2_;
+ GCancellable* _tmp3_;
+ GCancellable* _tmp4_;
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_ = g_slice_new0 (TombstoneSourceCollectionAsyncScanData);
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, tombstone_source_collection_async_scan);
+ _data_->_callback_ = _callback_;
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ _data_->_async_result = g_task_new (NULL, cancellable, tombstone_source_collection_async_scan_async_ready_wrapper, _user_data_);
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ if (_callback_ == NULL) {
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
- g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, tombstone_source_collection_async_scan_data_free);
+ _data_->_task_complete_ = TRUE;
+#line 1452 "Tombstone.c"
+ }
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ g_task_set_task_data (_data_->_async_result, _data_, tombstone_source_collection_async_scan_data_free);
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = _data_collection_ref0 (self);
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1447,15 +1474,20 @@ static void tombstone_source_collection_async_scan (TombstoneSourceCollection* s
_data_->cancellable = _tmp4_;
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstone_source_collection_async_scan_co (_data_);
-#line 1451 "Tombstone.c"
+#line 1478 "Tombstone.c"
}
static void tombstone_source_collection_async_scan_finish (TombstoneSourceCollection* self, GAsyncResult* _res_) {
TombstoneSourceCollectionAsyncScanData* _data_;
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 1459 "Tombstone.c"
+ _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ if (NULL == _data_) {
+#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ return;
+#line 1490 "Tombstone.c"
+ }
}
@@ -1468,8 +1500,10 @@ static void tombstone_source_collection_async_scan_ready (GObject* source_object
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_res_ = _res_;
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ _data_->_task_complete_ = TRUE;
+#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstone_source_collection_async_scan_co (_data_);
-#line 1473 "Tombstone.c"
+#line 1507 "Tombstone.c"
}
@@ -1478,7 +1512,7 @@ static gboolean _tombstone_source_collection_async_scan_co_gsource_func (gpointe
result = tombstone_source_collection_async_scan_co (self);
#line 145 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 1482 "Tombstone.c"
+#line 1516 "Tombstone.c"
}
@@ -1487,45 +1521,35 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
switch (_data_->_state_) {
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
case 0:
-#line 1491 "Tombstone.c"
+#line 1525 "Tombstone.c"
goto _state_0;
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
case 1:
-#line 1495 "Tombstone.c"
+#line 1529 "Tombstone.c"
goto _state_1;
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
case 2:
-#line 1499 "Tombstone.c"
+#line 1533 "Tombstone.c"
goto _state_2;
default:
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_assert_not_reached ();
-#line 1504 "Tombstone.c"
+#line 1538 "Tombstone.c"
}
_state_0:
#line 114 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp0_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DATA_COLLECTION, DataCollection));
#line 114 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->marker = _data_->_tmp0_;
-#line 1513 "Tombstone.c"
+#line 1545 "Tombstone.c"
{
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp1_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DATA_COLLECTION, DataCollection));
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp2_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp2_ = _data_->_tmp1_;
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp3_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp4_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp4_ = _data_->_tmp3_;
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_data_->_tmp2_);
@@ -1534,68 +1558,44 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
while (TRUE) {
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp5_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp5_ = _data_->_object_it;
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp6_ = FALSE;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp6_ = gee_iterator_next (_data_->_tmp5_);
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (!_data_->_tmp6_) {
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 1549 "Tombstone.c"
+#line 1569 "Tombstone.c"
}
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp7_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp7_ = _data_->_object_it;
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp8_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp8_ = gee_iterator_get (_data_->_tmp7_);
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->object = (DataObject*) _data_->_tmp8_;
#line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp9_ = NULL;
-#line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp9_ = _data_->object;
#line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp10_ = NULL;
-#line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp9_, TYPE_TOMBSTONE, Tombstone));
#line 116 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->tombstone = _data_->_tmp10_;
#line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp11_ = NULL;
-#line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp11_ = _data_->tombstone;
#line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp12_ = NULL;
-#line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp12_ = tombstone_get_file (_data_->_tmp11_);
#line 117 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->file = _data_->_tmp12_;
#line 119 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->info = NULL;
#line 120 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp13_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp13_ = _data_->monitor;
#line 120 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_data_->_tmp13_ != NULL) {
#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp14_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp14_ = _data_->monitor;
#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp15_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp15_ = _data_->file;
#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp16_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp16_ = directory_monitor_get_file_info (_data_->_tmp14_, _data_->_tmp15_);
#line 121 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_data_->info);
@@ -1604,20 +1604,14 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
#line 1605 "Tombstone.c"
}
#line 125 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp17_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp17_ = _data_->info;
#line 125 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_data_->_tmp17_ == NULL) {
-#line 1613 "Tombstone.c"
+#line 1611 "Tombstone.c"
{
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp19_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp19_ = _data_->file;
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp20_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp20_ = _data_->cancellable;
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_state_ = 1;
@@ -1625,22 +1619,18 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
g_file_query_info_async (_data_->_tmp19_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_PRIORITY_LOW, _data_->_tmp20_, tombstone_source_collection_async_scan_ready, _data_);
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
return FALSE;
-#line 1629 "Tombstone.c"
+#line 1623 "Tombstone.c"
_state_1:
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp21_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp21_ = g_file_query_info_finish (_data_->_tmp19_, _data_->_res_, &_data_->_inner_error_);
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp18_ = _data_->_tmp21_;
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1639 "Tombstone.c"
- goto __catch548_g_error;
+#line 1631 "Tombstone.c"
+ goto __catch549_g_error;
}
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp22_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp22_ = _data_->_tmp18_;
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp18_ = NULL;
@@ -1650,18 +1640,16 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
_data_->info = _data_->_tmp22_;
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_data_->_tmp18_);
-#line 1654 "Tombstone.c"
+#line 1644 "Tombstone.c"
}
- goto __finally548;
- __catch548_g_error:
+ goto __finally549;
+ __catch549_g_error:
{
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->err = _data_->_inner_error_;
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_inner_error_ = NULL;
#line 131 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp23_ = NULL;
-#line 131 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp23_ = _data_->err;
#line 131 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (g_error_matches (_data_->_tmp23_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
@@ -1677,46 +1665,34 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
_g_object_unref0 (_data_->object);
#line 132 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 1681 "Tombstone.c"
+#line 1669 "Tombstone.c"
}
#line 134 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp24_ = NULL;
-#line 134 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp24_ = _data_->err;
#line 134 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (!g_error_matches (_data_->_tmp24_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) {
#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp25_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp25_ = _data_->file;
#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp26_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp26_ = g_file_get_path (_data_->_tmp25_);
#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp27_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp27_ = _data_->_tmp26_;
#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp28_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp28_ = _data_->err;
#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp29_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp29_ = _data_->_tmp28_->message;
#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_warning ("Tombstone.vala:135: Unable to check for existence of tombstoned file %" \
"s: %s", _data_->_tmp27_, _data_->_tmp29_);
#line 135 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_free0 (_data_->_tmp27_);
-#line 1713 "Tombstone.c"
+#line 1689 "Tombstone.c"
}
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_error_free0 (_data_->err);
-#line 1717 "Tombstone.c"
+#line 1693 "Tombstone.c"
}
- __finally548:
+ __finally549:
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1736,27 +1712,23 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_clear_error (&_data_->_inner_error_);
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ g_object_unref (_data_->_async_result);
+#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
return FALSE;
-#line 1740 "Tombstone.c"
+#line 1718 "Tombstone.c"
}
}
#line 142 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp30_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp30_ = _data_->info;
#line 142 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_data_->_tmp30_ == NULL) {
#line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp31_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp31_ = _data_->marker;
#line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp32_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp32_ = _data_->tombstone;
#line 143 "/home/jens/Source/shotwell/src/Tombstone.vala"
marker_mark (_data_->_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp32_, TYPE_DATA_OBJECT, DataObject));
-#line 1759 "Tombstone.c"
+#line 1731 "Tombstone.c"
}
#line 145 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _tombstone_source_collection_async_scan_co_gsource_func, _data_, NULL);
@@ -1764,7 +1736,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
_data_->_state_ = 2;
#line 146 "/home/jens/Source/shotwell/src/Tombstone.vala"
return FALSE;
-#line 1767 "Tombstone.c"
+#line 1739 "Tombstone.c"
_state_2:
;
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1775,41 +1747,31 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
_g_object_unref0 (_data_->tombstone);
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_data_->object);
-#line 1778 "Tombstone.c"
+#line 1750 "Tombstone.c"
}
#line 115 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_data_->_object_it);
-#line 1782 "Tombstone.c"
+#line 1754 "Tombstone.c"
}
#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp33_ = NULL;
-#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp33_ = _data_->marker;
#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp34_ = 0;
-#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp34_ = marker_get_count (_data_->_tmp33_);
#line 149 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_data_->_tmp34_ > 0) {
#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp35_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp35_ = _data_->marker;
#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp36_ = 0;
-#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp36_ = marker_get_count (_data_->_tmp35_);
#line 150 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_debug ("Tombstone.vala:150: Resurrecting %d tombstones with no backing file", _data_->_tmp36_);
#line 151 "/home/jens/Source/shotwell/src/Tombstone.vala"
database_table_begin_transaction ();
#line 152 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp37_ = NULL;
-#line 152 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp37_ = _data_->marker;
#line 152 "/home/jens/Source/shotwell/src/Tombstone.vala"
source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_SOURCE_COLLECTION, SourceCollection), _data_->_tmp37_, FALSE, NULL, NULL, NULL);
-#line 1812 "Tombstone.c"
+#line 1774 "Tombstone.c"
{
#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
database_table_commit_transaction (&_data_->_inner_error_);
@@ -1817,8 +1779,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_data_->_inner_error_->domain == DATABASE_ERROR) {
-#line 1820 "Tombstone.c"
- goto __catch549_database_error;
+#line 1782 "Tombstone.c"
+ goto __catch550_database_error;
}
#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_data_->marker);
@@ -1827,28 +1789,28 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_clear_error (&_data_->_inner_error_);
#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ g_object_unref (_data_->_async_result);
+#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
return FALSE;
-#line 1831 "Tombstone.c"
+#line 1795 "Tombstone.c"
}
}
- goto __finally549;
- __catch549_database_error:
+ goto __finally550;
+ __catch550_database_error:
{
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->err2 = _data_->_inner_error_;
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_inner_error_ = NULL;
#line 156 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _data_->_tmp38_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp38_ = _data_->err2;
#line 156 "/home/jens/Source/shotwell/src/Tombstone.vala"
app_window_database_error (_data_->_tmp38_);
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_error_free0 (_data_->err2);
-#line 1849 "Tombstone.c"
+#line 1811 "Tombstone.c"
}
- __finally549:
+ __finally550:
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1858,27 +1820,30 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_clear_error (&_data_->_inner_error_);
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ g_object_unref (_data_->_async_result);
+#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
return FALSE;
-#line 1862 "Tombstone.c"
+#line 1826 "Tombstone.c"
}
}
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_data_->marker);
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
- if (_data_->_state_ == 0) {
+ g_task_return_pointer (_data_->_async_result, _data_, NULL);
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
- g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 1871 "Tombstone.c"
- } else {
+ if (_data_->_state_ != 0) {
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
- g_simple_async_result_complete (_data_->_async_result);
-#line 1875 "Tombstone.c"
+ while (_data_->_task_complete_ != TRUE) {
+#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
+ g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
+#line 1839 "Tombstone.c"
+ }
}
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_object_unref (_data_->_async_result);
#line 112 "/home/jens/Source/shotwell/src/Tombstone.vala"
return FALSE;
-#line 1881 "Tombstone.c"
+#line 1846 "Tombstone.c"
}
@@ -1890,28 +1855,28 @@ static void tombstone_source_collection_class_init (TombstoneSourceCollectionCla
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_type_class_add_private (klass, sizeof (TombstoneSourceCollectionPrivate));
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
- ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) tombstone_source_collection_real_holds_type_of_source;
+ ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) tombstone_source_collection_real_holds_type_of_source;
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
- ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) tombstone_source_collection_real_notify_contents_altered;
+ ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) tombstone_source_collection_real_notify_contents_altered;
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
- ((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) tombstone_source_collection_real_notify_items_altered;
-#line 1898 "Tombstone.c"
+ ((DataCollectionClass *) klass)->notify_items_altered = (void (*) (DataCollection *, GeeMap*)) tombstone_source_collection_real_notify_items_altered;
+#line 1863 "Tombstone.c"
}
static void tombstone_source_collection_instance_init (TombstoneSourceCollection * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
self->priv = TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE (self);
#line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
self->priv->file_map = _tmp0_;
-#line 1910 "Tombstone.c"
+#line 1875 "Tombstone.c"
}
-static void tombstone_source_collection_finalize (DataCollection* obj) {
+static void tombstone_source_collection_finalize (DataCollection * obj) {
TombstoneSourceCollection * self;
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_SOURCE_COLLECTION, TombstoneSourceCollection);
@@ -1919,7 +1884,7 @@ static void tombstone_source_collection_finalize (DataCollection* obj) {
_g_object_unref0 (self->priv->file_map);
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
DATA_COLLECTION_CLASS (tombstone_source_collection_parent_class)->finalize (obj);
-#line 1922 "Tombstone.c"
+#line 1887 "Tombstone.c"
}
@@ -1937,11 +1902,11 @@ GType tombstone_source_collection_get_type (void) {
TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5) {
TombstonedFile* self = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- gint64 _tmp2_ = 0LL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ gint64 _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 167 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 167 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1968,21 +1933,21 @@ TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint6
self->md5 = _tmp4_;
#line 167 "/home/jens/Source/shotwell/src/Tombstone.vala"
return self;
-#line 1971 "Tombstone.c"
+#line 1936 "Tombstone.c"
}
TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5) {
#line 167 "/home/jens/Source/shotwell/src/Tombstone.vala"
return tombstoned_file_construct (TYPE_TOMBSTONED_FILE, file, filesize, md5);
-#line 1978 "Tombstone.c"
+#line 1943 "Tombstone.c"
}
static void value_tombstoned_file_init (GValue* value) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
value->data[0].v_pointer = NULL;
-#line 1985 "Tombstone.c"
+#line 1950 "Tombstone.c"
}
@@ -1991,7 +1956,7 @@ static void value_tombstoned_file_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstoned_file_unref (value->data[0].v_pointer);
-#line 1994 "Tombstone.c"
+#line 1959 "Tombstone.c"
}
}
@@ -2001,11 +1966,11 @@ static void value_tombstoned_file_copy_value (const GValue* src_value, GValue* d
if (src_value->data[0].v_pointer) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
dest_value->data[0].v_pointer = tombstoned_file_ref (src_value->data[0].v_pointer);
-#line 2004 "Tombstone.c"
+#line 1969 "Tombstone.c"
} else {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2008 "Tombstone.c"
+#line 1973 "Tombstone.c"
}
}
@@ -2013,66 +1978,66 @@ static void value_tombstoned_file_copy_value (const GValue* src_value, GValue* d
static gpointer value_tombstoned_file_peek_pointer (const GValue* value) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
return value->data[0].v_pointer;
-#line 2016 "Tombstone.c"
+#line 1981 "Tombstone.c"
}
static gchar* value_tombstoned_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (collect_values[0].v_pointer) {
-#line 2023 "Tombstone.c"
- TombstonedFile* object;
+#line 1988 "Tombstone.c"
+ TombstonedFile * object;
object = collect_values[0].v_pointer;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (object->parent_instance.g_class == NULL) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2030 "Tombstone.c"
+#line 1995 "Tombstone.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.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 2034 "Tombstone.c"
+#line 1999 "Tombstone.c"
}
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
value->data[0].v_pointer = tombstoned_file_ref (object);
-#line 2038 "Tombstone.c"
+#line 2003 "Tombstone.c"
} else {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
value->data[0].v_pointer = NULL;
-#line 2042 "Tombstone.c"
+#line 2007 "Tombstone.c"
}
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
return NULL;
-#line 2046 "Tombstone.c"
+#line 2011 "Tombstone.c"
}
static gchar* value_tombstoned_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- TombstonedFile** object_p;
+ TombstonedFile ** object_p;
object_p = collect_values[0].v_pointer;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (!object_p) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2057 "Tombstone.c"
+#line 2022 "Tombstone.c"
}
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (!value->data[0].v_pointer) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
*object_p = NULL;
-#line 2063 "Tombstone.c"
+#line 2028 "Tombstone.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
*object_p = value->data[0].v_pointer;
-#line 2067 "Tombstone.c"
+#line 2032 "Tombstone.c"
} else {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
*object_p = tombstoned_file_ref (value->data[0].v_pointer);
-#line 2071 "Tombstone.c"
+#line 2036 "Tombstone.c"
}
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
return NULL;
-#line 2075 "Tombstone.c"
+#line 2040 "Tombstone.c"
}
@@ -2086,7 +2051,7 @@ GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, co
G_PARAM_SPEC (spec)->value_type = object_type;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
return G_PARAM_SPEC (spec);
-#line 2089 "Tombstone.c"
+#line 2054 "Tombstone.c"
}
@@ -2095,12 +2060,12 @@ gpointer value_get_tombstoned_file (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE), NULL);
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
return value->data[0].v_pointer;
-#line 2098 "Tombstone.c"
+#line 2063 "Tombstone.c"
}
void value_set_tombstoned_file (GValue* value, gpointer v_object) {
- TombstonedFile* old;
+ TombstonedFile * old;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE));
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2115,23 +2080,23 @@ void value_set_tombstoned_file (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstoned_file_ref (value->data[0].v_pointer);
-#line 2118 "Tombstone.c"
+#line 2083 "Tombstone.c"
} else {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
value->data[0].v_pointer = NULL;
-#line 2122 "Tombstone.c"
+#line 2087 "Tombstone.c"
}
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (old) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstoned_file_unref (old);
-#line 2128 "Tombstone.c"
+#line 2093 "Tombstone.c"
}
}
void value_take_tombstoned_file (GValue* value, gpointer v_object) {
- TombstonedFile* old;
+ TombstonedFile * old;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONED_FILE));
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2144,17 +2109,17 @@ void value_take_tombstoned_file (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
value->data[0].v_pointer = v_object;
-#line 2147 "Tombstone.c"
+#line 2112 "Tombstone.c"
} else {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
value->data[0].v_pointer = NULL;
-#line 2151 "Tombstone.c"
+#line 2116 "Tombstone.c"
}
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (old) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstoned_file_unref (old);
-#line 2157 "Tombstone.c"
+#line 2122 "Tombstone.c"
}
}
@@ -2164,18 +2129,18 @@ static void tombstoned_file_class_init (TombstonedFileClass * klass) {
tombstoned_file_parent_class = g_type_class_peek_parent (klass);
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
((TombstonedFileClass *) klass)->finalize = tombstoned_file_finalize;
-#line 2167 "Tombstone.c"
+#line 2132 "Tombstone.c"
}
static void tombstoned_file_instance_init (TombstonedFile * self) {
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
self->ref_count = 1;
-#line 2174 "Tombstone.c"
+#line 2139 "Tombstone.c"
}
-static void tombstoned_file_finalize (TombstonedFile* obj) {
+static void tombstoned_file_finalize (TombstonedFile * obj) {
TombstonedFile * self;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONED_FILE, TombstonedFile);
@@ -2185,7 +2150,7 @@ static void tombstoned_file_finalize (TombstonedFile* obj) {
_g_object_unref0 (self->file);
#line 165 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_free0 (self->md5);
-#line 2188 "Tombstone.c"
+#line 2153 "Tombstone.c"
}
@@ -2204,18 +2169,18 @@ GType tombstoned_file_get_type (void) {
gpointer tombstoned_file_ref (gpointer instance) {
- TombstonedFile* self;
+ TombstonedFile * self;
self = instance;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_atomic_int_inc (&self->ref_count);
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
return instance;
-#line 2213 "Tombstone.c"
+#line 2178 "Tombstone.c"
}
void tombstoned_file_unref (gpointer instance) {
- TombstonedFile* self;
+ TombstonedFile * self;
self = instance;
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2223,7 +2188,7 @@ void tombstoned_file_unref (gpointer instance) {
TOMBSTONED_FILE_GET_CLASS (self)->finalize (self);
#line 162 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2226 "Tombstone.c"
+#line 2191 "Tombstone.c"
}
}
@@ -2234,37 +2199,37 @@ gint tombstone_reason_serialize (TombstoneReason self) {
result = (gint) self;
#line 181 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 2237 "Tombstone.c"
+#line 2202 "Tombstone.c"
}
TombstoneReason tombstone_reason_unserialize (gint value) {
TombstoneReason result = 0;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 185 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = value;
#line 185 "/home/jens/Source/shotwell/src/Tombstone.vala"
switch ((TombstoneReason) _tmp0_) {
#line 185 "/home/jens/Source/shotwell/src/Tombstone.vala"
case TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE:
-#line 2250 "Tombstone.c"
+#line 2215 "Tombstone.c"
{
#line 187 "/home/jens/Source/shotwell/src/Tombstone.vala"
result = TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE;
#line 187 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 2256 "Tombstone.c"
+#line 2221 "Tombstone.c"
}
default:
#line 185 "/home/jens/Source/shotwell/src/Tombstone.vala"
case TOMBSTONE_REASON_REMOVED_BY_USER:
-#line 2261 "Tombstone.c"
+#line 2226 "Tombstone.c"
{
#line 192 "/home/jens/Source/shotwell/src/Tombstone.vala"
result = TOMBSTONE_REASON_REMOVED_BY_USER;
#line 192 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 2267 "Tombstone.c"
+#line 2232 "Tombstone.c"
}
}
}
@@ -2285,14 +2250,14 @@ GType tombstone_reason_get_type (void) {
static gpointer _tombstone_row_ref0 (gpointer self) {
#line 203 "/home/jens/Source/shotwell/src/Tombstone.vala"
return self ? tombstone_row_ref (self) : NULL;
-#line 2288 "Tombstone.c"
+#line 2253 "Tombstone.c"
}
static Tombstone* tombstone_construct (GType object_type, TombstoneRow* row) {
Tombstone * self = NULL;
- TombstoneRow* _tmp0_ = NULL;
- TombstoneRow* _tmp1_ = NULL;
+ TombstoneRow* _tmp0_;
+ TombstoneRow* _tmp1_;
#line 202 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (IS_TOMBSTONE_ROW (row), NULL);
#line 202 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2307,24 +2272,24 @@ static Tombstone* tombstone_construct (GType object_type, TombstoneRow* row) {
self->priv->row = _tmp1_;
#line 202 "/home/jens/Source/shotwell/src/Tombstone.vala"
return self;
-#line 2310 "Tombstone.c"
+#line 2275 "Tombstone.c"
}
static Tombstone* tombstone_new (TombstoneRow* row) {
#line 202 "/home/jens/Source/shotwell/src/Tombstone.vala"
return tombstone_construct (TYPE_TOMBSTONE, row);
-#line 2317 "Tombstone.c"
+#line 2282 "Tombstone.c"
}
void tombstone_init (void) {
- TombstoneSourceCollection* _tmp0_ = NULL;
+ TombstoneSourceCollection* _tmp0_;
TombstoneRow** rows = NULL;
- gint rows_length1 = 0;
- gint _rows_size_ = 0;
- TombstoneRow** _tmp9_ = NULL;
- gint _tmp9__length1 = 0;
+ gint rows_length1;
+ gint _rows_size_;
+ TombstoneRow** _tmp9_;
+ gint _tmp9__length1;
GError * _inner_error_ = NULL;
#line 207 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = tombstone_source_collection_new ();
@@ -2338,19 +2303,19 @@ void tombstone_init (void) {
rows_length1 = 0;
#line 209 "/home/jens/Source/shotwell/src/Tombstone.vala"
_rows_size_ = rows_length1;
-#line 2341 "Tombstone.c"
+#line 2306 "Tombstone.c"
{
TombstoneRow** _tmp1_ = NULL;
- TombstoneTable* _tmp2_ = NULL;
- TombstoneTable* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- TombstoneRow** _tmp5_ = NULL;
- TombstoneRow** _tmp6_ = NULL;
- gint _tmp6__length1 = 0;
- gint _tmp1__length1 = 0;
- gint __tmp1__size_ = 0;
- TombstoneRow** _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
+ TombstoneTable* _tmp2_;
+ TombstoneTable* _tmp3_;
+ gint _tmp4_;
+ TombstoneRow** _tmp5_;
+ TombstoneRow** _tmp6_;
+ gint _tmp6__length1;
+ gint _tmp1__length1;
+ gint __tmp1__size_;
+ TombstoneRow** _tmp7_;
+ gint _tmp7__length1;
#line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp2_ = tombstone_table_get_instance ();
#line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2373,8 +2338,8 @@ void tombstone_init (void) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2376 "Tombstone.c"
- goto __catch550_database_error;
+#line 2341 "Tombstone.c"
+ goto __catch551_database_error;
}
#line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
@@ -2384,7 +2349,7 @@ void tombstone_init (void) {
g_clear_error (&_inner_error_);
#line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 2387 "Tombstone.c"
+#line 2352 "Tombstone.c"
}
#line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp7_ = _tmp1_;
@@ -2404,13 +2369,13 @@ void tombstone_init (void) {
_rows_size_ = rows_length1;
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL);
-#line 2407 "Tombstone.c"
+#line 2372 "Tombstone.c"
}
- goto __finally550;
- __catch550_database_error:
+ goto __finally551;
+ __catch551_database_error:
{
GError* err = NULL;
- GError* _tmp8_ = NULL;
+ GError* _tmp8_;
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
err = _inner_error_;
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2421,9 +2386,9 @@ void tombstone_init (void) {
app_window_database_error (_tmp8_);
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_error_free0 (err);
-#line 2424 "Tombstone.c"
+#line 2389 "Tombstone.c"
}
- __finally550:
+ __finally551:
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2434,7 +2399,7 @@ void tombstone_init (void) {
g_clear_error (&_inner_error_);
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 2437 "Tombstone.c"
+#line 2402 "Tombstone.c"
}
#line 216 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp9_ = rows;
@@ -2442,15 +2407,15 @@ void tombstone_init (void) {
_tmp9__length1 = rows_length1;
#line 216 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_tmp9_ != NULL) {
-#line 2445 "Tombstone.c"
+#line 2410 "Tombstone.c"
GeeArrayList* tombstones = NULL;
- GeeArrayList* _tmp10_ = NULL;
- TombstoneRow** _tmp11_ = NULL;
- gint _tmp11__length1 = 0;
- TombstoneSourceCollection* _tmp17_ = NULL;
- GeeArrayList* _tmp18_ = NULL;
- GeeCollection* _tmp19_ = NULL;
- GeeCollection* _tmp20_ = NULL;
+ GeeArrayList* _tmp10_;
+ TombstoneRow** _tmp11_;
+ gint _tmp11__length1;
+ TombstoneSourceCollection* _tmp17_;
+ GeeArrayList* _tmp18_;
+ GeeCollection* _tmp19_;
+ GeeCollection* _tmp20_;
#line 217 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp10_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 217 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2459,7 +2424,7 @@ void tombstone_init (void) {
_tmp11_ = rows;
#line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp11__length1 = rows_length1;
-#line 2462 "Tombstone.c"
+#line 2427 "Tombstone.c"
{
TombstoneRow** row_collection = NULL;
gint row_collection_length1 = 0;
@@ -2471,19 +2436,19 @@ void tombstone_init (void) {
row_collection_length1 = _tmp11__length1;
#line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
for (row_it = 0; row_it < _tmp11__length1; row_it = row_it + 1) {
-#line 2474 "Tombstone.c"
- TombstoneRow* _tmp12_ = NULL;
+#line 2439 "Tombstone.c"
+ TombstoneRow* _tmp12_;
TombstoneRow* row = NULL;
#line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp12_ = _tombstone_row_ref0 (row_collection[row_it]);
#line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
row = _tmp12_;
-#line 2481 "Tombstone.c"
+#line 2446 "Tombstone.c"
{
- GeeArrayList* _tmp13_ = NULL;
- TombstoneRow* _tmp14_ = NULL;
- Tombstone* _tmp15_ = NULL;
- Tombstone* _tmp16_ = NULL;
+ GeeArrayList* _tmp13_;
+ TombstoneRow* _tmp14_;
+ Tombstone* _tmp15_;
+ Tombstone* _tmp16_;
#line 219 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp13_ = tombstones;
#line 219 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2498,7 +2463,7 @@ void tombstone_init (void) {
_g_object_unref0 (_tmp16_);
#line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tombstone_row_unref0 (row);
-#line 2501 "Tombstone.c"
+#line 2466 "Tombstone.c"
}
}
}
@@ -2514,11 +2479,11 @@ void tombstone_init (void) {
_g_object_unref0 (_tmp20_);
#line 216 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (tombstones);
-#line 2517 "Tombstone.c"
+#line 2482 "Tombstone.c"
}
#line 206 "/home/jens/Source/shotwell/src/Tombstone.vala"
rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
-#line 2521 "Tombstone.c"
+#line 2486 "Tombstone.c"
}
@@ -2529,15 +2494,15 @@ void tombstone_terminate (void) {
static gpointer _backing_file_state_ref0 (gpointer self) {
#line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
return self ? backing_file_state_ref (self) : NULL;
-#line 2532 "Tombstone.c"
+#line 2497 "Tombstone.c"
}
void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reason, GError** error) {
GeeCollection* files = NULL;
- GeeArrayList* _tmp0_ = NULL;
- GeeCollection* _tmp21_ = NULL;
- TombstoneReason _tmp22_ = 0;
+ GeeArrayList* _tmp0_;
+ GeeCollection* _tmp21_;
+ TombstoneReason _tmp22_;
GError * _inner_error_ = NULL;
#line 228 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
@@ -2545,11 +2510,11 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
_tmp0_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL);
#line 230 "/home/jens/Source/shotwell/src/Tombstone.vala"
files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2548 "Tombstone.c"
+#line 2513 "Tombstone.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeCollection* _tmp1_;
+ GeeIterator* _tmp2_;
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp1_ = sources;
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2558,15 +2523,15 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
_source_it = _tmp2_;
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
while (TRUE) {
-#line 2561 "Tombstone.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 2526 "Tombstone.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
MediaSource* source = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
- MediaSource* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- BackingFileState** _tmp9_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
+ MediaSource* _tmp7_;
+ gint _tmp8_;
+ BackingFileState** _tmp9_;
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp3_ = _source_it;
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2575,7 +2540,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
if (!_tmp4_) {
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 2578 "Tombstone.c"
+#line 2543 "Tombstone.c"
}
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp5_ = _source_it;
@@ -2587,7 +2552,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
_tmp7_ = source;
#line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp9_ = media_source_get_backing_files_state (_tmp7_, &_tmp8_);
-#line 2590 "Tombstone.c"
+#line 2555 "Tombstone.c"
{
BackingFileState** state_collection = NULL;
gint state_collection_length1 = 0;
@@ -2599,25 +2564,25 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
state_collection_length1 = _tmp8_;
#line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
for (state_it = 0; state_it < _tmp8_; state_it = state_it + 1) {
-#line 2602 "Tombstone.c"
- BackingFileState* _tmp10_ = NULL;
+#line 2567 "Tombstone.c"
+ BackingFileState* _tmp10_;
BackingFileState* state = NULL;
#line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp10_ = _backing_file_state_ref0 (state_collection[state_it]);
#line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
state = _tmp10_;
-#line 2609 "Tombstone.c"
+#line 2574 "Tombstone.c"
{
- GeeCollection* _tmp11_ = NULL;
- BackingFileState* _tmp12_ = NULL;
- GFile* _tmp13_ = NULL;
- GFile* _tmp14_ = NULL;
- BackingFileState* _tmp15_ = NULL;
- gint64 _tmp16_ = 0LL;
- BackingFileState* _tmp17_ = NULL;
- const gchar* _tmp18_ = NULL;
- TombstonedFile* _tmp19_ = NULL;
- TombstonedFile* _tmp20_ = NULL;
+ GeeCollection* _tmp11_;
+ BackingFileState* _tmp12_;
+ GFile* _tmp13_;
+ GFile* _tmp14_;
+ BackingFileState* _tmp15_;
+ gint64 _tmp16_;
+ BackingFileState* _tmp17_;
+ const gchar* _tmp18_;
+ TombstonedFile* _tmp19_;
+ TombstonedFile* _tmp20_;
#line 233 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp11_ = files;
#line 233 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2646,20 +2611,20 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
_g_object_unref0 (_tmp14_);
#line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
_backing_file_state_unref0 (state);
-#line 2649 "Tombstone.c"
+#line 2614 "Tombstone.c"
}
}
#line 232 "/home/jens/Source/shotwell/src/Tombstone.vala"
state_collection = (_vala_array_free (state_collection, state_collection_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 2654 "Tombstone.c"
+#line 2619 "Tombstone.c"
}
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (source);
-#line 2658 "Tombstone.c"
+#line 2623 "Tombstone.c"
}
#line 231 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_source_it);
-#line 2662 "Tombstone.c"
+#line 2627 "Tombstone.c"
}
#line 236 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp21_ = files;
@@ -2677,7 +2642,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
_g_object_unref0 (files);
#line 236 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 2680 "Tombstone.c"
+#line 2645 "Tombstone.c"
} else {
#line 236 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (files);
@@ -2687,27 +2652,27 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
g_clear_error (&_inner_error_);
#line 236 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 2690 "Tombstone.c"
+#line 2655 "Tombstone.c"
}
}
#line 228 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (files);
-#line 2695 "Tombstone.c"
+#line 2660 "Tombstone.c"
}
void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, GError** error) {
Marker* to_destroy = NULL;
- TombstoneSourceCollection* _tmp0_ = NULL;
- Marker* _tmp1_ = NULL;
- TombstoneSourceCollection* _tmp15_ = NULL;
- Marker* _tmp16_ = NULL;
+ TombstoneSourceCollection* _tmp0_;
+ Marker* _tmp1_;
+ TombstoneSourceCollection* _tmp15_;
+ Marker* _tmp16_;
GeeArrayList* tombstones = NULL;
- GeeArrayList* _tmp17_ = NULL;
- TombstoneSourceCollection* _tmp41_ = NULL;
- GeeArrayList* _tmp42_ = NULL;
- GeeCollection* _tmp43_ = NULL;
- GeeCollection* _tmp44_ = NULL;
+ GeeArrayList* _tmp17_;
+ TombstoneSourceCollection* _tmp41_;
+ GeeArrayList* _tmp42_;
+ GeeCollection* _tmp43_;
+ GeeCollection* _tmp44_;
GError * _inner_error_ = NULL;
#line 239 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (GEE_IS_COLLECTION (files));
@@ -2717,11 +2682,11 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
_tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
#line 242 "/home/jens/Source/shotwell/src/Tombstone.vala"
to_destroy = _tmp1_;
-#line 2720 "Tombstone.c"
+#line 2685 "Tombstone.c"
{
GeeIterator* _file_it = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeIterator* _tmp3_ = NULL;
+ GeeCollection* _tmp2_;
+ GeeIterator* _tmp3_;
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp2_ = files;
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2730,18 +2695,18 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
_file_it = _tmp3_;
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
while (TRUE) {
-#line 2733 "Tombstone.c"
- GeeIterator* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+#line 2698 "Tombstone.c"
+ GeeIterator* _tmp4_;
+ gboolean _tmp5_;
TombstonedFile* file = NULL;
- GeeIterator* _tmp6_ = NULL;
- gpointer _tmp7_ = NULL;
+ GeeIterator* _tmp6_;
+ gpointer _tmp7_;
Tombstone* tombstone = NULL;
- TombstoneSourceCollection* _tmp8_ = NULL;
- TombstonedFile* _tmp9_ = NULL;
- GFile* _tmp10_ = NULL;
- Tombstone* _tmp11_ = NULL;
- Tombstone* _tmp12_ = NULL;
+ TombstoneSourceCollection* _tmp8_;
+ TombstonedFile* _tmp9_;
+ GFile* _tmp10_;
+ Tombstone* _tmp11_;
+ Tombstone* _tmp12_;
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp4_ = _file_it;
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2750,7 +2715,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
if (!_tmp5_) {
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 2753 "Tombstone.c"
+#line 2718 "Tombstone.c"
}
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp6_ = _file_it;
@@ -2772,26 +2737,26 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
_tmp12_ = tombstone;
#line 245 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_tmp12_ != NULL) {
-#line 2775 "Tombstone.c"
- Marker* _tmp13_ = NULL;
- Tombstone* _tmp14_ = NULL;
+#line 2740 "Tombstone.c"
+ Marker* _tmp13_;
+ Tombstone* _tmp14_;
#line 246 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp13_ = to_destroy;
#line 246 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp14_ = tombstone;
#line 246 "/home/jens/Source/shotwell/src/Tombstone.vala"
marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 2784 "Tombstone.c"
+#line 2749 "Tombstone.c"
}
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (tombstone);
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tombstoned_file_unref0 (file);
-#line 2790 "Tombstone.c"
+#line 2755 "Tombstone.c"
}
#line 243 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_file_it);
-#line 2794 "Tombstone.c"
+#line 2759 "Tombstone.c"
}
#line 249 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp15_ = tombstone_global;
@@ -2803,11 +2768,11 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
_tmp17_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 251 "/home/jens/Source/shotwell/src/Tombstone.vala"
tombstones = _tmp17_;
-#line 2806 "Tombstone.c"
+#line 2771 "Tombstone.c"
{
GeeIterator* _file_it = NULL;
- GeeCollection* _tmp18_ = NULL;
- GeeIterator* _tmp19_ = NULL;
+ GeeCollection* _tmp18_;
+ GeeIterator* _tmp19_;
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp18_ = files;
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2816,29 +2781,29 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
_file_it = _tmp19_;
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
while (TRUE) {
-#line 2819 "Tombstone.c"
- GeeIterator* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
+#line 2784 "Tombstone.c"
+ GeeIterator* _tmp20_;
+ gboolean _tmp21_;
TombstonedFile* file = NULL;
- GeeIterator* _tmp22_ = NULL;
- gpointer _tmp23_ = NULL;
+ GeeIterator* _tmp22_;
+ gpointer _tmp23_;
TombstoneRow* _tmp24_ = NULL;
- TombstoneTable* _tmp25_ = NULL;
- TombstoneTable* _tmp26_ = NULL;
- TombstonedFile* _tmp27_ = NULL;
- GFile* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- TombstonedFile* _tmp31_ = NULL;
- gint64 _tmp32_ = 0LL;
- TombstonedFile* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
- TombstoneReason _tmp35_ = 0;
- TombstoneRow* _tmp36_ = NULL;
- TombstoneRow* _tmp37_ = NULL;
- GeeArrayList* _tmp38_ = NULL;
- Tombstone* _tmp39_ = NULL;
- Tombstone* _tmp40_ = NULL;
+ TombstoneTable* _tmp25_;
+ TombstoneTable* _tmp26_;
+ TombstonedFile* _tmp27_;
+ GFile* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ TombstonedFile* _tmp31_;
+ gint64 _tmp32_;
+ TombstonedFile* _tmp33_;
+ const gchar* _tmp34_;
+ TombstoneReason _tmp35_;
+ TombstoneRow* _tmp36_;
+ TombstoneRow* _tmp37_;
+ GeeArrayList* _tmp38_;
+ Tombstone* _tmp39_;
+ Tombstone* _tmp40_;
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp20_ = _file_it;
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2847,7 +2812,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
if (!_tmp21_) {
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
break;
-#line 2850 "Tombstone.c"
+#line 2815 "Tombstone.c"
}
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp22_ = _file_it;
@@ -2903,7 +2868,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
_g_object_unref0 (to_destroy);
#line 253 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 2906 "Tombstone.c"
+#line 2871 "Tombstone.c"
} else {
#line 253 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tombstoned_file_unref0 (file);
@@ -2919,7 +2884,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
g_clear_error (&_inner_error_);
#line 253 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 2922 "Tombstone.c"
+#line 2887 "Tombstone.c"
}
}
#line 253 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2936,11 +2901,11 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
_tombstone_row_unref0 (_tmp24_);
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tombstoned_file_unref0 (file);
-#line 2939 "Tombstone.c"
+#line 2904 "Tombstone.c"
}
#line 252 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_file_it);
-#line 2943 "Tombstone.c"
+#line 2908 "Tombstone.c"
}
#line 257 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp41_ = tombstone_global;
@@ -2956,14 +2921,14 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
_g_object_unref0 (tombstones);
#line 239 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (to_destroy);
-#line 2959 "Tombstone.c"
+#line 2924 "Tombstone.c"
}
static gchar* tombstone_real_get_typename (DataSource* base) {
Tombstone * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 260 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
#line 261 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2972,7 +2937,7 @@ static gchar* tombstone_real_get_typename (DataSource* base) {
result = _tmp0_;
#line 261 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 2975 "Tombstone.c"
+#line 2940 "Tombstone.c"
}
@@ -2980,7 +2945,7 @@ static gint64 tombstone_real_get_instance_id (DataSource* base) {
Tombstone * self;
gint64 result = 0LL;
TombstoneID _tmp0_ = {0};
- gint64 _tmp1_ = 0LL;
+ gint64 _tmp1_;
#line 264 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
#line 265 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2991,16 +2956,16 @@ static gint64 tombstone_real_get_instance_id (DataSource* base) {
result = _tmp1_;
#line 265 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 2994 "Tombstone.c"
+#line 2959 "Tombstone.c"
}
static gchar* tombstone_real_get_name (DataObject* base) {
Tombstone * self;
gchar* result = NULL;
- TombstoneRow* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ TombstoneRow* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 268 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
#line 269 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3013,17 +2978,17 @@ static gchar* tombstone_real_get_name (DataObject* base) {
result = _tmp2_;
#line 269 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3016 "Tombstone.c"
+#line 2981 "Tombstone.c"
}
static gchar* tombstone_real_to_string (DataObject* base) {
Tombstone * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 272 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
#line 273 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3040,13 +3005,13 @@ static gchar* tombstone_real_to_string (DataObject* base) {
result = _tmp3_;
#line 273 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3043 "Tombstone.c"
+#line 3008 "Tombstone.c"
}
void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result) {
- TombstoneRow* _tmp0_ = NULL;
- TombstoneID _tmp1_ = {0};
+ TombstoneRow* _tmp0_;
+ TombstoneID _tmp1_;
#line 276 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (IS_TOMBSTONE (self));
#line 277 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3057,25 +3022,25 @@ void tombstone_get_tombstone_id (Tombstone* self, TombstoneID* result) {
*result = _tmp1_;
#line 277 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 3060 "Tombstone.c"
+#line 3025 "Tombstone.c"
}
GFile* tombstone_get_file (Tombstone* self) {
GFile* result = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp4_;
+ GFile* _tmp5_;
#line 280 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (IS_TOMBSTONE (self), NULL);
#line 281 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = self->priv->file;
#line 281 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_tmp0_ == NULL) {
-#line 3075 "Tombstone.c"
- TombstoneRow* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+#line 3040 "Tombstone.c"
+ TombstoneRow* _tmp1_;
+ const gchar* _tmp2_;
+ GFile* _tmp3_;
#line 282 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp1_ = self->priv->row;
#line 282 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3086,7 +3051,7 @@ GFile* tombstone_get_file (Tombstone* self) {
_g_object_unref0 (self->priv->file);
#line 282 "/home/jens/Source/shotwell/src/Tombstone.vala"
self->priv->file = _tmp3_;
-#line 3089 "Tombstone.c"
+#line 3054 "Tombstone.c"
}
#line 284 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp4_ = self->priv->file;
@@ -3096,17 +3061,17 @@ GFile* tombstone_get_file (Tombstone* self) {
result = _tmp5_;
#line 284 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3099 "Tombstone.c"
+#line 3064 "Tombstone.c"
}
gchar* tombstone_get_md5 (Tombstone* self) {
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
- TombstoneRow* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gchar* _tmp6_ = NULL;
+ TombstoneRow* _tmp1_;
+ const gchar* _tmp2_;
+ gboolean _tmp3_;
+ gchar* _tmp6_;
#line 287 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (IS_TOMBSTONE (self), NULL);
#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3119,17 +3084,17 @@ gchar* tombstone_get_md5 (Tombstone* self) {
if (_tmp3_) {
#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = NULL;
-#line 3122 "Tombstone.c"
+#line 3087 "Tombstone.c"
} else {
- TombstoneRow* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ TombstoneRow* _tmp4_;
+ const gchar* _tmp5_;
#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp4_ = self->priv->row;
#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp5_ = _tmp4_->md5;
#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = _tmp5_;
-#line 3132 "Tombstone.c"
+#line 3097 "Tombstone.c"
}
#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp6_ = g_strdup (_tmp0_);
@@ -3137,14 +3102,14 @@ gchar* tombstone_get_md5 (Tombstone* self) {
result = _tmp6_;
#line 288 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3140 "Tombstone.c"
+#line 3105 "Tombstone.c"
}
TombstoneReason tombstone_get_reason (Tombstone* self) {
TombstoneReason result = 0;
- TombstoneRow* _tmp0_ = NULL;
- TombstoneReason _tmp1_ = 0;
+ TombstoneRow* _tmp0_;
+ TombstoneReason _tmp1_;
#line 291 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (IS_TOMBSTONE (self), 0);
#line 292 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3155,36 +3120,36 @@ TombstoneReason tombstone_get_reason (Tombstone* self) {
result = _tmp1_;
#line 292 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3158 "Tombstone.c"
+#line 3123 "Tombstone.c"
}
void tombstone_move (Tombstone* self, GFile* file) {
gchar* old_filepath = NULL;
- TombstoneRow* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- TombstoneRow* _tmp11_ = NULL;
- GFile* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- GFile* _tmp14_ = NULL;
- GFile* _tmp15_ = NULL;
- Alteration* _tmp16_ = NULL;
- Alteration* _tmp17_ = NULL;
+ TombstoneRow* _tmp8_;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
+ TombstoneRow* _tmp11_;
+ GFile* _tmp12_;
+ gchar* _tmp13_;
+ GFile* _tmp14_;
+ GFile* _tmp15_;
+ Alteration* _tmp16_;
+ Alteration* _tmp17_;
GError * _inner_error_ = NULL;
#line 295 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (IS_TOMBSTONE (self));
#line 295 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 3179 "Tombstone.c"
+#line 3144 "Tombstone.c"
{
- TombstoneTable* _tmp0_ = NULL;
- TombstoneTable* _tmp1_ = NULL;
- TombstoneRow* _tmp2_ = NULL;
- TombstoneID _tmp3_ = {0};
- GFile* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ TombstoneTable* _tmp0_;
+ TombstoneTable* _tmp1_;
+ TombstoneRow* _tmp2_;
+ TombstoneID _tmp3_;
+ GFile* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = tombstone_table_get_instance ();
#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3209,8 +3174,8 @@ void tombstone_move (Tombstone* self, GFile* file) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3212 "Tombstone.c"
- goto __catch551_database_error;
+#line 3177 "Tombstone.c"
+ goto __catch552_database_error;
}
#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3218,14 +3183,14 @@ void tombstone_move (Tombstone* self, GFile* file) {
g_clear_error (&_inner_error_);
#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 3221 "Tombstone.c"
+#line 3186 "Tombstone.c"
}
}
- goto __finally551;
- __catch551_database_error:
+ goto __finally552;
+ __catch552_database_error:
{
GError* err = NULL;
- GError* _tmp7_ = NULL;
+ GError* _tmp7_;
#line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
err = _inner_error_;
#line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3236,9 +3201,9 @@ void tombstone_move (Tombstone* self, GFile* file) {
app_window_database_error (_tmp7_);
#line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_error_free0 (err);
-#line 3239 "Tombstone.c"
+#line 3204 "Tombstone.c"
}
- __finally551:
+ __finally552:
#line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3247,7 +3212,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
g_clear_error (&_inner_error_);
#line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 3250 "Tombstone.c"
+#line 3215 "Tombstone.c"
}
#line 302 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp8_ = self->priv->row;
@@ -3285,33 +3250,33 @@ void tombstone_move (Tombstone* self, GFile* file) {
_alteration_unref0 (_tmp17_);
#line 295 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_free0 (old_filepath);
-#line 3288 "Tombstone.c"
+#line 3253 "Tombstone.c"
}
gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const gchar* md5) {
gboolean result = FALSE;
- TombstoneRow* _tmp0_ = NULL;
- gint64 _tmp1_ = 0LL;
- gint64 _tmp2_ = 0LL;
+ TombstoneRow* _tmp0_;
+ gint64 _tmp1_;
+ gint64 _tmp2_;
const gchar* _tmp3_ = NULL;
- TombstoneRow* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ TombstoneRow* _tmp4_;
+ const gchar* _tmp5_;
+ gboolean _tmp6_;
gchar* this_md5 = NULL;
- gchar* _tmp9_ = NULL;
+ gchar* _tmp9_;
const gchar* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+ const gchar* _tmp11_;
+ gboolean _tmp12_;
gchar* other_md5 = NULL;
- gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
- GFile* _tmp18_ = NULL;
- GFile* _tmp19_ = NULL;
- gboolean _tmp20_ = FALSE;
- gboolean _tmp21_ = FALSE;
+ gchar* _tmp14_;
+ const gchar* _tmp15_;
+ const gchar* _tmp16_;
+ GFile* _tmp17_;
+ GFile* _tmp18_;
+ GFile* _tmp19_;
+ gboolean _tmp20_;
+ gboolean _tmp21_;
#line 309 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_return_val_if_fail (IS_TOMBSTONE (self), FALSE);
#line 309 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3328,7 +3293,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
result = FALSE;
#line 311 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3331 "Tombstone.c"
+#line 3296 "Tombstone.c"
}
#line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp4_ = self->priv->row;
@@ -3340,17 +3305,17 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
if (_tmp6_) {
#line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp3_ = NULL;
-#line 3343 "Tombstone.c"
+#line 3308 "Tombstone.c"
} else {
- TombstoneRow* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
+ TombstoneRow* _tmp7_;
+ const gchar* _tmp8_;
#line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp7_ = self->priv->row;
#line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp8_ = _tmp7_->md5;
#line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp3_ = _tmp8_;
-#line 3353 "Tombstone.c"
+#line 3318 "Tombstone.c"
}
#line 314 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp9_ = g_strdup (_tmp3_);
@@ -3364,14 +3329,14 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
if (_tmp12_) {
#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp10_ = NULL;
-#line 3367 "Tombstone.c"
+#line 3332 "Tombstone.c"
} else {
- const gchar* _tmp13_ = NULL;
+ const gchar* _tmp13_;
#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp13_ = md5;
#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp10_ = _tmp13_;
-#line 3374 "Tombstone.c"
+#line 3339 "Tombstone.c"
}
#line 315 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp14_ = g_strdup (_tmp10_);
@@ -3391,7 +3356,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
_g_free0 (this_md5);
#line 318 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3394 "Tombstone.c"
+#line 3359 "Tombstone.c"
}
#line 320 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp17_ = tombstone_get_file (self);
@@ -3415,7 +3380,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
_g_free0 (this_md5);
#line 321 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3418 "Tombstone.c"
+#line 3383 "Tombstone.c"
}
#line 323 "/home/jens/Source/shotwell/src/Tombstone.vala"
result = TRUE;
@@ -3425,7 +3390,7 @@ gboolean tombstone_matches (Tombstone* self, GFile* file, gint64 filesize, const
_g_free0 (this_md5);
#line 323 "/home/jens/Source/shotwell/src/Tombstone.vala"
return result;
-#line 3428 "Tombstone.c"
+#line 3393 "Tombstone.c"
}
@@ -3434,12 +3399,12 @@ static void tombstone_real_destroy (DataSource* base) {
GError * _inner_error_ = NULL;
#line 326 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TOMBSTONE, Tombstone);
-#line 3437 "Tombstone.c"
+#line 3402 "Tombstone.c"
{
- TombstoneTable* _tmp0_ = NULL;
- TombstoneTable* _tmp1_ = NULL;
- TombstoneRow* _tmp2_ = NULL;
- TombstoneID _tmp3_ = {0};
+ TombstoneTable* _tmp0_;
+ TombstoneTable* _tmp1_;
+ TombstoneRow* _tmp2_;
+ TombstoneID _tmp3_;
#line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
_tmp0_ = tombstone_table_get_instance ();
#line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3456,8 +3421,8 @@ static void tombstone_real_destroy (DataSource* base) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3459 "Tombstone.c"
- goto __catch552_database_error;
+#line 3424 "Tombstone.c"
+ goto __catch553_database_error;
}
#line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3465,14 +3430,14 @@ static void tombstone_real_destroy (DataSource* base) {
g_clear_error (&_inner_error_);
#line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 3468 "Tombstone.c"
+#line 3433 "Tombstone.c"
}
}
- goto __finally552;
- __catch552_database_error:
+ goto __finally553;
+ __catch553_database_error:
{
GError* err = NULL;
- GError* _tmp4_ = NULL;
+ GError* _tmp4_;
#line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
err = _inner_error_;
#line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3483,9 +3448,9 @@ static void tombstone_real_destroy (DataSource* base) {
app_window_database_error (_tmp4_);
#line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_error_free0 (err);
-#line 3486 "Tombstone.c"
+#line 3451 "Tombstone.c"
}
- __finally552:
+ __finally553:
#line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3494,11 +3459,11 @@ static void tombstone_real_destroy (DataSource* base) {
g_clear_error (&_inner_error_);
#line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
return;
-#line 3497 "Tombstone.c"
+#line 3462 "Tombstone.c"
}
#line 333 "/home/jens/Source/shotwell/src/Tombstone.vala"
DATA_SOURCE_CLASS (tombstone_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 3501 "Tombstone.c"
+#line 3466 "Tombstone.c"
}
@@ -3508,18 +3473,18 @@ static void tombstone_class_init (TombstoneClass * klass) {
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_type_class_add_private (klass, sizeof (TombstonePrivate));
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
- ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) tombstone_real_get_typename;
+ ((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) tombstone_real_get_typename;
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
- ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) tombstone_real_get_instance_id;
+ ((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) tombstone_real_get_instance_id;
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
- ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) tombstone_real_get_name;
+ ((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) tombstone_real_get_name;
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
- ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) tombstone_real_to_string;
+ ((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) tombstone_real_to_string;
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
- ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) tombstone_real_destroy;
+ ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) tombstone_real_destroy;
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
G_OBJECT_CLASS (klass)->finalize = tombstone_finalize;
-#line 3522 "Tombstone.c"
+#line 3487 "Tombstone.c"
}
@@ -3528,11 +3493,11 @@ static void tombstone_instance_init (Tombstone * self) {
self->priv = TOMBSTONE_GET_PRIVATE (self);
#line 200 "/home/jens/Source/shotwell/src/Tombstone.vala"
self->priv->file = NULL;
-#line 3531 "Tombstone.c"
+#line 3496 "Tombstone.c"
}
-static void tombstone_finalize (GObject* obj) {
+static void tombstone_finalize (GObject * obj) {
Tombstone * self;
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE, Tombstone);
@@ -3542,7 +3507,7 @@ static void tombstone_finalize (GObject* obj) {
_g_object_unref0 (self->priv->file);
#line 174 "/home/jens/Source/shotwell/src/Tombstone.vala"
G_OBJECT_CLASS (tombstone_parent_class)->finalize (obj);
-#line 3545 "Tombstone.c"
+#line 3510 "Tombstone.c"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 17:49:44 +0000