summaryrefslogtreecommitdiff
path: root/src/core/DataCollection.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
commit2492891f112caac6076ce49721d9d5d78a152c3a (patch)
tree36dd11a60bd963e6bd44e2e312b6e4b57d1849ea /src/core/DataCollection.c
parent3c829c50a8f705402bdc759946d49ae7caebd003 (diff)
New upstream version 0.26.4upstream/0.26.4
Diffstat (limited to 'src/core/DataCollection.c')
-rw-r--r--src/core/DataCollection.c1499
1 files changed, 756 insertions, 743 deletions
diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c
index 21c509f..658dfa3 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.34.7, the Vala compiler
+/* DataCollection.c generated by valac 0.36.6, the Vala compiler
* generated from DataCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -91,6 +91,19 @@ typedef struct _DataCollectionMarkerImplPrivate DataCollectionMarkerImplPrivate;
#define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
#define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL)))
typedef struct _ParamSpecDataCollection ParamSpecDataCollection;
+enum {
+ DATA_COLLECTION_ITEMS_ADDED_SIGNAL,
+ DATA_COLLECTION_ITEMS_REMOVED_SIGNAL,
+ DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL,
+ DATA_COLLECTION_ITEMS_ALTERED_SIGNAL,
+ DATA_COLLECTION_ORDERING_CHANGED_SIGNAL,
+ DATA_COLLECTION_PROPERTY_SET_SIGNAL,
+ DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL,
+ DATA_COLLECTION_FROZEN_SIGNAL,
+ DATA_COLLECTION_THAWED_SIGNAL,
+ DATA_COLLECTION_LAST_SIGNAL
+};
+static guint data_collection_signals[DATA_COLLECTION_LAST_SIGNAL] = {0};
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -185,7 +198,7 @@ struct _ParamSpecDataCollection {
static gpointer data_collection_parent_class = NULL;
static gpointer data_collection_marker_impl_parent_class = NULL;
-static MarkerIface* data_collection_marker_impl_marker_parent_iface = NULL;
+static MarkerIface * data_collection_marker_impl_marker_parent_iface = NULL;
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
@@ -331,7 +344,7 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
static void data_collection_real_items_altered (DataCollection* self, GeeMap* items);
static void data_collection_real_ordering_changed (DataCollection* self);
static void data_collection_real_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val);
-static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
static void data_collection_real_property_cleared (DataCollection* self, const gchar* name);
static void data_collection_real_frozen (DataCollection* self);
static void data_collection_real_thawed (DataCollection* self);
@@ -348,14 +361,14 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
static void data_collection_marker_impl_real_mark_all (Marker* base);
static gint data_collection_marker_impl_real_get_count (Marker* base);
static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base);
-static void data_collection_marker_impl_finalize (GObject* obj);
-static void data_collection_finalize (DataCollection* obj);
+static void data_collection_marker_impl_finalize (GObject * obj);
+static void data_collection_finalize (DataCollection * obj);
static GValue* _g_value_dup (GValue* self) {
#line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return g_boxed_copy (G_TYPE_VALUE, self);
-#line 359 "DataCollection.c"
+#line 372 "DataCollection.c"
}
@@ -364,14 +377,14 @@ static void _vala_GValue_free (GValue* self) {
g_value_unset (self);
#line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_free (self);
-#line 368 "DataCollection.c"
+#line 381 "DataCollection.c"
}
DataCollection* data_collection_construct (GType object_type, const gchar* name) {
DataCollection* self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -386,22 +399,22 @@ DataCollection* data_collection_construct (GType object_type, const gchar* name)
self->priv->name = _tmp1_;
#line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return self;
-#line 390 "DataCollection.c"
+#line 403 "DataCollection.c"
}
DataCollection* data_collection_new (const gchar* name) {
#line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return data_collection_construct (TYPE_DATA_COLLECTION, name);
-#line 397 "DataCollection.c"
+#line 410 "DataCollection.c"
}
static gchar* data_collection_real_to_string (DataCollection* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gchar* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ gint _tmp1_;
+ gchar* _tmp2_;
#line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->priv->name;
#line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -412,7 +425,7 @@ static gchar* data_collection_real_to_string (DataCollection* self) {
result = _tmp2_;
#line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 416 "DataCollection.c"
+#line 429 "DataCollection.c"
}
@@ -421,19 +434,19 @@ gchar* data_collection_to_string (DataCollection* self) {
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 167 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->to_string (self);
-#line 425 "DataCollection.c"
+#line 438 "DataCollection.c"
}
static void data_collection_real_notify_items_added (DataCollection* self, GeeIterable* added) {
- GeeIterable* _tmp0_ = NULL;
+ GeeIterable* _tmp0_;
#line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (added));
#line 173 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = added;
#line 173 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "items-added", _tmp0_);
-#line 437 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL], 0, _tmp0_);
+#line 450 "DataCollection.c"
}
@@ -442,19 +455,19 @@ void data_collection_notify_items_added (DataCollection* self, GeeIterable* adde
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 172 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_items_added (self, added);
-#line 446 "DataCollection.c"
+#line 459 "DataCollection.c"
}
static void data_collection_real_notify_items_removed (DataCollection* self, GeeIterable* removed) {
- GeeIterable* _tmp0_ = NULL;
+ GeeIterable* _tmp0_;
#line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (removed));
#line 177 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = removed;
#line 177 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "items-removed", _tmp0_);
-#line 458 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL], 0, _tmp0_);
+#line 471 "DataCollection.c"
}
@@ -463,13 +476,13 @@ void data_collection_notify_items_removed (DataCollection* self, GeeIterable* re
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 176 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_items_removed (self, removed);
-#line 467 "DataCollection.c"
+#line 480 "DataCollection.c"
}
static void data_collection_real_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) {
- GeeIterable* _tmp0_ = NULL;
- GeeIterable* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterable* _tmp1_;
#line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
#line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -479,8 +492,8 @@ static void data_collection_real_notify_contents_altered (DataCollection* self,
#line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp1_ = removed;
#line 182 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "contents-altered", _tmp0_, _tmp1_);
-#line 484 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 497 "DataCollection.c"
}
@@ -489,19 +502,19 @@ void data_collection_notify_contents_altered (DataCollection* self, GeeIterable*
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 180 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_contents_altered (self, added, removed);
-#line 493 "DataCollection.c"
+#line 506 "DataCollection.c"
}
static void data_collection_real_notify_items_altered (DataCollection* self, GeeMap* items) {
- GeeMap* _tmp0_ = NULL;
+ GeeMap* _tmp0_;
#line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_MAP (items));
#line 186 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = items;
#line 186 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "items-altered", _tmp0_);
-#line 505 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL], 0, _tmp0_);
+#line 518 "DataCollection.c"
}
@@ -510,14 +523,14 @@ void data_collection_notify_items_altered (DataCollection* self, GeeMap* items)
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 185 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_items_altered (self, items);
-#line 514 "DataCollection.c"
+#line 527 "DataCollection.c"
}
static void data_collection_real_notify_ordering_changed (DataCollection* self) {
#line 190 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "ordering-changed");
-#line 521 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ORDERING_CHANGED_SIGNAL], 0);
+#line 534 "DataCollection.c"
}
@@ -526,14 +539,14 @@ void data_collection_notify_ordering_changed (DataCollection* self) {
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 189 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_ordering_changed (self);
-#line 530 "DataCollection.c"
+#line 543 "DataCollection.c"
}
static void data_collection_real_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) {
- const gchar* _tmp0_ = NULL;
- GValue* _tmp1_ = NULL;
- GValue _tmp2_ = {0};
+ const gchar* _tmp0_;
+ GValue* _tmp1_;
+ GValue _tmp2_;
#line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (name != NULL);
#line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -545,8 +558,8 @@ static void data_collection_real_notify_property_set (DataCollection* self, cons
#line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = *val;
#line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "property-set", _tmp0_, _tmp1_, &_tmp2_);
-#line 550 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL], 0, _tmp0_, _tmp1_, &_tmp2_);
+#line 563 "DataCollection.c"
}
@@ -555,19 +568,19 @@ void data_collection_notify_property_set (DataCollection* self, const gchar* nam
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 193 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_property_set (self, name, old, val);
-#line 559 "DataCollection.c"
+#line 572 "DataCollection.c"
}
static void data_collection_real_notify_property_cleared (DataCollection* self, const gchar* name) {
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (name != NULL);
#line 198 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = name;
#line 198 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "property-cleared", _tmp0_);
-#line 571 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL], 0, _tmp0_);
+#line 584 "DataCollection.c"
}
@@ -576,14 +589,14 @@ void data_collection_notify_property_cleared (DataCollection* self, const gchar*
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 197 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_property_cleared (self, name);
-#line 580 "DataCollection.c"
+#line 593 "DataCollection.c"
}
GeeCollection* data_collection_get_singleton (DataObject* object) {
GeeCollection* result = NULL;
- DataObject* _tmp0_ = NULL;
- SingletonCollection* _tmp1_ = NULL;
+ DataObject* _tmp0_;
+ SingletonCollection* _tmp1_;
#line 206 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), NULL);
#line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -594,16 +607,16 @@ GeeCollection* data_collection_get_singleton (DataObject* object) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
#line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 598 "DataCollection.c"
+#line 611 "DataCollection.c"
}
GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration* alteration) {
GeeMap* result = NULL;
GeeMap* map = NULL;
- GeeHashMap* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
- Alteration* _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ DataObject* _tmp1_;
+ Alteration* _tmp2_;
#line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), NULL);
#line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -622,7 +635,7 @@ GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration
result = map;
#line 215 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 626 "DataCollection.c"
+#line 639 "DataCollection.c"
}
@@ -634,7 +647,7 @@ static gboolean data_collection_real_valid_type (DataCollection* self, DataObjec
result = TRUE;
#line 219 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 638 "DataCollection.c"
+#line 651 "DataCollection.c"
}
@@ -643,17 +656,17 @@ gboolean data_collection_valid_type (DataCollection* self, DataObject* object) {
g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
#line 218 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->valid_type (self, object);
-#line 647 "DataCollection.c"
+#line 660 "DataCollection.c"
}
Comparator data_collection_get_comparator (DataCollection* self, void** result_target) {
Comparator result = NULL;
- DataSet* _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- Comparator _tmp2_ = NULL;
- Comparator _tmp3_ = NULL;
- void* _tmp3__target = NULL;
+ DataSet* _tmp0_;
+ void* _tmp1_;
+ Comparator _tmp2_;
+ Comparator _tmp3_;
+ void* _tmp3__target;
#line 222 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 223 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -670,17 +683,17 @@ Comparator data_collection_get_comparator (DataCollection* self, void** result_t
result = _tmp3_;
#line 223 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 674 "DataCollection.c"
+#line 687 "DataCollection.c"
}
ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target) {
ComparatorPredicate result = NULL;
- DataSet* _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- ComparatorPredicate _tmp2_ = NULL;
- ComparatorPredicate _tmp3_ = NULL;
- void* _tmp3__target = NULL;
+ DataSet* _tmp0_;
+ void* _tmp1_;
+ ComparatorPredicate _tmp2_;
+ ComparatorPredicate _tmp3_;
+ void* _tmp3__target;
#line 226 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 227 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -697,16 +710,16 @@ ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* se
result = _tmp3_;
#line 227 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 701 "DataCollection.c"
+#line 714 "DataCollection.c"
}
static void data_collection_real_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) {
- DataSet* _tmp0_ = NULL;
- Comparator _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- ComparatorPredicate _tmp2_ = NULL;
- void* _tmp2__target = NULL;
+ DataSet* _tmp0_;
+ Comparator _tmp1_;
+ void* _tmp1__target;
+ ComparatorPredicate _tmp2_;
+ void* _tmp2__target;
#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->priv->dataset;
#line 231 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -721,7 +734,7 @@ static void data_collection_real_set_comparator (DataCollection* self, Comparato
data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
#line 232 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_ordering_changed (self);
-#line 725 "DataCollection.c"
+#line 738 "DataCollection.c"
}
@@ -730,19 +743,19 @@ void data_collection_set_comparator (DataCollection* self, Comparator comparator
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 230 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->set_comparator (self, comparator, comparator_target, predicate, predicate_target);
-#line 734 "DataCollection.c"
+#line 747 "DataCollection.c"
}
static void data_collection_real_reset_comparator (DataCollection* self) {
- DataSet* _tmp0_ = NULL;
+ DataSet* _tmp0_;
#line 237 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->priv->dataset;
#line 237 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_set_reset_comparator (_tmp0_);
#line 238 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_ordering_changed (self);
-#line 746 "DataCollection.c"
+#line 759 "DataCollection.c"
}
@@ -751,14 +764,14 @@ void data_collection_reset_comparator (DataCollection* self) {
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 236 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->reset_comparator (self);
-#line 755 "DataCollection.c"
+#line 768 "DataCollection.c"
}
static GeeCollection* data_collection_real_get_all (DataCollection* self) {
GeeCollection* result = NULL;
- DataSet* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
+ DataSet* _tmp0_;
+ GeeList* _tmp1_;
#line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->priv->dataset;
#line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -767,7 +780,7 @@ static GeeCollection* data_collection_real_get_all (DataCollection* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
#line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 771 "DataCollection.c"
+#line 784 "DataCollection.c"
}
@@ -776,14 +789,14 @@ GeeCollection* data_collection_get_all (DataCollection* self) {
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 241 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->get_all (self);
-#line 780 "DataCollection.c"
+#line 793 "DataCollection.c"
}
DataSet* data_collection_get_dataset_copy (DataCollection* self) {
DataSet* result = NULL;
- DataSet* _tmp0_ = NULL;
- DataSet* _tmp1_ = NULL;
+ DataSet* _tmp0_;
+ DataSet* _tmp1_;
#line 245 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 246 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -794,14 +807,14 @@ DataSet* data_collection_get_dataset_copy (DataCollection* self) {
result = _tmp1_;
#line 246 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 798 "DataCollection.c"
+#line 811 "DataCollection.c"
}
static gint data_collection_real_get_count (DataCollection* self) {
gint result = 0;
- DataSet* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ DataSet* _tmp0_;
+ gint _tmp1_;
#line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->priv->dataset;
#line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -810,7 +823,7 @@ static gint data_collection_real_get_count (DataCollection* self) {
result = _tmp1_;
#line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 814 "DataCollection.c"
+#line 827 "DataCollection.c"
}
@@ -819,15 +832,15 @@ gint data_collection_get_count (DataCollection* self) {
g_return_val_if_fail (IS_DATA_COLLECTION (self), 0);
#line 249 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->get_count (self);
-#line 823 "DataCollection.c"
+#line 836 "DataCollection.c"
}
static DataObject* data_collection_real_get_at (DataCollection* self, gint index) {
DataObject* result = NULL;
- DataSet* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- DataObject* _tmp2_ = NULL;
+ DataSet* _tmp0_;
+ gint _tmp1_;
+ DataObject* _tmp2_;
#line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->priv->dataset;
#line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -838,7 +851,7 @@ static DataObject* data_collection_real_get_at (DataCollection* self, gint index
result = _tmp2_;
#line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 842 "DataCollection.c"
+#line 855 "DataCollection.c"
}
@@ -847,15 +860,15 @@ DataObject* data_collection_get_at (DataCollection* self, gint index) {
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 253 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->get_at (self, index);
-#line 851 "DataCollection.c"
+#line 864 "DataCollection.c"
}
static gint data_collection_real_index_of (DataCollection* self, DataObject* object) {
gint result = 0;
- DataSet* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ DataSet* _tmp0_;
+ DataObject* _tmp1_;
+ gint _tmp2_;
#line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), 0);
#line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -868,7 +881,7 @@ static gint data_collection_real_index_of (DataCollection* self, DataObject* obj
result = _tmp2_;
#line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 872 "DataCollection.c"
+#line 885 "DataCollection.c"
}
@@ -877,14 +890,14 @@ gint data_collection_index_of (DataCollection* self, DataObject* object) {
g_return_val_if_fail (IS_DATA_COLLECTION (self), 0);
#line 257 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->index_of (self, object);
-#line 881 "DataCollection.c"
+#line 894 "DataCollection.c"
}
static gboolean data_collection_real_contains (DataCollection* self, DataObject* object) {
gboolean result = FALSE;
- DataObject* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ DataObject* _tmp0_;
+ gboolean _tmp1_;
#line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -895,7 +908,7 @@ static gboolean data_collection_real_contains (DataCollection* self, DataObject*
result = _tmp1_;
#line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 899 "DataCollection.c"
+#line 912 "DataCollection.c"
}
@@ -904,18 +917,18 @@ gboolean data_collection_contains (DataCollection* self, DataObject* object) {
g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
#line 261 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->contains (self, object);
-#line 908 "DataCollection.c"
+#line 921 "DataCollection.c"
}
static gboolean data_collection_internal_contains (DataCollection* self, DataObject* object) {
gboolean result = FALSE;
- DataSet* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- DataObject* _tmp3_ = NULL;
- DataCollection* _tmp4_ = NULL;
- DataCollection* _tmp5_ = NULL;
+ DataSet* _tmp0_;
+ DataObject* _tmp1_;
+ gboolean _tmp2_;
+ DataObject* _tmp3_;
+ DataCollection* _tmp4_;
+ DataCollection* _tmp5_;
#line 267 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
#line 267 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -932,7 +945,7 @@ static gboolean data_collection_internal_contains (DataCollection* self, DataObj
result = FALSE;
#line 269 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 936 "DataCollection.c"
+#line 949 "DataCollection.c"
}
#line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp3_ = object;
@@ -948,19 +961,19 @@ static gboolean data_collection_internal_contains (DataCollection* self, DataObj
result = TRUE;
#line 273 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 952 "DataCollection.c"
+#line 965 "DataCollection.c"
}
static void data_collection_internal_add (DataCollection* self, DataObject* object) {
- DataObject* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- DataObject* _tmp2_ = NULL;
- gint64 _tmp3_ = 0LL;
+ DataObject* _tmp0_;
+ gboolean _tmp1_;
+ DataObject* _tmp2_;
+ gint64 _tmp3_;
gboolean added = FALSE;
- DataSet* _tmp4_ = NULL;
- DataObject* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ DataSet* _tmp4_;
+ DataObject* _tmp5_;
+ gboolean _tmp6_;
#line 276 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 276 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -989,19 +1002,19 @@ static void data_collection_internal_add (DataCollection* self, DataObject* obje
added = _tmp6_;
#line 282 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_vala_assert (added, "added");
-#line 993 "DataCollection.c"
+#line 1006 "DataCollection.c"
}
static void data_collection_internal_add_many (DataCollection* self, GeeList* objects, ProgressMonitor monitor, void* monitor_target) {
gint count = 0;
- GeeList* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ GeeList* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
gboolean added = FALSE;
- DataSet* _tmp18_ = NULL;
- GeeList* _tmp19_ = NULL;
- gboolean _tmp20_ = FALSE;
+ DataSet* _tmp18_;
+ GeeList* _tmp19_;
+ gboolean _tmp20_;
#line 285 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 285 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1014,40 +1027,40 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
_tmp2_ = _tmp1_;
#line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
count = _tmp2_;
-#line 1018 "DataCollection.c"
+#line 1031 "DataCollection.c"
{
gint ctr = 0;
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
ctr = 0;
-#line 1023 "DataCollection.c"
+#line 1036 "DataCollection.c"
{
gboolean _tmp3_ = FALSE;
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp3_ = TRUE;
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 1030 "DataCollection.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+#line 1043 "DataCollection.c"
+ gint _tmp5_;
+ gint _tmp6_;
DataObject* object = NULL;
- GeeList* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gpointer _tmp9_ = NULL;
- DataObject* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
- DataObject* _tmp12_ = NULL;
- gint64 _tmp13_ = 0LL;
- ProgressMonitor _tmp14_ = NULL;
- void* _tmp14__target = NULL;
+ GeeList* _tmp7_;
+ gint _tmp8_;
+ gpointer _tmp9_;
+ DataObject* _tmp10_;
+ gboolean _tmp11_;
+ DataObject* _tmp12_;
+ gint64 _tmp13_;
+ ProgressMonitor _tmp14_;
+ void* _tmp14__target;
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!_tmp3_) {
-#line 1045 "DataCollection.c"
- gint _tmp4_ = 0;
+#line 1058 "DataCollection.c"
+ gint _tmp4_;
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp4_ = ctr;
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
ctr = _tmp4_ + 1;
-#line 1051 "DataCollection.c"
+#line 1064 "DataCollection.c"
}
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp3_ = FALSE;
@@ -1059,7 +1072,7 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
if (!(_tmp5_ < _tmp6_)) {
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 1063 "DataCollection.c"
+#line 1076 "DataCollection.c"
}
#line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp7_ = objects;
@@ -1089,11 +1102,11 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
_tmp14__target = monitor_target;
#line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp14_ != NULL) {
-#line 1093 "DataCollection.c"
- ProgressMonitor _tmp15_ = NULL;
- void* _tmp15__target = NULL;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
+#line 1106 "DataCollection.c"
+ ProgressMonitor _tmp15_;
+ void* _tmp15__target;
+ gint _tmp16_;
+ gint _tmp17_;
#line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp15_ = monitor;
#line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1104,11 +1117,11 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
_tmp17_ = count;
#line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp15_ ((guint64) _tmp16_, (guint64) _tmp17_, TRUE, _tmp15__target);
-#line 1108 "DataCollection.c"
+#line 1121 "DataCollection.c"
}
#line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 1112 "DataCollection.c"
+#line 1125 "DataCollection.c"
}
}
}
@@ -1122,16 +1135,16 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob
added = _tmp20_;
#line 298 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_vala_assert (added, "added");
-#line 1126 "DataCollection.c"
+#line 1139 "DataCollection.c"
}
static void data_collection_internal_remove (DataCollection* self, DataObject* object) {
gboolean removed = FALSE;
- DataSet* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- DataObject* _tmp3_ = NULL;
+ DataSet* _tmp0_;
+ DataObject* _tmp1_;
+ gboolean _tmp2_;
+ DataObject* _tmp3_;
#line 301 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 301 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1150,21 +1163,21 @@ static void data_collection_internal_remove (DataCollection* self, DataObject* o
_tmp3_ = object;
#line 305 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_object_internal_clear_membership (_tmp3_);
-#line 1154 "DataCollection.c"
+#line 1167 "DataCollection.c"
}
static gboolean data_collection_real_add (DataCollection* self, DataObject* object) {
gboolean result = FALSE;
- DataObject* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- DataObject* _tmp7_ = NULL;
+ DataObject* _tmp0_;
+ gboolean _tmp1_;
+ DataObject* _tmp7_;
GeeCollection* added = NULL;
- DataObject* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeCollection* _tmp10_ = NULL;
- GeeCollection* _tmp11_ = NULL;
- DataObject* _tmp12_ = NULL;
+ DataObject* _tmp8_;
+ GeeCollection* _tmp9_;
+ GeeCollection* _tmp10_;
+ GeeCollection* _tmp11_;
+ DataObject* _tmp12_;
#line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1173,12 +1186,12 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje
_tmp1_ = data_collection_internal_contains (self, _tmp0_);
#line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp1_) {
-#line 1177 "DataCollection.c"
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- DataObject* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+#line 1190 "DataCollection.c"
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ DataObject* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = data_collection_to_string (self);
#line 311 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1199,7 +1212,7 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje
result = FALSE;
#line 313 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 1203 "DataCollection.c"
+#line 1216 "DataCollection.c"
}
#line 316 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp7_ = object;
@@ -1229,7 +1242,7 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje
_g_object_unref0 (added);
#line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 1233 "DataCollection.c"
+#line 1246 "DataCollection.c"
}
@@ -1238,35 +1251,35 @@ gboolean data_collection_add (DataCollection* self, DataObject* object) {
g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
#line 309 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->add (self, object);
-#line 1242 "DataCollection.c"
+#line 1255 "DataCollection.c"
}
static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) {
GeeCollection* result = NULL;
GeeArrayList* added = NULL;
- GeeArrayList* _tmp0_ = NULL;
+ GeeArrayList* _tmp0_;
gint count = 0;
- GeeArrayList* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- GeeArrayList* _tmp20_ = NULL;
- ProgressMonitor _tmp21_ = NULL;
- void* _tmp21__target = NULL;
- GeeArrayList* _tmp22_ = NULL;
- GeeArrayList* _tmp23_ = NULL;
+ GeeArrayList* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ GeeArrayList* _tmp20_;
+ ProgressMonitor _tmp21_;
+ void* _tmp21__target;
+ GeeArrayList* _tmp22_;
+ GeeArrayList* _tmp23_;
#line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL);
#line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
added = _tmp0_;
-#line 1266 "DataCollection.c"
+#line 1279 "DataCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeCollection* _tmp1_;
+ GeeIterator* _tmp2_;
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp1_ = objects;
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1275,16 +1288,16 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
_object_it = _tmp2_;
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 1279 "DataCollection.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 1292 "DataCollection.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataObject* object = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
- DataObject* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- GeeArrayList* _tmp14_ = NULL;
- DataObject* _tmp15_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
+ DataObject* _tmp7_;
+ gboolean _tmp8_;
+ GeeArrayList* _tmp14_;
+ DataObject* _tmp15_;
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp3_ = _object_it;
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1293,7 +1306,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
if (!_tmp4_) {
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 1297 "DataCollection.c"
+#line 1310 "DataCollection.c"
}
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp5_ = _object_it;
@@ -1307,12 +1320,12 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
_tmp8_ = data_collection_internal_contains (self, _tmp7_);
#line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp8_) {
-#line 1311 "DataCollection.c"
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- DataObject* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+#line 1324 "DataCollection.c"
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ DataObject* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
#line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp9_ = data_collection_to_string (self);
#line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1333,7 +1346,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
_g_object_unref0 (object);
#line 337 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
continue;
-#line 1337 "DataCollection.c"
+#line 1350 "DataCollection.c"
}
#line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp14_ = added;
@@ -1343,11 +1356,11 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 1347 "DataCollection.c"
+#line 1360 "DataCollection.c"
}
#line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_it);
-#line 1351 "DataCollection.c"
+#line 1364 "DataCollection.c"
}
#line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp16_ = added;
@@ -1365,7 +1378,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection);
#line 345 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 1369 "DataCollection.c"
+#line 1382 "DataCollection.c"
}
#line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp20_ = added;
@@ -1383,34 +1396,34 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
_tmp23_ = added;
#line 351 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable), NULL);
-#line 1387 "DataCollection.c"
+#line 1400 "DataCollection.c"
{
gint ctr = 0;
#line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
ctr = 0;
-#line 1392 "DataCollection.c"
+#line 1405 "DataCollection.c"
{
gboolean _tmp24_ = FALSE;
#line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp24_ = TRUE;
#line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 1399 "DataCollection.c"
- gint _tmp26_ = 0;
- gint _tmp27_ = 0;
- GeeArrayList* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- gpointer _tmp30_ = NULL;
- DataObject* _tmp31_ = NULL;
+#line 1412 "DataCollection.c"
+ gint _tmp26_;
+ gint _tmp27_;
+ GeeArrayList* _tmp28_;
+ gint _tmp29_;
+ gpointer _tmp30_;
+ DataObject* _tmp31_;
#line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!_tmp24_) {
-#line 1408 "DataCollection.c"
- gint _tmp25_ = 0;
+#line 1421 "DataCollection.c"
+ gint _tmp25_;
#line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp25_ = ctr;
#line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
ctr = _tmp25_ + 1;
-#line 1414 "DataCollection.c"
+#line 1427 "DataCollection.c"
}
#line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp24_ = FALSE;
@@ -1422,7 +1435,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
if (!(_tmp26_ < _tmp27_)) {
#line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 1426 "DataCollection.c"
+#line 1439 "DataCollection.c"
}
#line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp28_ = added;
@@ -1436,7 +1449,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
data_object_notify_membership_changed (_tmp31_, self);
#line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_tmp31_);
-#line 1440 "DataCollection.c"
+#line 1453 "DataCollection.c"
}
}
}
@@ -1444,7 +1457,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection);
#line 357 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 1448 "DataCollection.c"
+#line 1461 "DataCollection.c"
}
@@ -1453,13 +1466,13 @@ GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* ob
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return DATA_COLLECTION_GET_CLASS (self)->add_many (self, objects, monitor, monitor_target);
-#line 1457 "DataCollection.c"
+#line 1470 "DataCollection.c"
}
Marker* data_collection_start_marking (DataCollection* self) {
Marker* result = NULL;
- DataCollectionMarkerImpl* _tmp0_ = NULL;
+ DataCollectionMarkerImpl* _tmp0_;
#line 361 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 362 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1468,15 +1481,15 @@ Marker* data_collection_start_marking (DataCollection* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MARKER, Marker);
#line 362 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 1472 "DataCollection.c"
+#line 1485 "DataCollection.c"
}
Marker* data_collection_mark (DataCollection* self, DataObject* object) {
Marker* result = NULL;
Marker* marker = NULL;
- DataCollectionMarkerImpl* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
+ DataCollectionMarkerImpl* _tmp0_;
+ DataObject* _tmp1_;
#line 366 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 366 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1493,15 +1506,15 @@ Marker* data_collection_mark (DataCollection* self, DataObject* object) {
result = marker;
#line 370 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 1497 "DataCollection.c"
+#line 1510 "DataCollection.c"
}
Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects) {
Marker* result = NULL;
Marker* marker = NULL;
- DataCollectionMarkerImpl* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
+ DataCollectionMarkerImpl* _tmp0_;
+ GeeCollection* _tmp1_;
#line 374 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 374 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1518,31 +1531,31 @@ Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects)
result = marker;
#line 378 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 1522 "DataCollection.c"
+#line 1535 "DataCollection.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 385 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return self ? g_object_ref (self) : NULL;
-#line 1529 "DataCollection.c"
+#line 1542 "DataCollection.c"
}
void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user) {
DataCollectionMarkerImpl* marker = NULL;
- Marker* _tmp0_ = NULL;
- DataCollectionMarkerImpl* _tmp1_ = NULL;
- DataCollectionMarkerImpl* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- DataCollectionMarkerImpl* _tmp4_ = NULL;
+ Marker* _tmp0_;
+ DataCollectionMarkerImpl* _tmp1_;
+ DataCollectionMarkerImpl* _tmp2_;
+ gboolean _tmp3_;
+ DataCollectionMarkerImpl* _tmp4_;
guint64 count = 0ULL;
guint64 total = 0ULL;
- DataCollectionMarkerImpl* _tmp5_ = NULL;
- GeeHashSet* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- gint _tmp8_ = 0;
- DataCollectionMarkerImpl* _tmp31_ = NULL;
+ DataCollectionMarkerImpl* _tmp5_;
+ GeeHashSet* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
+ DataCollectionMarkerImpl* _tmp31_;
#line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1577,12 +1590,12 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
_tmp8_ = _tmp7_;
#line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
total = (guint64) _tmp8_;
-#line 1581 "DataCollection.c"
+#line 1594 "DataCollection.c"
{
GeeIterator* _object_it = NULL;
- DataCollectionMarkerImpl* _tmp9_ = NULL;
- GeeHashSet* _tmp10_ = NULL;
- GeeIterator* _tmp11_ = NULL;
+ DataCollectionMarkerImpl* _tmp9_;
+ GeeHashSet* _tmp10_;
+ GeeIterator* _tmp11_;
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp9_ = marker;
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1593,21 +1606,21 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
_object_it = _tmp11_;
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 1597 "DataCollection.c"
- GeeIterator* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+#line 1610 "DataCollection.c"
+ GeeIterator* _tmp12_;
+ gboolean _tmp13_;
DataObject* object = NULL;
- GeeIterator* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
- DataObject* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
- MarkedAction _tmp21_ = NULL;
- void* _tmp21__target = NULL;
- DataObject* _tmp22_ = NULL;
- GObject* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
- ProgressMonitor _tmp25_ = NULL;
- void* _tmp25__target = NULL;
+ GeeIterator* _tmp14_;
+ gpointer _tmp15_;
+ DataObject* _tmp16_;
+ gboolean _tmp17_;
+ MarkedAction _tmp21_;
+ void* _tmp21__target;
+ DataObject* _tmp22_;
+ GObject* _tmp23_;
+ gboolean _tmp24_;
+ ProgressMonitor _tmp25_;
+ void* _tmp25__target;
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp12_ = _object_it;
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1616,7 +1629,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
if (!_tmp13_) {
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 1620 "DataCollection.c"
+#line 1633 "DataCollection.c"
}
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp14_ = _object_it;
@@ -1630,10 +1643,10 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
_tmp17_ = data_collection_internal_contains (self, _tmp16_);
#line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!_tmp17_) {
-#line 1634 "DataCollection.c"
- DataObject* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+#line 1647 "DataCollection.c"
+ DataObject* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
#line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp18_ = object;
#line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1649,7 +1662,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
_g_object_unref0 (object);
#line 401 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
continue;
-#line 1652 "DataCollection.c"
+#line 1665 "DataCollection.c"
}
#line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp21_ = action;
@@ -1667,7 +1680,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
_g_object_unref0 (object);
#line 405 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 1670 "DataCollection.c"
+#line 1683 "DataCollection.c"
}
#line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp25_ = monitor;
@@ -1675,13 +1688,13 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
_tmp25__target = monitor_target;
#line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp25_ != NULL) {
-#line 1678 "DataCollection.c"
- ProgressMonitor _tmp26_ = NULL;
- void* _tmp26__target = NULL;
- guint64 _tmp27_ = 0ULL;
- guint64 _tmp28_ = 0ULL;
- guint64 _tmp29_ = 0ULL;
- gboolean _tmp30_ = FALSE;
+#line 1691 "DataCollection.c"
+ ProgressMonitor _tmp26_;
+ void* _tmp26__target;
+ guint64 _tmp27_;
+ guint64 _tmp28_;
+ guint64 _tmp29_;
+ gboolean _tmp30_;
#line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp26_ = monitor;
#line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1702,16 +1715,16 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
_g_object_unref0 (object);
#line 409 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 1705 "DataCollection.c"
+#line 1718 "DataCollection.c"
}
}
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 1710 "DataCollection.c"
+#line 1723 "DataCollection.c"
}
#line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_it);
-#line 1714 "DataCollection.c"
+#line 1727 "DataCollection.c"
}
#line 414 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp31_ = marker;
@@ -1719,24 +1732,24 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
data_collection_marker_impl_finished (_tmp31_);
#line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (marker);
-#line 1722 "DataCollection.c"
+#line 1735 "DataCollection.c"
}
static void data_collection_real_remove_marked (DataCollection* self, Marker* m) {
DataCollectionMarkerImpl* marker = NULL;
- Marker* _tmp0_ = NULL;
- DataCollectionMarkerImpl* _tmp1_ = NULL;
- DataCollectionMarkerImpl* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- DataCollectionMarkerImpl* _tmp4_ = NULL;
+ Marker* _tmp0_;
+ DataCollectionMarkerImpl* _tmp1_;
+ DataCollectionMarkerImpl* _tmp2_;
+ gboolean _tmp3_;
+ DataCollectionMarkerImpl* _tmp4_;
GeeArrayList* skipped = NULL;
- GeeArrayList* _tmp22_ = NULL;
- DataCollectionMarkerImpl* _tmp26_ = NULL;
- GeeHashSet* _tmp27_ = NULL;
- gint _tmp28_ = 0;
- gint _tmp29_ = 0;
- DataCollectionMarkerImpl* _tmp42_ = NULL;
+ GeeArrayList* _tmp22_;
+ DataCollectionMarkerImpl* _tmp26_;
+ GeeHashSet* _tmp27_;
+ gint _tmp28_;
+ gint _tmp29_;
+ DataCollectionMarkerImpl* _tmp42_;
#line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_MARKER (m));
#line 420 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1757,12 +1770,12 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
data_collection_marker_impl_freeze (_tmp4_);
#line 428 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
skipped = NULL;
-#line 1760 "DataCollection.c"
+#line 1773 "DataCollection.c"
{
GeeIterator* _object_it = NULL;
- DataCollectionMarkerImpl* _tmp5_ = NULL;
- GeeHashSet* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ DataCollectionMarkerImpl* _tmp5_;
+ GeeHashSet* _tmp6_;
+ GeeIterator* _tmp7_;
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp5_ = marker;
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1773,15 +1786,15 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_object_it = _tmp7_;
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 1776 "DataCollection.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 1789 "DataCollection.c"
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
DataObject* object = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- DataObject* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
- DataObject* _tmp21_ = NULL;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
+ DataObject* _tmp12_;
+ gboolean _tmp13_;
+ DataObject* _tmp21_;
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp8_ = _object_it;
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1790,7 +1803,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
if (!_tmp9_) {
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 1793 "DataCollection.c"
+#line 1806 "DataCollection.c"
}
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp10_ = _object_it;
@@ -1804,13 +1817,13 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_tmp13_ = data_collection_internal_contains (self, _tmp12_);
#line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!_tmp13_) {
-#line 1807 "DataCollection.c"
- DataObject* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- GeeArrayList* _tmp17_ = NULL;
- GeeArrayList* _tmp19_ = NULL;
- DataObject* _tmp20_ = NULL;
+#line 1820 "DataCollection.c"
+ DataObject* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ GeeArrayList* _tmp17_;
+ GeeArrayList* _tmp19_;
+ DataObject* _tmp20_;
#line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp14_ = object;
#line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1826,15 +1839,15 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_tmp17_ = skipped;
#line 434 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp17_ == NULL) {
-#line 1828 "DataCollection.c"
- GeeArrayList* _tmp18_ = NULL;
+#line 1841 "DataCollection.c"
+ GeeArrayList* _tmp18_;
#line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (skipped);
#line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
skipped = _tmp18_;
-#line 1836 "DataCollection.c"
+#line 1849 "DataCollection.c"
}
#line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp19_ = skipped;
@@ -1846,7 +1859,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_g_object_unref0 (object);
#line 439 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
continue;
-#line 1848 "DataCollection.c"
+#line 1861 "DataCollection.c"
}
#line 442 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp21_ = object;
@@ -1854,20 +1867,20 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
data_collection_internal_remove (self, _tmp21_);
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 1856 "DataCollection.c"
+#line 1869 "DataCollection.c"
}
#line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_it);
-#line 1860 "DataCollection.c"
+#line 1873 "DataCollection.c"
}
#line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp22_ = skipped;
#line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp22_ != NULL) {
-#line 1866 "DataCollection.c"
- DataCollectionMarkerImpl* _tmp23_ = NULL;
- GeeHashSet* _tmp24_ = NULL;
- GeeArrayList* _tmp25_ = NULL;
+#line 1879 "DataCollection.c"
+ DataCollectionMarkerImpl* _tmp23_;
+ GeeHashSet* _tmp24_;
+ GeeArrayList* _tmp25_;
#line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp23_ = marker;
#line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1876,7 +1889,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_tmp25_ = skipped;
#line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1878 "DataCollection.c"
+#line 1891 "DataCollection.c"
}
#line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp26_ = marker;
@@ -1888,11 +1901,11 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_tmp29_ = _tmp28_;
#line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp29_ > 0) {
-#line 1890 "DataCollection.c"
- DataCollectionMarkerImpl* _tmp30_ = NULL;
- GeeHashSet* _tmp31_ = NULL;
- DataCollectionMarkerImpl* _tmp32_ = NULL;
- GeeHashSet* _tmp33_ = NULL;
+#line 1903 "DataCollection.c"
+ DataCollectionMarkerImpl* _tmp30_;
+ GeeHashSet* _tmp31_;
+ DataCollectionMarkerImpl* _tmp32_;
+ GeeHashSet* _tmp33_;
#line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp30_ = marker;
#line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1905,12 +1918,12 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_tmp33_ = _tmp32_->marked;
#line 451 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1907 "DataCollection.c"
+#line 1920 "DataCollection.c"
{
GeeIterator* _object_it = NULL;
- DataCollectionMarkerImpl* _tmp34_ = NULL;
- GeeHashSet* _tmp35_ = NULL;
- GeeIterator* _tmp36_ = NULL;
+ DataCollectionMarkerImpl* _tmp34_;
+ GeeHashSet* _tmp35_;
+ GeeIterator* _tmp36_;
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp34_ = marker;
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1921,13 +1934,13 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_object_it = _tmp36_;
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 1923 "DataCollection.c"
- GeeIterator* _tmp37_ = NULL;
- gboolean _tmp38_ = FALSE;
+#line 1936 "DataCollection.c"
+ GeeIterator* _tmp37_;
+ gboolean _tmp38_;
DataObject* object = NULL;
- GeeIterator* _tmp39_ = NULL;
- gpointer _tmp40_ = NULL;
- DataObject* _tmp41_ = NULL;
+ GeeIterator* _tmp39_;
+ gpointer _tmp40_;
+ DataObject* _tmp41_;
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp37_ = _object_it;
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1936,7 +1949,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
if (!_tmp38_) {
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 1938 "DataCollection.c"
+#line 1951 "DataCollection.c"
}
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp39_ = _object_it;
@@ -1950,11 +1963,11 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
data_object_notify_membership_changed (_tmp41_, NULL);
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 1952 "DataCollection.c"
+#line 1965 "DataCollection.c"
}
#line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_it);
-#line 1956 "DataCollection.c"
+#line 1969 "DataCollection.c"
}
}
#line 459 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1965,7 +1978,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
_g_object_unref0 (skipped);
#line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (marker);
-#line 1967 "DataCollection.c"
+#line 1980 "DataCollection.c"
}
@@ -1974,17 +1987,17 @@ void data_collection_remove_marked (DataCollection* self, Marker* m) {
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->remove_marked (self, m);
-#line 1976 "DataCollection.c"
+#line 1989 "DataCollection.c"
}
static void data_collection_real_clear (DataCollection* self) {
- DataSet* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ DataSet* _tmp0_;
+ gint _tmp1_;
GeeArrayList* removed = NULL;
- GeeArrayList* _tmp2_ = NULL;
- GeeArrayList* _tmp12_ = NULL;
- GeeArrayList* _tmp13_ = NULL;
+ GeeArrayList* _tmp2_;
+ GeeArrayList* _tmp12_;
+ GeeArrayList* _tmp13_;
#line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->priv->dataset;
#line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1993,32 +2006,32 @@ static void data_collection_real_clear (DataCollection* self) {
if (_tmp1_ == 0) {
#line 464 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return;
-#line 1995 "DataCollection.c"
+#line 2008 "DataCollection.c"
}
#line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
removed = _tmp2_;
-#line 2001 "DataCollection.c"
+#line 2014 "DataCollection.c"
{
gboolean _tmp3_ = FALSE;
#line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp3_ = TRUE;
#line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 2008 "DataCollection.c"
+#line 2021 "DataCollection.c"
DataObject* object = NULL;
- DataSet* _tmp6_ = NULL;
- DataObject* _tmp7_ = NULL;
- DataObject* _tmp8_ = NULL;
- GeeArrayList* _tmp9_ = NULL;
- DataObject* _tmp10_ = NULL;
- DataObject* _tmp11_ = NULL;
+ DataSet* _tmp6_;
+ DataObject* _tmp7_;
+ DataObject* _tmp8_;
+ GeeArrayList* _tmp9_;
+ DataObject* _tmp10_;
+ DataObject* _tmp11_;
#line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!_tmp3_) {
-#line 2018 "DataCollection.c"
- DataSet* _tmp4_ = NULL;
- gint _tmp5_ = 0;
+#line 2031 "DataCollection.c"
+ DataSet* _tmp4_;
+ gint _tmp5_;
#line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp4_ = self->priv->dataset;
#line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2027,7 +2040,7 @@ static void data_collection_real_clear (DataCollection* self) {
if (!(_tmp5_ > 0)) {
#line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 2029 "DataCollection.c"
+#line 2042 "DataCollection.c"
}
}
#line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2054,7 +2067,7 @@ static void data_collection_real_clear (DataCollection* self) {
data_collection_internal_remove (self, _tmp11_);
#line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 2056 "DataCollection.c"
+#line 2069 "DataCollection.c"
}
}
#line 478 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2065,15 +2078,15 @@ static void data_collection_real_clear (DataCollection* self) {
_tmp13_ = removed;
#line 479 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2067 "DataCollection.c"
+#line 2080 "DataCollection.c"
{
GeeArrayList* _object_list = NULL;
- GeeArrayList* _tmp14_ = NULL;
- GeeArrayList* _tmp15_ = NULL;
+ GeeArrayList* _tmp14_;
+ GeeArrayList* _tmp15_;
gint _object_size = 0;
- GeeArrayList* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
+ GeeArrayList* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
gint _object_index = 0;
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp14_ = removed;
@@ -2093,15 +2106,15 @@ static void data_collection_real_clear (DataCollection* self) {
_object_index = -1;
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 2095 "DataCollection.c"
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
- gint _tmp21_ = 0;
+#line 2108 "DataCollection.c"
+ gint _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
DataObject* object = NULL;
- GeeArrayList* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- gpointer _tmp24_ = NULL;
- DataObject* _tmp25_ = NULL;
+ GeeArrayList* _tmp22_;
+ gint _tmp23_;
+ gpointer _tmp24_;
+ DataObject* _tmp25_;
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp19_ = _object_index;
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2114,7 +2127,7 @@ static void data_collection_real_clear (DataCollection* self) {
if (!(_tmp20_ < _tmp21_)) {
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 2116 "DataCollection.c"
+#line 2129 "DataCollection.c"
}
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp22_ = _object_list;
@@ -2130,15 +2143,15 @@ static void data_collection_real_clear (DataCollection* self) {
data_object_notify_membership_changed (_tmp25_, NULL);
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 2132 "DataCollection.c"
+#line 2145 "DataCollection.c"
}
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_list);
-#line 2136 "DataCollection.c"
+#line 2149 "DataCollection.c"
}
#line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (removed);
-#line 2140 "DataCollection.c"
+#line 2153 "DataCollection.c"
}
@@ -2147,14 +2160,14 @@ void data_collection_clear (DataCollection* self) {
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->clear (self);
-#line 2149 "DataCollection.c"
+#line 2162 "DataCollection.c"
}
static void data_collection_real_close (DataCollection* self) {
#line 493 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_clear (self);
-#line 2156 "DataCollection.c"
+#line 2169 "DataCollection.c"
}
@@ -2163,31 +2176,31 @@ void data_collection_close (DataCollection* self) {
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 492 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->close (self);
-#line 2165 "DataCollection.c"
+#line 2178 "DataCollection.c"
}
static gpointer _alteration_ref0 (gpointer self) {
#line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return self ? alteration_ref (self) : NULL;
-#line 2172 "DataCollection.c"
+#line 2185 "DataCollection.c"
}
void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration) {
- DataObject* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ DataObject* _tmp0_;
+ gboolean _tmp1_;
gboolean resort_occurred = FALSE;
- DataSet* _tmp2_ = NULL;
- DataObject* _tmp3_ = NULL;
- Alteration* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
- gboolean _tmp24_ = FALSE;
- DataObject* _tmp25_ = NULL;
- Alteration* _tmp26_ = NULL;
- GeeMap* _tmp27_ = NULL;
- GeeMap* _tmp28_ = NULL;
+ DataSet* _tmp2_;
+ DataObject* _tmp3_;
+ Alteration* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
+ gboolean _tmp24_;
+ DataObject* _tmp25_;
+ Alteration* _tmp26_;
+ GeeMap* _tmp27_;
+ GeeMap* _tmp28_;
#line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 498 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2214,31 +2227,31 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
_tmp6_ = data_collection_are_notifications_frozen (self);
#line 503 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp6_) {
-#line 2216 "DataCollection.c"
- GeeHashMap* _tmp7_ = NULL;
+#line 2229 "DataCollection.c"
+ GeeHashMap* _tmp7_;
Alteration* current = NULL;
- GeeHashMap* _tmp9_ = NULL;
- DataObject* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- Alteration* _tmp12_ = NULL;
- GeeHashMap* _tmp18_ = NULL;
- DataObject* _tmp19_ = NULL;
- Alteration* _tmp20_ = NULL;
+ GeeHashMap* _tmp9_;
+ DataObject* _tmp10_;
+ gpointer _tmp11_;
+ Alteration* _tmp12_;
+ GeeHashMap* _tmp18_;
+ DataObject* _tmp19_;
+ Alteration* _tmp20_;
gboolean _tmp21_ = FALSE;
- gboolean _tmp22_ = FALSE;
+ gboolean _tmp22_;
#line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp7_ = self->priv->frozen_items_altered;
#line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp7_ == NULL) {
-#line 2232 "DataCollection.c"
- GeeHashMap* _tmp8_ = NULL;
+#line 2245 "DataCollection.c"
+ GeeHashMap* _tmp8_;
#line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (self->priv->frozen_items_altered);
#line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->priv->frozen_items_altered = _tmp8_;
-#line 2240 "DataCollection.c"
+#line 2253 "DataCollection.c"
}
#line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp9_ = self->priv->frozen_items_altered;
@@ -2252,10 +2265,10 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
_tmp12_ = current;
#line 510 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp12_ != NULL) {
-#line 2254 "DataCollection.c"
- Alteration* _tmp13_ = NULL;
- Alteration* _tmp14_ = NULL;
- Alteration* _tmp15_ = NULL;
+#line 2267 "DataCollection.c"
+ Alteration* _tmp13_;
+ Alteration* _tmp14_;
+ Alteration* _tmp15_;
#line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp13_ = current;
#line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2266,10 +2279,10 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
_alteration_unref0 (current);
#line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
current = _tmp15_;
-#line 2268 "DataCollection.c"
+#line 2281 "DataCollection.c"
} else {
- Alteration* _tmp16_ = NULL;
- Alteration* _tmp17_ = NULL;
+ Alteration* _tmp16_;
+ Alteration* _tmp17_;
#line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp16_ = alteration;
#line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2278,7 +2291,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
_alteration_unref0 (current);
#line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
current = _tmp17_;
-#line 2280 "DataCollection.c"
+#line 2293 "DataCollection.c"
}
#line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp18_ = self->priv->frozen_items_altered;
@@ -2294,14 +2307,14 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
if (_tmp22_) {
#line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp21_ = TRUE;
-#line 2296 "DataCollection.c"
+#line 2309 "DataCollection.c"
} else {
- gboolean _tmp23_ = FALSE;
+ gboolean _tmp23_;
#line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp23_ = resort_occurred;
#line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp21_ = _tmp23_;
-#line 2303 "DataCollection.c"
+#line 2316 "DataCollection.c"
}
#line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->priv->fire_ordering_changed = _tmp21_;
@@ -2309,7 +2322,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
_alteration_unref0 (current);
#line 519 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return;
-#line 2311 "DataCollection.c"
+#line 2324 "DataCollection.c"
}
#line 522 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp24_ = resort_occurred;
@@ -2317,7 +2330,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
if (_tmp24_) {
#line 523 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_ordering_changed (self);
-#line 2319 "DataCollection.c"
+#line 2332 "DataCollection.c"
}
#line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp25_ = object;
@@ -2331,15 +2344,15 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
data_collection_notify_items_altered (self, _tmp28_);
#line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_tmp28_);
-#line 2333 "DataCollection.c"
+#line 2346 "DataCollection.c"
}
GValue* data_collection_get_property (DataCollection* self, const gchar* name) {
GValue* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gpointer _tmp2_;
#line 528 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL);
#line 528 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2354,7 +2367,7 @@ GValue* data_collection_get_property (DataCollection* self, const gchar* name) {
result = (GValue*) _tmp2_;
#line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 2356 "DataCollection.c"
+#line 2369 "DataCollection.c"
}
@@ -2363,7 +2376,7 @@ static gboolean _bool_value_equals_value_equal_func (GValue* a, GValue* b, gpoin
result = bool_value_equals (a, b);
#line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 2365 "DataCollection.c"
+#line 2378 "DataCollection.c"
}
@@ -2372,27 +2385,27 @@ static gboolean _int_value_equals_value_equal_func (GValue* a, GValue* b, gpoint
result = int_value_equals (a, b);
#line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 2374 "DataCollection.c"
+#line 2387 "DataCollection.c"
}
void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) {
- ValueEqualFunc _tmp0_ = NULL;
- void* _tmp0__target = NULL;
+ ValueEqualFunc _tmp0_;
+ void* _tmp0__target;
GValue* old = NULL;
- GeeHashMap* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- GValue* _tmp6_ = NULL;
- GeeHashMap* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- GValue _tmp14_ = {0};
- const gchar* _tmp15_ = NULL;
- GValue* _tmp16_ = NULL;
- GValue _tmp17_ = {0};
+ GeeHashMap* _tmp3_;
+ const gchar* _tmp4_;
+ gpointer _tmp5_;
+ GValue* _tmp6_;
+ GeeHashMap* _tmp12_;
+ const gchar* _tmp13_;
+ GValue _tmp14_;
+ const gchar* _tmp15_;
+ GValue* _tmp16_;
+ GValue _tmp17_;
gint count = 0;
- DataSet* _tmp18_ = NULL;
- gint _tmp19_ = 0;
+ DataSet* _tmp18_;
+ gint _tmp19_;
#line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2405,8 +2418,8 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
_tmp0__target = value_equals_target;
#line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp0_ == NULL) {
-#line 2407 "DataCollection.c"
- gboolean _tmp1_ = FALSE;
+#line 2420 "DataCollection.c"
+ gboolean _tmp1_;
#line 534 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp1_ = G_VALUE_HOLDS (val, G_TYPE_BOOLEAN);
#line 534 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2415,9 +2428,9 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
value_equals = _bool_value_equals_value_equal_func;
#line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
value_equals_target = NULL;
-#line 2417 "DataCollection.c"
+#line 2430 "DataCollection.c"
} else {
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
#line 536 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = G_VALUE_HOLDS (val, G_TYPE_INT);
#line 536 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2426,11 +2439,11 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
value_equals = _int_value_equals_value_equal_func;
#line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
value_equals_target = NULL;
-#line 2428 "DataCollection.c"
+#line 2441 "DataCollection.c"
} else {
#line 539 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_error ("DataCollection.vala:539: value_equals must be specified for this type");
-#line 2432 "DataCollection.c"
+#line 2445 "DataCollection.c"
}
}
}
@@ -2446,13 +2459,13 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
_tmp6_ = old;
#line 543 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp6_ != NULL) {
-#line 2448 "DataCollection.c"
- ValueEqualFunc _tmp7_ = NULL;
- void* _tmp7__target = NULL;
- GValue* _tmp8_ = NULL;
- GValue _tmp9_ = {0};
- GValue _tmp10_ = {0};
- gboolean _tmp11_ = FALSE;
+#line 2461 "DataCollection.c"
+ ValueEqualFunc _tmp7_;
+ void* _tmp7__target;
+ GValue* _tmp8_;
+ GValue _tmp9_;
+ GValue _tmp10_;
+ gboolean _tmp11_;
#line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp7_ = value_equals;
#line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2471,7 +2484,7 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
__vala_GValue_free0 (old);
#line 545 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return;
-#line 2473 "DataCollection.c"
+#line 2486 "DataCollection.c"
}
}
#line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2496,37 +2509,37 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
_tmp19_ = data_set_get_count (_tmp18_);
#line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
count = _tmp19_;
-#line 2498 "DataCollection.c"
+#line 2511 "DataCollection.c"
{
gint ctr = 0;
#line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
ctr = 0;
-#line 2503 "DataCollection.c"
+#line 2516 "DataCollection.c"
{
gboolean _tmp20_ = FALSE;
#line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp20_ = TRUE;
#line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 2510 "DataCollection.c"
- gint _tmp22_ = 0;
- gint _tmp23_ = 0;
- DataSet* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- DataObject* _tmp26_ = NULL;
- DataObject* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- GValue* _tmp29_ = NULL;
- GValue _tmp30_ = {0};
+#line 2523 "DataCollection.c"
+ gint _tmp22_;
+ gint _tmp23_;
+ DataSet* _tmp24_;
+ gint _tmp25_;
+ DataObject* _tmp26_;
+ DataObject* _tmp27_;
+ const gchar* _tmp28_;
+ GValue* _tmp29_;
+ GValue _tmp30_;
#line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!_tmp20_) {
-#line 2522 "DataCollection.c"
- gint _tmp21_ = 0;
+#line 2535 "DataCollection.c"
+ gint _tmp21_;
#line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp21_ = ctr;
#line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
ctr = _tmp21_ + 1;
-#line 2528 "DataCollection.c"
+#line 2541 "DataCollection.c"
}
#line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp20_ = FALSE;
@@ -2538,7 +2551,7 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
if (!(_tmp22_ < _tmp23_)) {
#line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 2540 "DataCollection.c"
+#line 2553 "DataCollection.c"
}
#line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp24_ = self->priv->dataset;
@@ -2558,24 +2571,24 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
data_object_notify_collection_property_set (_tmp27_, _tmp28_, _tmp29_, &_tmp30_);
#line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_tmp27_);
-#line 2560 "DataCollection.c"
+#line 2573 "DataCollection.c"
}
}
}
#line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
__vala_GValue_free0 (old);
-#line 2566 "DataCollection.c"
+#line 2579 "DataCollection.c"
}
void data_collection_clear_property (DataCollection* self, const gchar* name) {
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- const gchar* _tmp3_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
+ const gchar* _tmp3_;
gint count = 0;
- DataSet* _tmp4_ = NULL;
- gint _tmp5_ = 0;
+ DataSet* _tmp4_;
+ gint _tmp5_;
#line 558 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 558 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2590,7 +2603,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
if (!_tmp2_) {
#line 560 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return;
-#line 2592 "DataCollection.c"
+#line 2605 "DataCollection.c"
}
#line 563 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp3_ = name;
@@ -2602,35 +2615,35 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
_tmp5_ = data_set_get_count (_tmp4_);
#line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
count = _tmp5_;
-#line 2604 "DataCollection.c"
+#line 2617 "DataCollection.c"
{
gint ctr = 0;
#line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
ctr = 0;
-#line 2609 "DataCollection.c"
+#line 2622 "DataCollection.c"
{
gboolean _tmp6_ = FALSE;
#line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp6_ = TRUE;
#line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 2616 "DataCollection.c"
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
- DataSet* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- DataObject* _tmp12_ = NULL;
- DataObject* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
+#line 2629 "DataCollection.c"
+ gint _tmp8_;
+ gint _tmp9_;
+ DataSet* _tmp10_;
+ gint _tmp11_;
+ DataObject* _tmp12_;
+ DataObject* _tmp13_;
+ const gchar* _tmp14_;
#line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!_tmp6_) {
-#line 2626 "DataCollection.c"
- gint _tmp7_ = 0;
+#line 2639 "DataCollection.c"
+ gint _tmp7_;
#line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp7_ = ctr;
#line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
ctr = _tmp7_ + 1;
-#line 2632 "DataCollection.c"
+#line 2645 "DataCollection.c"
}
#line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp6_ = FALSE;
@@ -2642,7 +2655,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
if (!(_tmp8_ < _tmp9_)) {
#line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 2644 "DataCollection.c"
+#line 2657 "DataCollection.c"
}
#line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp10_ = self->priv->dataset;
@@ -2658,7 +2671,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
data_object_notify_collection_property_cleared (_tmp13_, _tmp14_);
#line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_tmp13_);
-#line 2660 "DataCollection.c"
+#line 2673 "DataCollection.c"
}
}
}
@@ -2666,7 +2679,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) {
void data_collection_freeze_notifications (DataCollection* self) {
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 581 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 582 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2677,15 +2690,15 @@ void data_collection_freeze_notifications (DataCollection* self) {
if (_tmp0_ == 0) {
#line 583 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_frozen (self);
-#line 2679 "DataCollection.c"
+#line 2692 "DataCollection.c"
}
}
void data_collection_thaw_notifications (DataCollection* self) {
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 586 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 587 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2694,7 +2707,7 @@ void data_collection_thaw_notifications (DataCollection* self) {
if (_tmp0_ == 0) {
#line 588 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return;
-#line 2696 "DataCollection.c"
+#line 2709 "DataCollection.c"
}
#line 590 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp1_ = self->priv->notifies_frozen;
@@ -2706,14 +2719,14 @@ void data_collection_thaw_notifications (DataCollection* self) {
if (_tmp2_ == 0) {
#line 591 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_thawed (self);
-#line 2708 "DataCollection.c"
+#line 2721 "DataCollection.c"
}
}
gboolean data_collection_are_notifications_frozen (DataCollection* self) {
gboolean result = FALSE;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 594 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE);
#line 595 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2722,14 +2735,14 @@ gboolean data_collection_are_notifications_frozen (DataCollection* self) {
result = _tmp0_ > 0;
#line 595 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 2724 "DataCollection.c"
+#line 2737 "DataCollection.c"
}
static void data_collection_real_notify_frozen (DataCollection* self) {
#line 601 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "frozen");
-#line 2731 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL], 0);
+#line 2744 "DataCollection.c"
}
@@ -2738,22 +2751,22 @@ void data_collection_notify_frozen (DataCollection* self) {
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 600 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_frozen (self);
-#line 2740 "DataCollection.c"
+#line 2753 "DataCollection.c"
}
static void data_collection_real_notify_thawed (DataCollection* self) {
- GeeHashMap* _tmp0_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GeeHashMap* _tmp0_;
+ gboolean _tmp4_;
#line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->priv->frozen_items_altered;
#line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp0_ != NULL) {
-#line 2751 "DataCollection.c"
+#line 2764 "DataCollection.c"
GeeMap* copy = NULL;
- GeeHashMap* _tmp1_ = NULL;
- GeeMap* _tmp2_ = NULL;
- GeeMap* _tmp3_ = NULL;
+ GeeHashMap* _tmp1_;
+ GeeMap* _tmp2_;
+ GeeMap* _tmp3_;
#line 609 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp1_ = self->priv->frozen_items_altered;
#line 609 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2770,7 +2783,7 @@ static void data_collection_real_notify_thawed (DataCollection* self) {
data_collection_notify_items_altered (self, _tmp3_);
#line 607 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (copy);
-#line 2772 "DataCollection.c"
+#line 2785 "DataCollection.c"
}
#line 615 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp4_ = self->priv->fire_ordering_changed;
@@ -2780,11 +2793,11 @@ static void data_collection_real_notify_thawed (DataCollection* self) {
self->priv->fire_ordering_changed = FALSE;
#line 617 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_notify_ordering_changed (self);
-#line 2782 "DataCollection.c"
+#line 2795 "DataCollection.c"
}
#line 620 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_emit_by_name (self, "thawed");
-#line 2786 "DataCollection.c"
+ g_signal_emit (self, data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL], 0);
+#line 2799 "DataCollection.c"
}
@@ -2793,21 +2806,21 @@ void data_collection_notify_thawed (DataCollection* self) {
g_return_if_fail (IS_DATA_COLLECTION (self));
#line 606 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
DATA_COLLECTION_GET_CLASS (self)->notify_thawed (self);
-#line 2795 "DataCollection.c"
+#line 2808 "DataCollection.c"
}
static void data_collection_real_items_added (DataCollection* self, GeeIterable* added) {
#line 116 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (added));
-#line 2802 "DataCollection.c"
+#line 2815 "DataCollection.c"
}
static void data_collection_real_items_removed (DataCollection* self, GeeIterable* removed) {
#line 120 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 2809 "DataCollection.c"
+#line 2822 "DataCollection.c"
}
@@ -2816,7 +2829,7 @@ static void data_collection_real_contents_altered (DataCollection* self, GeeIter
g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
#line 124 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 2818 "DataCollection.c"
+#line 2831 "DataCollection.c"
}
@@ -2835,26 +2848,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
data1 = closure->data;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data2 = param_values->data[0].v_pointer;
-#line 2837 "DataCollection.c"
+#line 2850 "DataCollection.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data1 = param_values->data[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data2 = closure->data;
-#line 2843 "DataCollection.c"
+#line 2856 "DataCollection.c"
}
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 2849 "DataCollection.c"
+#line 2862 "DataCollection.c"
}
static void data_collection_real_items_altered (DataCollection* self, GeeMap* items) {
#line 130 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_MAP (items));
-#line 2856 "DataCollection.c"
+#line 2869 "DataCollection.c"
}
@@ -2867,13 +2880,13 @@ static void data_collection_real_property_set (DataCollection* self, const gchar
g_return_if_fail (name != NULL);
#line 140 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (val != NULL);
-#line 2869 "DataCollection.c"
+#line 2882 "DataCollection.c"
}
-static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
- typedef void (*GMarshalFunc_VOID__STRING_BOXED_BOXED) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gpointer data2);
- register GMarshalFunc_VOID__STRING_BOXED_BOXED callback;
+static void g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+ typedef void (*GMarshalFunc_VOID__STRING_POINTER_BOXED) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gpointer data2);
+ register GMarshalFunc_VOID__STRING_POINTER_BOXED callback;
register GCClosure * cc;
register gpointer data1;
register gpointer data2;
@@ -2886,26 +2899,26 @@ static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure
data1 = closure->data;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data2 = param_values->data[0].v_pointer;
-#line 2888 "DataCollection.c"
+#line 2901 "DataCollection.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data1 = param_values->data[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data2 = closure->data;
-#line 2894 "DataCollection.c"
+#line 2907 "DataCollection.c"
}
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- callback = (GMarshalFunc_VOID__STRING_BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
+ callback = (GMarshalFunc_VOID__STRING_POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
callback (data1, g_value_get_string (param_values + 1), g_value_get_pointer (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 2900 "DataCollection.c"
+#line 2913 "DataCollection.c"
}
static void data_collection_real_property_cleared (DataCollection* self, const gchar* name) {
#line 144 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (name != NULL);
-#line 2907 "DataCollection.c"
+#line 2920 "DataCollection.c"
}
@@ -2920,22 +2933,22 @@ static void data_collection_real_thawed (DataCollection* self) {
static void _data_collection_marker_impl_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
#line 24 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_marker_impl_on_items_removed ((DataCollectionMarkerImpl*) self, removed);
-#line 2922 "DataCollection.c"
+#line 2935 "DataCollection.c"
}
static gpointer _data_collection_ref0 (gpointer self) {
#line 16 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return self ? data_collection_ref (self) : NULL;
-#line 2929 "DataCollection.c"
+#line 2942 "DataCollection.c"
}
static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, DataCollection* owner) {
DataCollectionMarkerImpl * self = NULL;
- DataCollection* _tmp0_ = NULL;
- DataCollection* _tmp1_ = NULL;
- DataCollection* _tmp2_ = NULL;
+ DataCollection* _tmp0_;
+ DataCollection* _tmp1_;
+ DataCollection* _tmp2_;
#line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_DATA_COLLECTION (owner), NULL);
#line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2954,24 +2967,24 @@ static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType ob
g_signal_connect_object (_tmp2_, "items-removed", (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self, 0);
#line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return self;
-#line 2956 "DataCollection.c"
+#line 2969 "DataCollection.c"
}
static DataCollectionMarkerImpl* data_collection_marker_impl_new (DataCollection* owner) {
#line 15 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return data_collection_marker_impl_construct (DATA_COLLECTION_TYPE_MARKER_IMPL, owner);
-#line 2963 "DataCollection.c"
+#line 2976 "DataCollection.c"
}
static void data_collection_marker_impl_real_mark (Marker* base, DataObject* object) {
DataCollectionMarkerImpl * self;
- DataCollection* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- GeeHashSet* _tmp3_ = NULL;
- DataObject* _tmp4_ = NULL;
+ DataCollection* _tmp0_;
+ DataObject* _tmp1_;
+ gboolean _tmp2_;
+ GeeHashSet* _tmp3_;
+ DataObject* _tmp4_;
#line 27 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 27 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2990,17 +3003,17 @@ static void data_collection_marker_impl_real_mark (Marker* base, DataObject* obj
_tmp4_ = object;
#line 30 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 2992 "DataCollection.c"
+#line 3005 "DataCollection.c"
}
static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* object) {
DataCollectionMarkerImpl * self;
- DataCollection* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- GeeHashSet* _tmp3_ = NULL;
- DataObject* _tmp4_ = NULL;
+ DataCollection* _tmp0_;
+ DataObject* _tmp1_;
+ gboolean _tmp2_;
+ GeeHashSet* _tmp3_;
+ DataObject* _tmp4_;
#line 33 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 33 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3019,22 +3032,22 @@ static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* o
_tmp4_ = object;
#line 36 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 3021 "DataCollection.c"
+#line 3034 "DataCollection.c"
}
static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObject* object) {
DataCollectionMarkerImpl * self;
gboolean result = FALSE;
- DataCollection* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- GeeHashSet* _tmp3_ = NULL;
- DataObject* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- GeeHashSet* _tmp10_ = NULL;
- DataObject* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+ DataCollection* _tmp0_;
+ DataObject* _tmp1_;
+ gboolean _tmp2_;
+ GeeHashSet* _tmp3_;
+ DataObject* _tmp4_;
+ gboolean _tmp5_;
+ GeeHashSet* _tmp10_;
+ DataObject* _tmp11_;
+ gboolean _tmp12_;
#line 39 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 39 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3055,26 +3068,26 @@ static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObjec
_tmp5_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
#line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp5_) {
-#line 3057 "DataCollection.c"
- GeeHashSet* _tmp6_ = NULL;
- DataObject* _tmp7_ = NULL;
+#line 3070 "DataCollection.c"
+ GeeHashSet* _tmp6_;
+ DataObject* _tmp7_;
#line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp6_ = self->marked;
#line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp7_ = object;
#line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
-#line 3066 "DataCollection.c"
+#line 3079 "DataCollection.c"
} else {
- GeeHashSet* _tmp8_ = NULL;
- DataObject* _tmp9_ = NULL;
+ GeeHashSet* _tmp8_;
+ DataObject* _tmp9_;
#line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp8_ = self->marked;
#line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp9_ = object;
#line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 3076 "DataCollection.c"
+#line 3089 "DataCollection.c"
}
#line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp10_ = self->marked;
@@ -3086,7 +3099,7 @@ static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObjec
result = _tmp12_;
#line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 3088 "DataCollection.c"
+#line 3101 "DataCollection.c"
}
@@ -3096,11 +3109,11 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 51 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (list));
-#line 3098 "DataCollection.c"
+#line 3111 "DataCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = list;
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3109,17 +3122,17 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect
_object_it = _tmp1_;
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 3111 "DataCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 3124 "DataCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataObject* object = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataCollection* _tmp6_ = NULL;
- DataObject* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- GeeHashSet* _tmp9_ = NULL;
- DataObject* _tmp10_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataCollection* _tmp6_;
+ DataObject* _tmp7_;
+ gboolean _tmp8_;
+ GeeHashSet* _tmp9_;
+ DataObject* _tmp10_;
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = _object_it;
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3128,7 +3141,7 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect
if (!_tmp3_) {
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 3130 "DataCollection.c"
+#line 3143 "DataCollection.c"
}
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp4_ = _object_it;
@@ -3152,11 +3165,11 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 3154 "DataCollection.c"
+#line 3167 "DataCollection.c"
}
#line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_it);
-#line 3158 "DataCollection.c"
+#line 3171 "DataCollection.c"
}
}
@@ -3167,11 +3180,11 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 59 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (list));
-#line 3169 "DataCollection.c"
+#line 3182 "DataCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = list;
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3180,17 +3193,17 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
_object_it = _tmp1_;
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 3182 "DataCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 3195 "DataCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataObject* object = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataCollection* _tmp6_ = NULL;
- DataObject* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- GeeHashSet* _tmp9_ = NULL;
- DataObject* _tmp10_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataCollection* _tmp6_;
+ DataObject* _tmp7_;
+ gboolean _tmp8_;
+ GeeHashSet* _tmp9_;
+ DataObject* _tmp10_;
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = _object_it;
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3199,7 +3212,7 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
if (!_tmp3_) {
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 3201 "DataCollection.c"
+#line 3214 "DataCollection.c"
}
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp4_ = _object_it;
@@ -3223,11 +3236,11 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle
gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 3225 "DataCollection.c"
+#line 3238 "DataCollection.c"
}
#line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_it);
-#line 3229 "DataCollection.c"
+#line 3242 "DataCollection.c"
}
}
@@ -3236,14 +3249,14 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) {
DataCollectionMarkerImpl * self;
#line 67 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
-#line 3238 "DataCollection.c"
+#line 3251 "DataCollection.c"
{
GeeIterator* _object_it = NULL;
- DataCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeIterator* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
+ DataCollection* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeIterator* _tmp3_;
+ GeeIterator* _tmp4_;
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->owner;
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3260,14 +3273,14 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) {
_object_it = _tmp4_;
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 3262 "DataCollection.c"
- GeeIterator* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 3275 "DataCollection.c"
+ GeeIterator* _tmp5_;
+ gboolean _tmp6_;
DataObject* object = NULL;
- GeeIterator* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
- GeeHashSet* _tmp9_ = NULL;
- DataObject* _tmp10_ = NULL;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ GeeHashSet* _tmp9_;
+ DataObject* _tmp10_;
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp5_ = _object_it;
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3276,7 +3289,7 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) {
if (!_tmp6_) {
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 3278 "DataCollection.c"
+#line 3291 "DataCollection.c"
}
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp7_ = _object_it;
@@ -3292,11 +3305,11 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) {
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 3294 "DataCollection.c"
+#line 3307 "DataCollection.c"
}
#line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_it);
-#line 3298 "DataCollection.c"
+#line 3311 "DataCollection.c"
}
}
@@ -3305,17 +3318,17 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) {
DataCollectionMarkerImpl * self;
gint result = 0;
gint _tmp0_ = 0;
- GeeHashSet* _tmp1_ = NULL;
+ GeeHashSet* _tmp1_;
#line 72 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp1_ = self->marked;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp1_ != NULL) {
-#line 3314 "DataCollection.c"
- GeeHashSet* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+#line 3327 "DataCollection.c"
+ GeeHashSet* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = self->marked;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3324,20 +3337,20 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) {
_tmp4_ = _tmp3_;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = _tmp4_;
-#line 3326 "DataCollection.c"
+#line 3339 "DataCollection.c"
} else {
- gint _tmp5_ = 0;
+ gint _tmp5_;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp5_ = self->freeze_count;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = _tmp5_;
-#line 3333 "DataCollection.c"
+#line 3346 "DataCollection.c"
}
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
result = _tmp0_;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 3339 "DataCollection.c"
+#line 3352 "DataCollection.c"
}
@@ -3345,8 +3358,8 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) {
DataCollectionMarkerImpl * self;
GeeCollection* result = NULL;
GeeArrayList* copy = NULL;
- GeeArrayList* _tmp0_ = NULL;
- GeeHashSet* _tmp1_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeHashSet* _tmp1_;
#line 76 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 77 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3361,7 +3374,7 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) {
result = G_TYPE_CHECK_INSTANCE_CAST (copy, GEE_TYPE_COLLECTION, GeeCollection);
#line 80 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 3363 "DataCollection.c"
+#line 3376 "DataCollection.c"
}
@@ -3370,11 +3383,11 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm
g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self));
#line 83 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 3372 "DataCollection.c"
+#line 3385 "DataCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = removed;
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3383,14 +3396,14 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm
_object_it = _tmp1_;
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
while (TRUE) {
-#line 3385 "DataCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 3398 "DataCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataObject* object = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- GeeHashSet* _tmp6_ = NULL;
- DataObject* _tmp7_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ GeeHashSet* _tmp6_;
+ DataObject* _tmp7_;
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = _object_it;
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3399,7 +3412,7 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm
if (!_tmp3_) {
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
break;
-#line 3401 "DataCollection.c"
+#line 3414 "DataCollection.c"
}
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp4_ = _object_it;
@@ -3415,18 +3428,18 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm
gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (object);
-#line 3417 "DataCollection.c"
+#line 3430 "DataCollection.c"
}
#line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (_object_it);
-#line 3421 "DataCollection.c"
+#line 3434 "DataCollection.c"
}
}
static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) {
- DataCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ DataCollection* _tmp0_;
+ guint _tmp1_;
#line 91 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self));
#line 92 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3435,22 +3448,22 @@ static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self)
g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
#line 92 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _data_collection_marker_impl_on_items_removed_data_collection_items_removed, self);
-#line 3437 "DataCollection.c"
+#line 3450 "DataCollection.c"
}
static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self) {
- GeeHashSet* _tmp0_ = NULL;
+ GeeHashSet* _tmp0_;
#line 95 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self));
#line 96 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = self->marked;
#line 96 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp0_ != NULL) {
-#line 3449 "DataCollection.c"
- GeeHashSet* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+#line 3462 "DataCollection.c"
+ GeeHashSet* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
#line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp1_ = self->marked;
#line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3459,21 +3472,21 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self
_tmp3_ = _tmp2_;
#line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->freeze_count = _tmp3_;
-#line 3461 "DataCollection.c"
+#line 3474 "DataCollection.c"
}
#line 99 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (self->marked);
#line 99 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->marked = NULL;
-#line 3467 "DataCollection.c"
+#line 3480 "DataCollection.c"
}
static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, DataCollection* collection) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- DataCollection* _tmp1_ = NULL;
- DataCollection* _tmp2_ = NULL;
+ DataCollection* _tmp1_;
+ DataCollection* _tmp2_;
#line 102 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self), FALSE);
#line 102 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3484,23 +3497,23 @@ static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl*
_tmp2_ = self->owner;
#line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (_tmp1_ == _tmp2_) {
-#line 3486 "DataCollection.c"
- GeeHashSet* _tmp3_ = NULL;
+#line 3499 "DataCollection.c"
+ GeeHashSet* _tmp3_;
#line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp3_ = self->marked;
#line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = _tmp3_ != NULL;
-#line 3492 "DataCollection.c"
+#line 3505 "DataCollection.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = FALSE;
-#line 3496 "DataCollection.c"
+#line 3509 "DataCollection.c"
}
#line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
result = _tmp0_;
#line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return result;
-#line 3502 "DataCollection.c"
+#line 3515 "DataCollection.c"
}
@@ -3509,7 +3522,7 @@ static void data_collection_marker_impl_class_init (DataCollectionMarkerImplClas
data_collection_marker_impl_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
G_OBJECT_CLASS (klass)->finalize = data_collection_marker_impl_finalize;
-#line 3511 "DataCollection.c"
+#line 3524 "DataCollection.c"
}
@@ -3517,41 +3530,41 @@ static void data_collection_marker_impl_marker_interface_init (MarkerIface * ifa
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_marker_impl_marker_parent_iface = g_type_interface_peek_parent (iface);
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- iface->mark = (void (*)(Marker*, DataObject*)) data_collection_marker_impl_real_mark;
+ iface->mark = (void (*) (Marker *, DataObject*)) data_collection_marker_impl_real_mark;
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- iface->unmark = (void (*)(Marker*, DataObject*)) data_collection_marker_impl_real_unmark;
+ iface->unmark = (void (*) (Marker *, DataObject*)) data_collection_marker_impl_real_unmark;
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- iface->toggle = (gboolean (*)(Marker*, DataObject*)) data_collection_marker_impl_real_toggle;
+ iface->toggle = (gboolean (*) (Marker *, DataObject*)) data_collection_marker_impl_real_toggle;
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- iface->mark_many = (void (*)(Marker*, GeeCollection*)) data_collection_marker_impl_real_mark_many;
+ iface->mark_many = (void (*) (Marker *, GeeCollection*)) data_collection_marker_impl_real_mark_many;
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- iface->unmark_many = (void (*)(Marker*, GeeCollection*)) data_collection_marker_impl_real_unmark_many;
+ iface->unmark_many = (void (*) (Marker *, GeeCollection*)) data_collection_marker_impl_real_unmark_many;
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- iface->mark_all = (void (*)(Marker*)) data_collection_marker_impl_real_mark_all;
+ iface->mark_all = (void (*) (Marker *)) data_collection_marker_impl_real_mark_all;
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- iface->get_count = (gint (*)(Marker*)) data_collection_marker_impl_real_get_count;
+ iface->get_count = (gint (*) (Marker *)) data_collection_marker_impl_real_get_count;
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- iface->get_all = (GeeCollection* (*)(Marker*)) data_collection_marker_impl_real_get_all;
-#line 3534 "DataCollection.c"
+ iface->get_all = (GeeCollection* (*) (Marker *)) data_collection_marker_impl_real_get_all;
+#line 3547 "DataCollection.c"
}
static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) {
- GeeHashSet* _tmp0_ = NULL;
+ GeeHashSet* _tmp0_;
#line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->marked = _tmp0_;
#line 13 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->freeze_count = 0;
-#line 3546 "DataCollection.c"
+#line 3559 "DataCollection.c"
}
-static void data_collection_marker_impl_finalize (GObject* obj) {
+static void data_collection_marker_impl_finalize (GObject * obj) {
DataCollectionMarkerImpl * self;
- DataCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ DataCollection* _tmp0_;
+ guint _tmp1_;
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 24 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3566,7 +3579,7 @@ static void data_collection_marker_impl_finalize (GObject* obj) {
_g_object_unref0 (self->marked);
#line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
G_OBJECT_CLASS (data_collection_marker_impl_parent_class)->finalize (obj);
-#line 3568 "DataCollection.c"
+#line 3581 "DataCollection.c"
}
@@ -3587,7 +3600,7 @@ static GType data_collection_marker_impl_get_type (void) {
static void value_data_collection_init (GValue* value) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
value->data[0].v_pointer = NULL;
-#line 3589 "DataCollection.c"
+#line 3602 "DataCollection.c"
}
@@ -3596,7 +3609,7 @@ static void value_data_collection_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_unref (value->data[0].v_pointer);
-#line 3598 "DataCollection.c"
+#line 3611 "DataCollection.c"
}
}
@@ -3606,11 +3619,11 @@ static void value_data_collection_copy_value (const GValue* src_value, GValue* d
if (src_value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
dest_value->data[0].v_pointer = data_collection_ref (src_value->data[0].v_pointer);
-#line 3608 "DataCollection.c"
+#line 3621 "DataCollection.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3612 "DataCollection.c"
+#line 3625 "DataCollection.c"
}
}
@@ -3618,66 +3631,66 @@ static void value_data_collection_copy_value (const GValue* src_value, GValue* d
static gpointer value_data_collection_peek_pointer (const GValue* value) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return value->data[0].v_pointer;
-#line 3620 "DataCollection.c"
+#line 3633 "DataCollection.c"
}
static gchar* value_data_collection_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (collect_values[0].v_pointer) {
-#line 3627 "DataCollection.c"
- DataCollection* object;
+#line 3640 "DataCollection.c"
+ DataCollection * object;
object = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (object->parent_instance.g_class == NULL) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3634 "DataCollection.c"
+#line 3647 "DataCollection.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.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 3638 "DataCollection.c"
+#line 3651 "DataCollection.c"
}
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
value->data[0].v_pointer = data_collection_ref (object);
-#line 3642 "DataCollection.c"
+#line 3655 "DataCollection.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
value->data[0].v_pointer = NULL;
-#line 3646 "DataCollection.c"
+#line 3659 "DataCollection.c"
}
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return NULL;
-#line 3650 "DataCollection.c"
+#line 3663 "DataCollection.c"
}
static gchar* value_data_collection_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- DataCollection** object_p;
+ DataCollection ** object_p;
object_p = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!object_p) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3661 "DataCollection.c"
+#line 3674 "DataCollection.c"
}
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (!value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
*object_p = NULL;
-#line 3667 "DataCollection.c"
+#line 3680 "DataCollection.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
*object_p = value->data[0].v_pointer;
-#line 3671 "DataCollection.c"
+#line 3684 "DataCollection.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
*object_p = data_collection_ref (value->data[0].v_pointer);
-#line 3675 "DataCollection.c"
+#line 3688 "DataCollection.c"
}
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return NULL;
-#line 3679 "DataCollection.c"
+#line 3692 "DataCollection.c"
}
@@ -3691,7 +3704,7 @@ GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, co
G_PARAM_SPEC (spec)->value_type = object_type;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return G_PARAM_SPEC (spec);
-#line 3693 "DataCollection.c"
+#line 3706 "DataCollection.c"
}
@@ -3700,12 +3713,12 @@ gpointer value_get_data_collection (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION), NULL);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return value->data[0].v_pointer;
-#line 3702 "DataCollection.c"
+#line 3715 "DataCollection.c"
}
void value_set_data_collection (GValue* value, gpointer v_object) {
- DataCollection* old;
+ DataCollection * old;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION));
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3720,23 +3733,23 @@ void value_set_data_collection (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_ref (value->data[0].v_pointer);
-#line 3722 "DataCollection.c"
+#line 3735 "DataCollection.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
value->data[0].v_pointer = NULL;
-#line 3726 "DataCollection.c"
+#line 3739 "DataCollection.c"
}
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (old) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_unref (old);
-#line 3732 "DataCollection.c"
+#line 3745 "DataCollection.c"
}
}
void value_take_data_collection (GValue* value, gpointer v_object) {
- DataCollection* old;
+ DataCollection * old;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_COLLECTION));
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3749,17 +3762,17 @@ void value_take_data_collection (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
value->data[0].v_pointer = v_object;
-#line 3751 "DataCollection.c"
+#line 3764 "DataCollection.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
value->data[0].v_pointer = NULL;
-#line 3755 "DataCollection.c"
+#line 3768 "DataCollection.c"
}
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (old) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
data_collection_unref (old);
-#line 3761 "DataCollection.c"
+#line 3774 "DataCollection.c"
}
}
@@ -3772,51 +3785,51 @@ static void data_collection_class_init (DataCollectionClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_type_class_add_private (klass, sizeof (DataCollectionPrivate));
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->to_string = (gchar* (*)(DataCollection*)) data_collection_real_to_string;
+ ((DataCollectionClass *) klass)->to_string = (gchar* (*) (DataCollection *)) data_collection_real_to_string;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_added;
+ ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) data_collection_real_notify_items_added;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_removed;
+ ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) data_collection_real_notify_items_removed;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) data_collection_real_notify_contents_altered;
+ ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) data_collection_real_notify_contents_altered;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) data_collection_real_notify_items_altered;
+ ((DataCollectionClass *) klass)->notify_items_altered = (void (*) (DataCollection *, GeeMap*)) data_collection_real_notify_items_altered;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_ordering_changed = (void (*)(DataCollection*)) data_collection_real_notify_ordering_changed;
+ ((DataCollectionClass *) klass)->notify_ordering_changed = (void (*) (DataCollection *)) data_collection_real_notify_ordering_changed;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_property_set = (void (*)(DataCollection*, const gchar*, GValue*, GValue*)) data_collection_real_notify_property_set;
+ ((DataCollectionClass *) klass)->notify_property_set = (void (*) (DataCollection *, const gchar*, GValue*, GValue*)) data_collection_real_notify_property_set;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_property_cleared = (void (*)(DataCollection*, const gchar*)) data_collection_real_notify_property_cleared;
+ ((DataCollectionClass *) klass)->notify_property_cleared = (void (*) (DataCollection *, const gchar*)) data_collection_real_notify_property_cleared;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_valid_type;
+ ((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_valid_type;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) data_collection_real_set_comparator;
+ ((DataCollectionClass *) klass)->set_comparator = (void (*) (DataCollection *, Comparator, void*, ComparatorPredicate, void*)) data_collection_real_set_comparator;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) data_collection_real_reset_comparator;
+ ((DataCollectionClass *) klass)->reset_comparator = (void (*) (DataCollection *)) data_collection_real_reset_comparator;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) data_collection_real_get_all;
+ ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*) (DataCollection *)) data_collection_real_get_all;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) data_collection_real_get_count;
+ ((DataCollectionClass *) klass)->get_count = (gint (*) (DataCollection *)) data_collection_real_get_count;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) data_collection_real_get_at;
+ ((DataCollectionClass *) klass)->get_at = (DataObject* (*) (DataCollection *, gint)) data_collection_real_get_at;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) data_collection_real_index_of;
+ ((DataCollectionClass *) klass)->index_of = (gint (*) (DataCollection *, DataObject*)) data_collection_real_index_of;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_contains;
+ ((DataCollectionClass *) klass)->contains = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_contains;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_add;
+ ((DataCollectionClass *) klass)->add = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_add;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) data_collection_real_add_many;
+ ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*) (DataCollection *, GeeCollection*, ProgressMonitor, void*)) data_collection_real_add_many;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->remove_marked = (void (*)(DataCollection*, Marker*)) data_collection_real_remove_marked;
+ ((DataCollectionClass *) klass)->remove_marked = (void (*) (DataCollection *, Marker*)) data_collection_real_remove_marked;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) data_collection_real_clear;
+ ((DataCollectionClass *) klass)->clear = (void (*) (DataCollection *)) data_collection_real_clear;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) data_collection_real_close;
+ ((DataCollectionClass *) klass)->close = (void (*) (DataCollection *)) data_collection_real_close;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_frozen = (void (*)(DataCollection*)) data_collection_real_notify_frozen;
+ ((DataCollectionClass *) klass)->notify_frozen = (void (*) (DataCollection *)) data_collection_real_notify_frozen;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) data_collection_real_notify_thawed;
+ ((DataCollectionClass *) klass)->notify_thawed = (void (*) (DataCollection *)) data_collection_real_notify_thawed;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
((DataCollectionClass *) klass)->items_added = data_collection_real_items_added;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3836,30 +3849,30 @@ static void data_collection_class_init (DataCollectionClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
((DataCollectionClass *) klass)->thawed = data_collection_real_thawed;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("items_added", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+ data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL] = g_signal_new ("items-added", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("items_removed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+ data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL] = g_signal_new ("items-removed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("contents_altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_ITERABLE, GEE_TYPE_ITERABLE);
+ data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("contents-altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_ITERABLE, GEE_TYPE_ITERABLE);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("items_altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_MAP);
+ data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL] = g_signal_new ("items-altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_MAP);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("ordering_changed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, ordering_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ data_collection_signals[DATA_COLLECTION_ORDERING_CHANGED_SIGNAL] = g_signal_new ("ordering-changed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, ordering_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("property_set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_VALUE);
+ data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL] = g_signal_new ("property-set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_VALUE);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("property_cleared", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_cleared), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+ data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL] = g_signal_new ("property-cleared", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_cleared), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("frozen", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, frozen), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL] = g_signal_new ("frozen", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, frozen), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("thawed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, thawed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3855 "DataCollection.c"
+ data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL] = g_signal_new ("thawed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, thawed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3868 "DataCollection.c"
}
static void data_collection_instance_init (DataCollection * self) {
- DataSet* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
+ DataSet* _tmp0_;
+ GeeHashMap* _tmp1_;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->priv = DATA_COLLECTION_GET_PRIVATE (self);
#line 108 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3880,11 +3893,11 @@ static void data_collection_instance_init (DataCollection * self) {
self->priv->fire_ordering_changed = FALSE;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->ref_count = 1;
-#line 3882 "DataCollection.c"
+#line 3895 "DataCollection.c"
}
-static void data_collection_finalize (DataCollection* obj) {
+static void data_collection_finalize (DataCollection * obj) {
DataCollection * self;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_COLLECTION, DataCollection);
@@ -3898,7 +3911,7 @@ static void data_collection_finalize (DataCollection* obj) {
_g_object_unref0 (self->priv->properties);
#line 112 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (self->priv->frozen_items_altered);
-#line 3900 "DataCollection.c"
+#line 3913 "DataCollection.c"
}
@@ -3917,18 +3930,18 @@ GType data_collection_get_type (void) {
gpointer data_collection_ref (gpointer instance) {
- DataCollection* self;
+ DataCollection * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_atomic_int_inc (&self->ref_count);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
return instance;
-#line 3925 "DataCollection.c"
+#line 3938 "DataCollection.c"
}
void data_collection_unref (gpointer instance) {
- DataCollection* self;
+ DataCollection * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3936,7 +3949,7 @@ void data_collection_unref (gpointer instance) {
DATA_COLLECTION_GET_CLASS (self)->finalize (self);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3938 "DataCollection.c"
+#line 3951 "DataCollection.c"
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 10:29:15 +0000