summaryrefslogtreecommitdiff
path: root/src/core/SourceHoldingTank.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-07-09 12:10:38 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-07-09 12:10:38 +0200
commit709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch)
tree496b2f3899e1d5728ee9ae76095cc5056c317447 /src/core/SourceHoldingTank.c
parentf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff)
parent5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff)
Merge branch 'release/0.28.3-1'0.28.3-1
Diffstat (limited to 'src/core/SourceHoldingTank.c')
-rw-r--r--src/core/SourceHoldingTank.c1324
1 files changed, 663 insertions, 661 deletions
diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index 7d92788..809af37 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.36.6, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.40.4, the Vala compiler
* generated from SourceHoldingTank.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -23,6 +23,7 @@
/* moved into more than one holding tank, or which should have preference. The CheckToRemove*/
/* predicate is offered only to know when to release them.*/
+
#include <glib.h>
#include <glib-object.h>
#include <gee.h>
@@ -136,9 +137,9 @@ typedef struct _SingletonCollectionClass SingletonCollectionClass;
typedef struct _ParamSpecSourceHoldingTank ParamSpecSourceHoldingTank;
enum {
SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL,
- SOURCE_HOLDING_TANK_LAST_SIGNAL
+ SOURCE_HOLDING_TANK_NUM_SIGNALS
};
-static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_LAST_SIGNAL] = {0};
+static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_NUM_SIGNALS] = {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; }
@@ -190,316 +191,392 @@ static gpointer source_holding_tank_parent_class = NULL;
gpointer source_holding_tank_ref (gpointer instance);
void source_holding_tank_unref (gpointer instance);
-GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_holding_tank (GValue* value, gpointer v_object);
-void value_take_source_holding_tank (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_holding_tank (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_source_holding_tank (GValue* value,
+ gpointer v_object);
+void value_take_source_holding_tank (GValue* value,
+ gpointer v_object);
gpointer value_get_source_holding_tank (const GValue* value);
GType source_holding_tank_get_type (void) G_GNUC_CONST;
GType data_object_get_type (void) G_GNUC_CONST;
GType data_source_get_type (void) G_GNUC_CONST;
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType source_collection_get_type (void) G_GNUC_CONST;
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
gpointer data_set_ref (gpointer instance);
void data_set_unref (gpointer instance);
-GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_set (GValue* value, gpointer v_object);
-void value_take_data_set (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_set (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_set (GValue* value,
+ gpointer v_object);
+void value_take_data_set (GValue* value,
+ gpointer v_object);
gpointer value_get_data_set (const GValue* value);
GType data_set_get_type (void) G_GNUC_CONST;
#define SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTankPrivate))
-enum {
- SOURCE_HOLDING_TANK_DUMMY_PROPERTY
-};
-static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source);
-static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self);
+static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self,
+ DataSource* source);
+static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender,
+ DataSource* source,
+ gpointer self);
static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self);
-static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self);
+static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender,
+ gpointer self);
DataSet* data_set_new (void);
DataSet* data_set_construct (GType object_type);
-SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target);
-SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target);
-void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
-static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
-void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank);
+SourceHoldingTank* source_holding_tank_new (SourceCollection* sources,
+ SourceHoldingTankCheckToKeep check_to_keep,
+ void* check_to_keep_target);
+SourceHoldingTank* source_holding_tank_construct (GType object_type,
+ SourceCollection* sources,
+ SourceHoldingTankCheckToKeep check_to_keep,
+ void* check_to_keep_target);
+void source_holding_tank_notify_contents_altered (SourceHoldingTank* self,
+ GeeCollection* added,
+ GeeCollection* removed);
+static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self,
+ GeeCollection* added,
+ GeeCollection* removed);
+void data_source_notify_held_in_tank (DataSource* self,
+ SourceHoldingTank* holding_tank);
gint source_holding_tank_get_count (SourceHoldingTank* self);
gint data_set_get_count (DataSet* self);
GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self);
GeeList* data_set_get_all (DataSet* self);
-gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source);
-gboolean data_set_contains (DataSet* self, DataObject* object);
-void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many);
-void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal);
-gboolean data_set_add_many (DataSet* self, GeeCollection* objects);
-void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink);
+gboolean source_holding_tank_contains (SourceHoldingTank* self,
+ DataSource* source);
+gboolean data_set_contains (DataSet* self,
+ DataObject* object);
+void source_holding_tank_add_many (SourceHoldingTank* self,
+ GeeCollection* many);
+void data_object_internal_set_ordinal (DataObject* self,
+ gint64 ordinal);
+gboolean data_set_add_many (DataSet* self,
+ GeeCollection* objects);
+void source_holding_tank_unlink_and_hold (SourceHoldingTank* self,
+ GeeCollection* unlink);
GType marker_get_type (void) G_GNUC_CONST;
-GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target);
-Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects);
+GeeCollection* source_collection_unlink_marked (SourceCollection* self,
+ Marker* marker,
+ ProgressMonitor monitor,
+ void* monitor_target);
+Marker* data_collection_mark_many (DataCollection* self,
+ GeeCollection* objects);
gpointer source_backlink_ref (gpointer instance);
void source_backlink_unref (gpointer instance);
-GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_backlink (GValue* value, gpointer v_object);
-void value_take_source_backlink (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_backlink (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_source_backlink (GValue* value,
+ gpointer v_object);
+void value_take_source_backlink (GValue* value,
+ gpointer v_object);
gpointer value_get_source_backlink (const GValue* value);
GType source_backlink_get_type (void) G_GNUC_CONST;
-gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink);
-DataObject* data_set_get_at (DataSet* self, gint index);
-gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink);
-void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink);
-gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink);
-void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed);
-gboolean data_set_remove_many (DataSet* self, GeeCollection* objects);
-gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing);
-gboolean data_set_remove (DataSet* self, DataObject* object);
-SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object);
-SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object);
+gboolean source_holding_tank_has_backlink (SourceHoldingTank* self,
+ SourceBacklink* backlink);
+DataObject* data_set_get_at (DataSet* self,
+ gint index);
+gboolean data_source_has_backlink (DataSource* self,
+ SourceBacklink* backlink);
+void source_holding_tank_remove_backlink (SourceHoldingTank* self,
+ SourceBacklink* backlink);
+gboolean data_source_remove_backlink (DataSource* self,
+ SourceBacklink* backlink);
+void source_holding_tank_destroy_orphans (SourceHoldingTank* self,
+ GeeList* destroy,
+ gboolean delete_backing,
+ ProgressMonitor monitor,
+ void* monitor_target,
+ GeeList* not_removed);
+gboolean data_set_remove_many (DataSet* self,
+ GeeCollection* objects);
+gboolean data_source_destroy_orphan (DataSource* self,
+ gboolean delete_backing);
+gboolean data_set_remove (DataSet* self,
+ DataObject* object);
+SingletonCollection* singleton_collection_new (GType g_type,
+ GBoxedCopyFunc g_dup_func,
+ GDestroyNotify g_destroy_func,
+ gconstpointer object);
+SingletonCollection* singleton_collection_construct (GType object_type,
+ GType g_type,
+ GBoxedCopyFunc g_dup_func,
+ GDestroyNotify g_destroy_func,
+ gconstpointer object);
GType singleton_collection_get_type (void) G_GNUC_CONST;
-void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration);
+void source_holding_tank_internal_notify_altered (SourceHoldingTank* self,
+ DataSource* source,
+ Alteration* alteration);
gchar* data_object_to_string (DataObject* self);
gchar* source_holding_tank_to_string (SourceHoldingTank* self);
gboolean data_collection_are_notifications_frozen (DataCollection* self);
-void source_collection_relink (SourceCollection* self, DataSource* source);
-void source_collection_relink_many (SourceCollection* self, GeeCollection* relink);
-static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+void source_collection_relink (SourceCollection* self,
+ DataSource* source);
+void source_collection_relink_many (SourceCollection* self,
+ GeeCollection* relink);
+static void source_holding_tank_real_contents_altered (SourceHoldingTank* self,
+ GeeCollection* added,
+ GeeCollection* removed);
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void source_holding_tank_finalize (SourceHoldingTank * obj);
-static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
+static void
+_source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender,
+ DataSource* source,
+ gpointer self)
+{
#line 48 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
source_holding_tank_on_source_destroyed ((SourceHoldingTank*) self, source);
-#line 284 "SourceHoldingTank.c"
+#line 371 "SourceHoldingTank.c"
}
-static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self) {
+static void
+_source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender,
+ gpointer self)
+{
#line 49 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
source_holding_tank_on_source_collection_thawed ((SourceHoldingTank*) self);
-#line 291 "SourceHoldingTank.c"
+#line 381 "SourceHoldingTank.c"
}
-static gpointer _data_collection_ref0 (gpointer self) {
+static gpointer
+_data_collection_ref0 (gpointer self)
+{
#line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return self ? data_collection_ref (self) : NULL;
-#line 298 "SourceHoldingTank.c"
+#line 390 "SourceHoldingTank.c"
}
-SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) {
+SourceHoldingTank*
+source_holding_tank_construct (GType object_type,
+ SourceCollection* sources,
+ SourceHoldingTankCheckToKeep check_to_keep,
+ void* check_to_keep_target)
+{
SourceHoldingTank* self = NULL;
SourceCollection* _tmp0_;
SourceCollection* _tmp1_;
- SourceHoldingTankCheckToKeep _tmp2_;
- void* _tmp2__target;
- SourceCollection* _tmp3_;
- SourceCollection* _tmp4_;
+ SourceCollection* _tmp2_;
#line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
#line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
self = (SourceHoldingTank*) g_type_create_instance (object_type);
#line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp0_ = sources;
-#line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = _data_collection_ref0 (_tmp0_);
+ _tmp0_ = _data_collection_ref0 (sources);
#line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_data_collection_unref0 (self->priv->sources);
#line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- self->priv->sources = _tmp1_;
-#line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = check_to_keep;
-#line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2__target = check_to_keep_target;
+ self->priv->sources = _tmp0_;
#line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- self->priv->check_to_keep = _tmp2_;
+ self->priv->check_to_keep = check_to_keep;
#line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- self->priv->check_to_keep_target = _tmp2__target;
+ self->priv->check_to_keep_target = check_to_keep_target;
#line 43 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = self->priv->sources;
+ _tmp1_ = self->priv->sources;
#line 43 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- g_signal_connect (_tmp3_, "item-destroyed", (GCallback) _source_holding_tank_on_source_destroyed_source_collection_item_destroyed, self);
+ g_signal_connect (_tmp1_, "item-destroyed", (GCallback) _source_holding_tank_on_source_destroyed_source_collection_item_destroyed, self);
#line 44 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = self->priv->sources;
+ _tmp2_ = self->priv->sources;
#line 44 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _source_holding_tank_on_source_collection_thawed_data_collection_thawed, self);
+ g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _source_holding_tank_on_source_collection_thawed_data_collection_thawed, self);
#line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return self;
-#line 340 "SourceHoldingTank.c"
+#line 428 "SourceHoldingTank.c"
}
-SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) {
+SourceHoldingTank*
+source_holding_tank_new (SourceCollection* sources,
+ SourceHoldingTankCheckToKeep check_to_keep,
+ void* check_to_keep_target)
+{
#line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return source_holding_tank_construct (TYPE_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target);
-#line 347 "SourceHoldingTank.c"
+#line 439 "SourceHoldingTank.c"
}
-static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) {
- GeeCollection* _tmp0_;
- GeeCollection* _tmp8_;
- GeeCollection* _tmp16_;
- GeeCollection* _tmp17_;
+static void
+source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self,
+ GeeCollection* added,
+ GeeCollection* removed)
+{
#line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
#line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
#line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp0_ = added;
-#line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp0_ != NULL) {
-#line 364 "SourceHoldingTank.c"
+ if (added != NULL) {
+#line 454 "SourceHoldingTank.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp1_;
- GeeIterator* _tmp2_;
-#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = added;
+ GeeIterator* _tmp0_;
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable));
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _source_it = _tmp2_;
+ _source_it = _tmp0_;
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
while (TRUE) {
-#line 377 "SourceHoldingTank.c"
- GeeIterator* _tmp3_;
- gboolean _tmp4_;
+#line 464 "SourceHoldingTank.c"
+ GeeIterator* _tmp1_;
DataSource* source = NULL;
- GeeIterator* _tmp5_;
- gpointer _tmp6_;
- DataSource* _tmp7_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
+ DataSource* _tmp4_;
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = _source_it;
+ _tmp1_ = _source_it;
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = gee_iterator_next (_tmp3_);
-#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp4_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
break;
-#line 392 "SourceHoldingTank.c"
+#line 476 "SourceHoldingTank.c"
}
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = _source_it;
+ _tmp2_ = _source_it;
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = gee_iterator_get (_tmp5_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source = (DataSource*) _tmp6_;
+ source = (DataSource*) _tmp3_;
#line 56 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp7_ = source;
+ _tmp4_ = source;
#line 56 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- data_source_notify_held_in_tank (_tmp7_, self);
+ data_source_notify_held_in_tank (_tmp4_, self);
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (source);
-#line 406 "SourceHoldingTank.c"
+#line 490 "SourceHoldingTank.c"
}
#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (_source_it);
-#line 410 "SourceHoldingTank.c"
+#line 494 "SourceHoldingTank.c"
}
}
#line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = removed;
-#line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp8_ != NULL) {
-#line 417 "SourceHoldingTank.c"
+ if (removed != NULL) {
+#line 499 "SourceHoldingTank.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp9_;
- GeeIterator* _tmp10_;
-#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp9_ = removed;
+ GeeIterator* _tmp5_;
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable));
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _source_it = _tmp10_;
+ _source_it = _tmp5_;
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
while (TRUE) {
-#line 430 "SourceHoldingTank.c"
- GeeIterator* _tmp11_;
- gboolean _tmp12_;
+#line 509 "SourceHoldingTank.c"
+ GeeIterator* _tmp6_;
DataSource* source = NULL;
- GeeIterator* _tmp13_;
- gpointer _tmp14_;
- DataSource* _tmp15_;
-#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp11_ = _source_it;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ DataSource* _tmp9_;
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp12_ = gee_iterator_next (_tmp11_);
+ _tmp6_ = _source_it;
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp12_) {
+ if (!gee_iterator_next (_tmp6_)) {
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
break;
-#line 445 "SourceHoldingTank.c"
+#line 521 "SourceHoldingTank.c"
}
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp13_ = _source_it;
+ _tmp7_ = _source_it;
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp14_ = gee_iterator_get (_tmp13_);
+ _tmp8_ = gee_iterator_get (_tmp7_);
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source = (DataSource*) _tmp14_;
+ source = (DataSource*) _tmp8_;
#line 61 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp15_ = source;
+ _tmp9_ = source;
#line 61 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- data_source_notify_held_in_tank (_tmp15_, NULL);
+ data_source_notify_held_in_tank (_tmp9_, NULL);
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (source);
-#line 459 "SourceHoldingTank.c"
+#line 535 "SourceHoldingTank.c"
}
#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (_source_it);
-#line 463 "SourceHoldingTank.c"
+#line 539 "SourceHoldingTank.c"
}
}
#line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp16_ = added;
-#line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp17_ = removed;
-#line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, _tmp16_, _tmp17_);
-#line 472 "SourceHoldingTank.c"
+ g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, added, removed);
+#line 544 "SourceHoldingTank.c"
}
-void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) {
+void
+source_holding_tank_notify_contents_altered (SourceHoldingTank* self,
+ GeeCollection* added,
+ GeeCollection* removed)
+{
#line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
#line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
SOURCE_HOLDING_TANK_GET_CLASS (self)->notify_contents_altered (self, added, removed);
-#line 481 "SourceHoldingTank.c"
+#line 557 "SourceHoldingTank.c"
}
-gint source_holding_tank_get_count (SourceHoldingTank* self) {
+gint
+source_holding_tank_get_count (SourceHoldingTank* self)
+{
gint result = 0;
DataSet* _tmp0_;
- gint _tmp1_;
#line 67 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), 0);
#line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp0_ = self->priv->tank;
#line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = data_set_get_count (_tmp0_);
-#line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- result = _tmp1_;
+ result = data_set_get_count (_tmp0_);
#line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return result;
-#line 499 "SourceHoldingTank.c"
+#line 574 "SourceHoldingTank.c"
}
-GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) {
+GeeCollection*
+source_holding_tank_get_all (SourceHoldingTank* self)
+{
GeeCollection* result = NULL;
DataSet* _tmp0_;
GeeList* _tmp1_;
@@ -513,16 +590,17 @@ GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
#line 72 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return result;
-#line 517 "SourceHoldingTank.c"
+#line 594 "SourceHoldingTank.c"
}
-gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source) {
+gboolean
+source_holding_tank_contains (SourceHoldingTank* self,
+ DataSource* source)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
DataSet* _tmp1_;
- DataSource* _tmp2_;
- gboolean _tmp3_;
#line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE);
#line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -530,279 +608,232 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour
#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp1_ = self->priv->tank;
#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = source;
-#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = data_set_contains (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp3_) {
+ if (data_set_contains (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) {
#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp0_ = TRUE;
-#line 541 "SourceHoldingTank.c"
+#line 615 "SourceHoldingTank.c"
} else {
- GeeHashSet* _tmp4_;
- DataSource* _tmp5_;
- gboolean _tmp6_;
-#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = self->priv->unlinking;
-#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = source;
+ GeeHashSet* _tmp2_;
#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
+ _tmp2_ = self->priv->unlinking;
#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp0_ = _tmp6_;
-#line 554 "SourceHoldingTank.c"
+ _tmp0_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source);
+#line 622 "SourceHoldingTank.c"
}
#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
result = _tmp0_;
#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return result;
-#line 560 "SourceHoldingTank.c"
+#line 628 "SourceHoldingTank.c"
}
-void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) {
- GeeCollection* _tmp0_;
+void
+source_holding_tank_add_many (SourceHoldingTank* self,
+ GeeCollection* many)
+{
+ gint _tmp0_;
gint _tmp1_;
- gint _tmp2_;
gboolean added = FALSE;
- DataSet* _tmp11_;
- GeeCollection* _tmp12_;
- gboolean _tmp13_;
- gboolean _tmp14_;
- GeeCollection* _tmp15_;
+ DataSet* _tmp8_;
+ gboolean _tmp9_;
#line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
#line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (GEE_IS_COLLECTION (many));
#line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp0_ = many;
-#line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = gee_collection_get_size (_tmp0_);
+ _tmp0_ = gee_collection_get_size (many);
#line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp2_ == 0) {
+ if (_tmp1_ == 0) {
#line 82 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return;
-#line 588 "SourceHoldingTank.c"
+#line 653 "SourceHoldingTank.c"
}
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp3_;
- GeeIterator* _tmp4_;
-#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = many;
+ GeeIterator* _tmp2_;
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (many, GEE_TYPE_ITERABLE, GeeIterable));
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _source_it = _tmp4_;
+ _source_it = _tmp2_;
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
while (TRUE) {
-#line 602 "SourceHoldingTank.c"
- GeeIterator* _tmp5_;
- gboolean _tmp6_;
+#line 664 "SourceHoldingTank.c"
+ GeeIterator* _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp7_;
- gpointer _tmp8_;
- DataSource* _tmp9_;
- gint64 _tmp10_;
-#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = _source_it;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataSource* _tmp6_;
+ gint64 _tmp7_;
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = gee_iterator_next (_tmp5_);
+ _tmp3_ = _source_it;
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp6_) {
+ if (!gee_iterator_next (_tmp3_)) {
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
break;
-#line 618 "SourceHoldingTank.c"
+#line 677 "SourceHoldingTank.c"
}
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp7_ = _source_it;
+ _tmp4_ = _source_it;
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = gee_iterator_get (_tmp7_);
+ _tmp5_ = gee_iterator_get (_tmp4_);
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source = (DataSource*) _tmp8_;
+ source = (DataSource*) _tmp5_;
#line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp9_ = source;
+ _tmp6_ = source;
#line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp10_ = self->priv->ordinal;
+ _tmp7_ = self->priv->ordinal;
#line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- self->priv->ordinal = _tmp10_ + 1;
+ self->priv->ordinal = _tmp7_ + 1;
#line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject), _tmp10_);
+ data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject), _tmp7_);
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (source);
-#line 636 "SourceHoldingTank.c"
+#line 695 "SourceHoldingTank.c"
}
#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (_source_it);
-#line 640 "SourceHoldingTank.c"
+#line 699 "SourceHoldingTank.c"
}
#line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp11_ = self->priv->tank;
-#line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp12_ = many;
-#line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp13_ = data_set_add_many (_tmp11_, _tmp12_);
+ _tmp8_ = self->priv->tank;
#line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- added = _tmp13_;
+ added = data_set_add_many (_tmp8_, many);
#line 88 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp14_ = added;
+ _tmp9_ = added;
#line 88 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _vala_assert (_tmp14_, "added");
+ _vala_assert (_tmp9_, "added");
#line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp15_ = many;
-#line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source_holding_tank_notify_contents_altered (self, _tmp15_, NULL);
-#line 658 "SourceHoldingTank.c"
+ source_holding_tank_notify_contents_altered (self, many, NULL);
+#line 711 "SourceHoldingTank.c"
}
-void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink) {
- GeeCollection* _tmp0_;
+void
+source_holding_tank_unlink_and_hold (SourceHoldingTank* self,
+ GeeCollection* unlink)
+{
+ gint _tmp0_;
gint _tmp1_;
- gint _tmp2_;
- GeeHashSet* _tmp3_;
- GeeCollection* _tmp4_;
- SourceCollection* _tmp5_;
- SourceCollection* _tmp6_;
+ GeeHashSet* _tmp2_;
+ SourceCollection* _tmp3_;
+ SourceCollection* _tmp4_;
+ Marker* _tmp5_;
+ Marker* _tmp6_;
GeeCollection* _tmp7_;
- Marker* _tmp8_;
- Marker* _tmp9_;
- GeeCollection* _tmp10_;
- GeeCollection* _tmp11_;
+ GeeCollection* _tmp8_;
gboolean added = FALSE;
- DataSet* _tmp20_;
- GeeCollection* _tmp21_;
- gboolean _tmp22_;
- gboolean _tmp23_;
- GeeHashSet* _tmp24_;
- GeeCollection* _tmp25_;
- GeeCollection* _tmp26_;
+ DataSet* _tmp15_;
+ gboolean _tmp16_;
+ GeeHashSet* _tmp17_;
#line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
#line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (GEE_IS_COLLECTION (unlink));
#line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp0_ = unlink;
-#line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = gee_collection_get_size (_tmp0_);
+ _tmp0_ = gee_collection_get_size (unlink);
#line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp2_ == 0) {
+ if (_tmp1_ == 0) {
#line 97 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return;
-#line 697 "SourceHoldingTank.c"
+#line 744 "SourceHoldingTank.c"
}
#line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = self->priv->unlinking;
-#line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = unlink;
+ _tmp2_ = self->priv->unlinking;
#line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_);
+ gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), unlink);
#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = self->priv->sources;
-#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = self->priv->sources;
+ _tmp3_ = self->priv->sources;
#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp7_ = unlink;
+ _tmp4_ = self->priv->sources;
#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_);
+ _tmp5_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), unlink);
#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp10_ = source_collection_unlink_marked (_tmp5_, _tmp9_, NULL, NULL);
+ _tmp7_ = source_collection_unlink_marked (_tmp3_, _tmp6_, NULL, NULL);
#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = _tmp7_;
#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp8_);
#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _g_object_unref0 (_tmp9_);
-#line 723 "SourceHoldingTank.c"
+ _g_object_unref0 (_tmp6_);
+#line 766 "SourceHoldingTank.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp12_;
- GeeIterator* _tmp13_;
-#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp12_ = unlink;
+ GeeIterator* _tmp9_;
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (unlink, GEE_TYPE_ITERABLE, GeeIterable));
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _source_it = _tmp13_;
+ _source_it = _tmp9_;
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
while (TRUE) {
-#line 736 "SourceHoldingTank.c"
- GeeIterator* _tmp14_;
- gboolean _tmp15_;
+#line 776 "SourceHoldingTank.c"
+ GeeIterator* _tmp10_;
DataSource* source = NULL;
- GeeIterator* _tmp16_;
- gpointer _tmp17_;
- DataSource* _tmp18_;
- gint64 _tmp19_;
-#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp14_ = _source_it;
+ GeeIterator* _tmp11_;
+ gpointer _tmp12_;
+ DataSource* _tmp13_;
+ gint64 _tmp14_;
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp15_ = gee_iterator_next (_tmp14_);
+ _tmp10_ = _source_it;
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp15_) {
+ if (!gee_iterator_next (_tmp10_)) {
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
break;
-#line 752 "SourceHoldingTank.c"
+#line 789 "SourceHoldingTank.c"
}
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp16_ = _source_it;
+ _tmp11_ = _source_it;
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp17_ = gee_iterator_get (_tmp16_);
+ _tmp12_ = gee_iterator_get (_tmp11_);
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source = (DataSource*) _tmp17_;
+ source = (DataSource*) _tmp12_;
#line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp18_ = source;
+ _tmp13_ = source;
#line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp19_ = self->priv->ordinal;
+ _tmp14_ = self->priv->ordinal;
#line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- self->priv->ordinal = _tmp19_ + 1;
+ self->priv->ordinal = _tmp14_ + 1;
#line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject), _tmp19_);
+ data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject), _tmp14_);
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (source);
-#line 770 "SourceHoldingTank.c"
+#line 807 "SourceHoldingTank.c"
}
#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (_source_it);
-#line 774 "SourceHoldingTank.c"
+#line 811 "SourceHoldingTank.c"
}
#line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp20_ = self->priv->tank;
-#line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp21_ = unlink;
-#line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp22_ = data_set_add_many (_tmp20_, _tmp21_);
+ _tmp15_ = self->priv->tank;
#line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- added = _tmp22_;
+ added = data_set_add_many (_tmp15_, unlink);
#line 108 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp23_ = added;
+ _tmp16_ = added;
#line 108 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _vala_assert (_tmp23_, "added");
-#line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp24_ = self->priv->unlinking;
+ _vala_assert (_tmp16_, "added");
#line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp25_ = unlink;
+ _tmp17_ = self->priv->unlinking;
#line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
+ gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), unlink);
#line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp26_ = unlink;
-#line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source_holding_tank_notify_contents_altered (self, _tmp26_, NULL);
-#line 798 "SourceHoldingTank.c"
+ source_holding_tank_notify_contents_altered (self, unlink, NULL);
+#line 827 "SourceHoldingTank.c"
}
-gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink) {
+gboolean
+source_holding_tank_has_backlink (SourceHoldingTank* self,
+ SourceBacklink* backlink)
+{
gboolean result = FALSE;
gint count = 0;
DataSet* _tmp0_;
- gint _tmp1_;
#line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE);
#line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -810,76 +841,68 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
#line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp0_ = self->priv->tank;
#line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = data_set_get_count (_tmp0_);
-#line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- count = _tmp1_;
-#line 817 "SourceHoldingTank.c"
+ count = data_set_get_count (_tmp0_);
+#line 846 "SourceHoldingTank.c"
{
gint ctr = 0;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
ctr = 0;
-#line 822 "SourceHoldingTank.c"
+#line 851 "SourceHoldingTank.c"
{
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp1_ = FALSE;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = TRUE;
+ _tmp1_ = TRUE;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
while (TRUE) {
-#line 829 "SourceHoldingTank.c"
+#line 858 "SourceHoldingTank.c"
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
- DataSet* _tmp6_;
- gint _tmp7_;
- DataObject* _tmp8_;
- DataSource* _tmp9_;
- SourceBacklink* _tmp10_;
- gboolean _tmp11_;
- gboolean _tmp12_;
+ DataSet* _tmp5_;
+ gint _tmp6_;
+ DataObject* _tmp7_;
+ DataSource* _tmp8_;
+ gboolean _tmp9_;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp2_) {
-#line 841 "SourceHoldingTank.c"
- gint _tmp3_;
+ if (!_tmp1_) {
+#line 868 "SourceHoldingTank.c"
+ gint _tmp2_;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = ctr;
+ _tmp2_ = ctr;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- ctr = _tmp3_ + 1;
-#line 847 "SourceHoldingTank.c"
+ ctr = _tmp2_ + 1;
+#line 874 "SourceHoldingTank.c"
}
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = FALSE;
+ _tmp1_ = FALSE;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = ctr;
+ _tmp3_ = ctr;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = count;
+ _tmp4_ = count;
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!(_tmp4_ < _tmp5_)) {
+ if (!(_tmp3_ < _tmp4_)) {
#line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
break;
-#line 859 "SourceHoldingTank.c"
+#line 886 "SourceHoldingTank.c"
}
#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = self->priv->tank;
-#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp7_ = ctr;
+ _tmp5_ = self->priv->tank;
#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = data_set_get_at (_tmp6_, _tmp7_);
+ _tmp6_ = ctr;
#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource);
+ _tmp7_ = data_set_get_at (_tmp5_, _tmp6_);
#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp10_ = backlink;
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource);
#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp11_ = data_source_has_backlink (_tmp9_, _tmp10_);
+ _tmp9_ = data_source_has_backlink (_tmp8_, backlink);
#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp12_ = _tmp11_;
+ _g_object_unref0 (_tmp8_);
#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _g_object_unref0 (_tmp9_);
-#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp12_) {
+ if (_tmp9_) {
#line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
result = TRUE;
#line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return result;
-#line 883 "SourceHoldingTank.c"
+#line 906 "SourceHoldingTank.c"
}
}
}
@@ -888,14 +911,16 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
result = FALSE;
#line 123 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return result;
-#line 892 "SourceHoldingTank.c"
+#line 915 "SourceHoldingTank.c"
}
-void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink) {
+void
+source_holding_tank_remove_backlink (SourceHoldingTank* self,
+ SourceBacklink* backlink)
+{
gint count = 0;
DataSet* _tmp0_;
- gint _tmp1_;
#line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
#line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -903,86 +928,83 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
#line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp0_ = self->priv->tank;
#line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = data_set_get_count (_tmp0_);
-#line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- count = _tmp1_;
-#line 910 "SourceHoldingTank.c"
+ count = data_set_get_count (_tmp0_);
+#line 933 "SourceHoldingTank.c"
{
gint ctr = 0;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
ctr = 0;
-#line 915 "SourceHoldingTank.c"
+#line 938 "SourceHoldingTank.c"
{
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp1_ = FALSE;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = TRUE;
+ _tmp1_ = TRUE;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
while (TRUE) {
-#line 922 "SourceHoldingTank.c"
+#line 945 "SourceHoldingTank.c"
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
- DataSet* _tmp6_;
- gint _tmp7_;
- DataObject* _tmp8_;
- DataSource* _tmp9_;
- SourceBacklink* _tmp10_;
+ DataSet* _tmp5_;
+ gint _tmp6_;
+ DataObject* _tmp7_;
+ DataSource* _tmp8_;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp2_) {
-#line 932 "SourceHoldingTank.c"
- gint _tmp3_;
+ if (!_tmp1_) {
+#line 954 "SourceHoldingTank.c"
+ gint _tmp2_;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = ctr;
+ _tmp2_ = ctr;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- ctr = _tmp3_ + 1;
-#line 938 "SourceHoldingTank.c"
+ ctr = _tmp2_ + 1;
+#line 960 "SourceHoldingTank.c"
}
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = FALSE;
+ _tmp1_ = FALSE;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = ctr;
+ _tmp3_ = ctr;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = count;
+ _tmp4_ = count;
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!(_tmp4_ < _tmp5_)) {
+ if (!(_tmp3_ < _tmp4_)) {
#line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
break;
-#line 950 "SourceHoldingTank.c"
+#line 972 "SourceHoldingTank.c"
}
#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = self->priv->tank;
+ _tmp5_ = self->priv->tank;
#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp7_ = ctr;
+ _tmp6_ = ctr;
#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = data_set_get_at (_tmp6_, _tmp7_);
+ _tmp7_ = data_set_get_at (_tmp5_, _tmp6_);
#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource);
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource);
#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp10_ = backlink;
+ data_source_remove_backlink (_tmp8_, backlink);
#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- data_source_remove_backlink (_tmp9_, _tmp10_);
-#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _g_object_unref0 (_tmp9_);
-#line 966 "SourceHoldingTank.c"
+ _g_object_unref0 (_tmp8_);
+#line 986 "SourceHoldingTank.c"
}
}
}
}
-void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) {
- GeeList* _tmp0_;
+void
+source_holding_tank_destroy_orphans (SourceHoldingTank* self,
+ GeeList* destroy,
+ gboolean delete_backing,
+ ProgressMonitor monitor,
+ void* monitor_target,
+ GeeList* not_removed)
+{
+ gint _tmp0_;
gint _tmp1_;
- gint _tmp2_;
gboolean removed = FALSE;
- DataSet* _tmp3_;
- GeeList* _tmp4_;
- gboolean _tmp5_;
- gboolean _tmp6_;
- GeeList* _tmp7_;
+ DataSet* _tmp2_;
+ gboolean _tmp3_;
gint count = 0;
- GeeList* _tmp8_;
- gint _tmp9_;
- gint _tmp10_;
+ gint _tmp4_;
+ gint _tmp5_;
#line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
#line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -990,165 +1012,125 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
#line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail ((not_removed == NULL) || GEE_IS_LIST (not_removed));
#line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp0_ = destroy;
-#line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp0_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection));
#line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp2_ == 0) {
+ if (_tmp1_ == 0) {
#line 135 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return;
-#line 1003 "SourceHoldingTank.c"
+#line 1023 "SourceHoldingTank.c"
}
#line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = self->priv->tank;
+ _tmp2_ = self->priv->tank;
#line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = destroy;
-#line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = data_set_remove_many (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- removed = _tmp5_;
+ removed = data_set_remove_many (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection));
#line 138 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = removed;
+ _tmp3_ = removed;
#line 138 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _vala_assert (_tmp6_, "removed");
-#line 140 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp7_ = destroy;
+ _vala_assert (_tmp3_, "removed");
#line 140 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+ source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection));
#line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = destroy;
+ _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection));
#line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp5_ = _tmp4_;
#line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp10_ = _tmp9_;
-#line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- count = _tmp10_;
-#line 1029 "SourceHoldingTank.c"
+ count = _tmp5_;
+#line 1041 "SourceHoldingTank.c"
{
gint ctr = 0;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
ctr = 0;
-#line 1034 "SourceHoldingTank.c"
+#line 1046 "SourceHoldingTank.c"
{
- gboolean _tmp11_ = FALSE;
+ gboolean _tmp6_ = FALSE;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp11_ = TRUE;
+ _tmp6_ = TRUE;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
while (TRUE) {
-#line 1041 "SourceHoldingTank.c"
- gint _tmp13_;
- gint _tmp14_;
+#line 1053 "SourceHoldingTank.c"
+ gint _tmp8_;
+ gint _tmp9_;
DataSource* source = NULL;
- GeeList* _tmp15_;
- gint _tmp16_;
- gpointer _tmp17_;
- DataSource* _tmp18_;
- gboolean _tmp19_;
- gboolean _tmp20_;
- ProgressMonitor _tmp24_;
- void* _tmp24__target;
+ gint _tmp10_;
+ gpointer _tmp11_;
+ DataSource* _tmp12_;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp11_) {
-#line 1055 "SourceHoldingTank.c"
- gint _tmp12_;
+ if (!_tmp6_) {
+#line 1062 "SourceHoldingTank.c"
+ gint _tmp7_;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp12_ = ctr;
+ _tmp7_ = ctr;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- ctr = _tmp12_ + 1;
-#line 1061 "SourceHoldingTank.c"
+ ctr = _tmp7_ + 1;
+#line 1068 "SourceHoldingTank.c"
}
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp11_ = FALSE;
+ _tmp6_ = FALSE;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp13_ = ctr;
+ _tmp8_ = ctr;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp14_ = count;
+ _tmp9_ = count;
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!(_tmp13_ < _tmp14_)) {
+ if (!(_tmp8_ < _tmp9_)) {
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
break;
-#line 1073 "SourceHoldingTank.c"
+#line 1080 "SourceHoldingTank.c"
}
#line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp15_ = destroy;
-#line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp16_ = ctr;
+ _tmp10_ = ctr;
#line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp17_ = gee_list_get (_tmp15_, _tmp16_);
+ _tmp11_ = gee_list_get (destroy, _tmp10_);
#line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source = (DataSource*) _tmp17_;
-#line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp18_ = source;
-#line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp19_ = delete_backing;
+ source = (DataSource*) _tmp11_;
#line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp20_ = data_source_destroy_orphan (_tmp18_, _tmp19_);
+ _tmp12_ = source;
#line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp20_) {
-#line 1091 "SourceHoldingTank.c"
- GeeList* _tmp21_;
+ if (!data_source_destroy_orphan (_tmp12_, delete_backing)) {
#line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp21_ = not_removed;
-#line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (NULL != _tmp21_) {
-#line 1097 "SourceHoldingTank.c"
- GeeList* _tmp22_;
- DataSource* _tmp23_;
-#line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp22_ = not_removed;
+ if (NULL != not_removed) {
+#line 1094 "SourceHoldingTank.c"
+ DataSource* _tmp13_;
#line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp23_ = source;
+ _tmp13_ = source;
#line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 1106 "SourceHoldingTank.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (not_removed, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
+#line 1100 "SourceHoldingTank.c"
}
}
#line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp24_ = monitor;
-#line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp24__target = monitor_target;
-#line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp24_ != NULL) {
-#line 1115 "SourceHoldingTank.c"
- ProgressMonitor _tmp25_;
- void* _tmp25__target;
- gint _tmp26_;
- gint _tmp27_;
+ if (monitor != NULL) {
+#line 1105 "SourceHoldingTank.c"
+ gint _tmp14_;
+ gint _tmp15_;
#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp25_ = monitor;
+ _tmp14_ = ctr;
#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp25__target = monitor_target;
+ _tmp15_ = count;
#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp26_ = ctr;
-#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp27_ = count;
-#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp25_ ((guint64) (_tmp26_ + 1), (guint64) _tmp27_, TRUE, _tmp25__target);
-#line 1130 "SourceHoldingTank.c"
+ monitor ((guint64) (_tmp14_ + 1), (guint64) _tmp15_, TRUE, monitor_target);
+#line 1114 "SourceHoldingTank.c"
}
#line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (source);
-#line 1134 "SourceHoldingTank.c"
+#line 1118 "SourceHoldingTank.c"
}
}
}
}
-static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source) {
+static void
+source_holding_tank_on_source_destroyed (SourceHoldingTank* self,
+ DataSource* source)
+{
DataSet* _tmp0_;
- DataSource* _tmp1_;
- gboolean _tmp2_;
gboolean removed = FALSE;
- DataSet* _tmp3_;
- DataSource* _tmp4_;
- gboolean _tmp5_;
- gboolean _tmp6_;
- DataSource* _tmp7_;
- SingletonCollection* _tmp8_;
- SingletonCollection* _tmp9_;
+ DataSet* _tmp1_;
+ gboolean _tmp2_;
+ SingletonCollection* _tmp3_;
+ SingletonCollection* _tmp4_;
#line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
#line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1156,62 +1138,46 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da
#line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp0_ = self->priv->tank;
#line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = source;
-#line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp2_) {
+ if (!data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) {
#line 157 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return;
-#line 1167 "SourceHoldingTank.c"
+#line 1145 "SourceHoldingTank.c"
}
#line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = self->priv->tank;
-#line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = source;
-#line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = data_set_remove (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
+ _tmp1_ = self->priv->tank;
#line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- removed = _tmp5_;
+ removed = data_set_remove (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));
#line 160 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = removed;
+ _tmp2_ = removed;
#line 160 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _vala_assert (_tmp6_, "removed");
-#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp7_ = source;
+ _vala_assert (_tmp2_, "removed");
#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp7_);
+ _tmp3_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, source);
#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
+ source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _g_object_unref0 (_tmp9_);
-#line 1191 "SourceHoldingTank.c"
+ _g_object_unref0 (_tmp4_);
+#line 1163 "SourceHoldingTank.c"
}
-void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration) {
+void
+source_holding_tank_internal_notify_altered (SourceHoldingTank* self,
+ DataSource* source,
+ Alteration* alteration)
+{
DataSet* _tmp0_;
- DataSource* _tmp1_;
- gboolean _tmp2_;
- SourceHoldingTankCheckToKeep _tmp8_;
- void* _tmp8__target;
- DataSource* _tmp9_;
- Alteration* _tmp10_;
- gboolean _tmp11_;
+ SourceHoldingTankCheckToKeep _tmp5_;
+ void* _tmp5__target;
gboolean removed = FALSE;
- DataSet* _tmp12_;
- DataSource* _tmp13_;
- gboolean _tmp14_;
- gboolean _tmp15_;
- SourceCollection* _tmp16_;
- gboolean _tmp17_;
- DataSource* _tmp20_;
- SingletonCollection* _tmp21_;
- SingletonCollection* _tmp22_;
- SourceCollection* _tmp23_;
- DataSource* _tmp24_;
+ DataSet* _tmp6_;
+ gboolean _tmp7_;
+ SourceCollection* _tmp8_;
+ SingletonCollection* _tmp10_;
+ SingletonCollection* _tmp11_;
+ SourceCollection* _tmp12_;
#line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
#line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1221,113 +1187,91 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
#line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp0_ = self->priv->tank;
#line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = source;
-#line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (!_tmp2_) {
-#line 1230 "SourceHoldingTank.c"
- DataSource* _tmp3_;
+ if (!data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) {
+#line 1192 "SourceHoldingTank.c"
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
-#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp3_ = source;
#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
+ _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));
#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = _tmp4_;
+ _tmp2_ = _tmp1_;
#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp6_ = source_holding_tank_to_string (self);
+ _tmp3_ = source_holding_tank_to_string (self);
#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = _tmp3_;
#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_debug ("SourceHoldingTank.vala:168: SourceHoldingTank.internal_notify_altered " \
-"called for %s not stored in %s", _tmp5_, _tmp7_);
+"called for %s not stored in %s", _tmp2_, _tmp4_);
#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp4_);
#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 171 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return;
-#line 1254 "SourceHoldingTank.c"
+#line 1213 "SourceHoldingTank.c"
}
#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = self->priv->check_to_keep;
-#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8__target = self->priv->check_to_keep_target;
-#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp9_ = source;
+ _tmp5_ = self->priv->check_to_keep;
#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp10_ = alteration;
+ _tmp5__target = self->priv->check_to_keep_target;
#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp11_ = _tmp8_ (_tmp9_, _tmp10_, _tmp8__target);
-#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp11_) {
+ if (_tmp5_ (source, alteration, _tmp5__target)) {
#line 176 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return;
-#line 1270 "SourceHoldingTank.c"
+#line 1223 "SourceHoldingTank.c"
}
#line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp12_ = self->priv->tank;
-#line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp13_ = source;
+ _tmp6_ = self->priv->tank;
#line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp14_ = data_set_remove (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject));
-#line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- removed = _tmp14_;
+ removed = data_set_remove (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));
#line 179 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp15_ = removed;
+ _tmp7_ = removed;
#line 179 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _vala_assert (_tmp15_, "removed");
-#line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp16_ = self->priv->sources;
+ _vala_assert (_tmp7_, "removed");
#line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp17_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp8_ = self->priv->sources;
#line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- if (_tmp17_) {
-#line 1290 "SourceHoldingTank.c"
- GeeHashSet* _tmp18_;
- DataSource* _tmp19_;
+ if (data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection))) {
+#line 1237 "SourceHoldingTank.c"
+ GeeHashSet* _tmp9_;
#line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp18_ = self->priv->relinks;
+ _tmp9_ = self->priv->relinks;
#line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp19_ = source;
-#line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source);
#line 184 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return;
-#line 1301 "SourceHoldingTank.c"
+#line 1245 "SourceHoldingTank.c"
}
#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp20_ = source;
-#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp21_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp20_);
+ _tmp10_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, source);
#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp22_ = _tmp21_;
+ _tmp11_ = _tmp10_;
#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
+ source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _g_object_unref0 (_tmp22_);
-#line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp23_ = self->priv->sources;
+ _g_object_unref0 (_tmp11_);
#line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp24_ = source;
+ _tmp12_ = self->priv->sources;
#line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- source_collection_relink (_tmp23_, _tmp24_);
-#line 1319 "SourceHoldingTank.c"
+ source_collection_relink (_tmp12_, source);
+#line 1259 "SourceHoldingTank.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return self ? g_object_ref (self) : NULL;
-#line 1326 "SourceHoldingTank.c"
+#line 1268 "SourceHoldingTank.c"
}
-static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self) {
+static void
+source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self)
+{
GeeHashSet* _tmp0_;
gint _tmp1_;
gint _tmp2_;
@@ -1350,7 +1294,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
if (_tmp2_ == 0) {
#line 194 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return;
-#line 1353 "SourceHoldingTank.c"
+#line 1297 "SourceHoldingTank.c"
}
#line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp3_ = self->priv->relinks;
@@ -1376,11 +1320,13 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
source_collection_relink_many (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
#line 192 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (copy);
-#line 1379 "SourceHoldingTank.c"
+#line 1323 "SourceHoldingTank.c"
}
-gchar* source_holding_tank_to_string (SourceHoldingTank* self) {
+gchar*
+source_holding_tank_to_string (SourceHoldingTank* self)
+{
gchar* result = NULL;
gchar* _tmp0_;
#line 205 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1391,20 +1337,31 @@ gchar* source_holding_tank_to_string (SourceHoldingTank* self) {
result = _tmp0_;
#line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return result;
-#line 1394 "SourceHoldingTank.c"
+#line 1340 "SourceHoldingTank.c"
}
-static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) {
+static void
+source_holding_tank_real_contents_altered (SourceHoldingTank* self,
+ GeeCollection* added,
+ GeeCollection* removed)
+{
#line 35 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
#line 35 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1403 "SourceHoldingTank.c"
+#line 1353 "SourceHoldingTank.c"
}
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (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__OBJECT_OBJECT (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__OBJECT_OBJECT callback;
register GCClosure * cc;
@@ -1419,120 +1376,145 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
data1 = closure->data;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
data2 = param_values->data[0].v_pointer;
-#line 1422 "SourceHoldingTank.c"
+#line 1379 "SourceHoldingTank.c"
} else {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
data1 = param_values->data[0].v_pointer;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
data2 = closure->data;
-#line 1428 "SourceHoldingTank.c"
+#line 1385 "SourceHoldingTank.c"
}
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 1434 "SourceHoldingTank.c"
+#line 1391 "SourceHoldingTank.c"
}
-static void value_source_holding_tank_init (GValue* value) {
+static void
+value_source_holding_tank_init (GValue* value)
+{
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
value->data[0].v_pointer = NULL;
-#line 1441 "SourceHoldingTank.c"
+#line 1400 "SourceHoldingTank.c"
}
-static void value_source_holding_tank_free_value (GValue* value) {
+static void
+value_source_holding_tank_free_value (GValue* value)
+{
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
if (value->data[0].v_pointer) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
source_holding_tank_unref (value->data[0].v_pointer);
-#line 1450 "SourceHoldingTank.c"
+#line 1411 "SourceHoldingTank.c"
}
}
-static void value_source_holding_tank_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_source_holding_tank_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
if (src_value->data[0].v_pointer) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
dest_value->data[0].v_pointer = source_holding_tank_ref (src_value->data[0].v_pointer);
-#line 1460 "SourceHoldingTank.c"
+#line 1424 "SourceHoldingTank.c"
} else {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1464 "SourceHoldingTank.c"
+#line 1428 "SourceHoldingTank.c"
}
}
-static gpointer value_source_holding_tank_peek_pointer (const GValue* value) {
+static gpointer
+value_source_holding_tank_peek_pointer (const GValue* value)
+{
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return value->data[0].v_pointer;
-#line 1472 "SourceHoldingTank.c"
+#line 1438 "SourceHoldingTank.c"
}
-static gchar* value_source_holding_tank_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_source_holding_tank_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
if (collect_values[0].v_pointer) {
-#line 1479 "SourceHoldingTank.c"
+#line 1450 "SourceHoldingTank.c"
SourceHoldingTank * object;
object = collect_values[0].v_pointer;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
if (object->parent_instance.g_class == NULL) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1486 "SourceHoldingTank.c"
+#line 1457 "SourceHoldingTank.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.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 1490 "SourceHoldingTank.c"
+#line 1461 "SourceHoldingTank.c"
}
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
value->data[0].v_pointer = source_holding_tank_ref (object);
-#line 1494 "SourceHoldingTank.c"
+#line 1465 "SourceHoldingTank.c"
} else {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
value->data[0].v_pointer = NULL;
-#line 1498 "SourceHoldingTank.c"
+#line 1469 "SourceHoldingTank.c"
}
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return NULL;
-#line 1502 "SourceHoldingTank.c"
+#line 1473 "SourceHoldingTank.c"
}
-static gchar* value_source_holding_tank_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_source_holding_tank_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
SourceHoldingTank ** object_p;
object_p = collect_values[0].v_pointer;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
if (!object_p) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1513 "SourceHoldingTank.c"
+#line 1489 "SourceHoldingTank.c"
}
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
if (!value->data[0].v_pointer) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
*object_p = NULL;
-#line 1519 "SourceHoldingTank.c"
+#line 1495 "SourceHoldingTank.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
*object_p = value->data[0].v_pointer;
-#line 1523 "SourceHoldingTank.c"
+#line 1499 "SourceHoldingTank.c"
} else {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
*object_p = source_holding_tank_ref (value->data[0].v_pointer);
-#line 1527 "SourceHoldingTank.c"
+#line 1503 "SourceHoldingTank.c"
}
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return NULL;
-#line 1531 "SourceHoldingTank.c"
+#line 1507 "SourceHoldingTank.c"
}
-GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_source_holding_tank (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecSourceHoldingTank* spec;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_HOLDING_TANK), NULL);
@@ -1542,20 +1524,25 @@ GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick
G_PARAM_SPEC (spec)->value_type = object_type;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return G_PARAM_SPEC (spec);
-#line 1545 "SourceHoldingTank.c"
+#line 1527 "SourceHoldingTank.c"
}
-gpointer value_get_source_holding_tank (const GValue* value) {
+gpointer
+value_get_source_holding_tank (const GValue* value)
+{
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK), NULL);
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
return value->data[0].v_pointer;
-#line 1554 "SourceHoldingTank.c"
+#line 1538 "SourceHoldingTank.c"
}
-void value_set_source_holding_tank (GValue* value, gpointer v_object) {
+void
+value_set_source_holding_tank (GValue* value,
+ gpointer v_object)
+{
SourceHoldingTank * old;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK));
@@ -1571,22 +1558,25 @@ void value_set_source_holding_tank (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
source_holding_tank_ref (value->data[0].v_pointer);
-#line 1574 "SourceHoldingTank.c"
+#line 1561 "SourceHoldingTank.c"
} else {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
value->data[0].v_pointer = NULL;
-#line 1578 "SourceHoldingTank.c"
+#line 1565 "SourceHoldingTank.c"
}
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
if (old) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
source_holding_tank_unref (old);
-#line 1584 "SourceHoldingTank.c"
+#line 1571 "SourceHoldingTank.c"
}
}
-void value_take_source_holding_tank (GValue* value, gpointer v_object) {
+void
+value_take_source_holding_tank (GValue* value,
+ gpointer v_object)
+{
SourceHoldingTank * old;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK));
@@ -1600,22 +1590,24 @@ void value_take_source_holding_tank (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
value->data[0].v_pointer = v_object;
-#line 1603 "SourceHoldingTank.c"
+#line 1593 "SourceHoldingTank.c"
} else {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
value->data[0].v_pointer = NULL;
-#line 1607 "SourceHoldingTank.c"
+#line 1597 "SourceHoldingTank.c"
}
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
if (old) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
source_holding_tank_unref (old);
-#line 1613 "SourceHoldingTank.c"
+#line 1603 "SourceHoldingTank.c"
}
}
-static void source_holding_tank_class_init (SourceHoldingTankClass * klass) {
+static void
+source_holding_tank_class_init (SourceHoldingTankClass * klass)
+{
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
source_holding_tank_parent_class = g_type_class_peek_parent (klass);
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1628,11 +1620,13 @@ static void source_holding_tank_class_init (SourceHoldingTankClass * klass) {
((SourceHoldingTankClass *) klass)->contents_altered = source_holding_tank_real_contents_altered;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("contents-altered", TYPE_SOURCE_HOLDING_TANK, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceHoldingTankClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
-#line 1631 "SourceHoldingTank.c"
+#line 1623 "SourceHoldingTank.c"
}
-static void source_holding_tank_instance_init (SourceHoldingTank * self) {
+static void
+source_holding_tank_instance_init (SourceHoldingTank * self)
+{
DataSet* _tmp0_;
GeeHashSet* _tmp1_;
GeeHashSet* _tmp2_;
@@ -1654,11 +1648,13 @@ static void source_holding_tank_instance_init (SourceHoldingTank * self) {
self->priv->ordinal = (gint64) 0;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
self->ref_count = 1;
-#line 1657 "SourceHoldingTank.c"
+#line 1651 "SourceHoldingTank.c"
}
-static void source_holding_tank_finalize (SourceHoldingTank * obj) {
+static void
+source_holding_tank_finalize (SourceHoldingTank * obj)
+{
SourceHoldingTank * self;
SourceCollection* _tmp0_;
guint _tmp1_;
@@ -1688,11 +1684,13 @@ static void source_holding_tank_finalize (SourceHoldingTank * obj) {
_g_object_unref0 (self->priv->relinks);
#line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (self->priv->unlinking);
-#line 1691 "SourceHoldingTank.c"
+#line 1687 "SourceHoldingTank.c"
}
-GType source_holding_tank_get_type (void) {
+GType
+source_holding_tank_get_type (void)
+{
static volatile gsize source_holding_tank_type_id__volatile = 0;
if (g_once_init_enter (&source_holding_tank_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { value_source_holding_tank_init, value_source_holding_tank_free_value, value_source_holding_tank_copy_value, value_source_holding_tank_peek_pointer, "p", value_source_holding_tank_collect_value, "p", value_source_holding_tank_lcopy_value };
@@ -1706,7 +1704,9 @@ GType source_holding_tank_get_type (void) {
}
-gpointer source_holding_tank_ref (gpointer instance) {
+gpointer
+source_holding_tank_ref (gpointer instance)
+{
SourceHoldingTank * self;
self = instance;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1717,7 +1717,9 @@ gpointer source_holding_tank_ref (gpointer instance) {
}
-void source_holding_tank_unref (gpointer instance) {
+void
+source_holding_tank_unref (gpointer instance)
+{
SourceHoldingTank * self;
self = instance;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1726,7 +1728,7 @@ void source_holding_tank_unref (gpointer instance) {
SOURCE_HOLDING_TANK_GET_CLASS (self)->finalize (self);
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1729 "SourceHoldingTank.c"
+#line 1731 "SourceHoldingTank.c"
}
}