From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/core/DataSource.c | 1819 +++++++++++++++++++++++++------------------------ 1 file changed, 919 insertions(+), 900 deletions(-) (limited to 'src/core/DataSource.c') diff --git a/src/core/DataSource.c b/src/core/DataSource.c index c95b8ce..dc02548 100644 --- a/src/core/DataSource.c +++ b/src/core/DataSource.c @@ -1,4 +1,4 @@ -/* DataSource.c generated by valac 0.34.7, the Vala compiler +/* DataSource.c generated by valac 0.36.6, the Vala compiler * generated from DataSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -143,8 +143,20 @@ typedef struct _SourceBacklinkClass SourceBacklinkClass; #define _source_backlink_unref0(var) ((var == NULL) ? NULL : (var = (source_backlink_unref (var), NULL))) #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +enum { + DATA_SOURCE_UNLINKED_SIGNAL, + DATA_SOURCE_RELINKED_SIGNAL, + DATA_SOURCE_DESTROYED_SIGNAL, + DATA_SOURCE_LAST_SIGNAL +}; +static guint data_source_signals[DATA_SOURCE_LAST_SIGNAL] = {0}; typedef struct _SourceSnapshotPrivate SourceSnapshotPrivate; typedef struct _ParamSpecSourceSnapshot ParamSpecSourceSnapshot; +enum { + SOURCE_SNAPSHOT_BROKEN_SIGNAL, + SOURCE_SNAPSHOT_LAST_SIGNAL +}; +static guint source_snapshot_signals[SOURCE_SNAPSHOT_LAST_SIGNAL] = {0}; typedef struct _SourceBacklinkPrivate SourceBacklinkPrivate; typedef struct _ParamSpecSourceBacklink ParamSpecSourceBacklink; @@ -160,6 +172,13 @@ typedef struct _SourceProxyClass SourceProxyClass; typedef struct _SourceProxyPrivate SourceProxyPrivate; #define _source_snapshot_unref0(var) ((var == NULL) ? NULL : (var = (source_snapshot_unref (var), NULL))) typedef struct _ParamSpecSourceProxy ParamSpecSourceProxy; +enum { + SOURCE_PROXY_RECONSTITUTED_SIGNAL, + SOURCE_PROXY_DEHYDRATED_SIGNAL, + SOURCE_PROXY_BROKEN_SIGNAL, + SOURCE_PROXY_LAST_SIGNAL +}; +static guint source_proxy_signals[SOURCE_PROXY_LAST_SIGNAL] = {0}; #define TYPE_PROXYABLE (proxyable_get_type ()) #define PROXYABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROXYABLE, Proxyable)) @@ -406,14 +425,14 @@ void data_view_notify_unsubscribed (DataView* self, DataSource* source); gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); void data_source_internal_subscribe (DataSource* self, DataView* view); -static void _vala_array_add63 (DataView*** array, int* length, int* size, DataView* value); +static void _vala_array_add63 (DataView** * array, int* length, int* size, DataView* value); void data_source_internal_unsubscribe (DataSource* self, DataView* view); void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target); static void data_source_real_unlinked (DataSource* self, SourceCollection* sources); static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static void data_source_real_relinked (DataSource* self, SourceCollection* sources); static void data_source_real_destroyed (DataSource* self); -static void data_source_finalize (GObject* obj); +static void data_source_finalize (GObject * obj); #define SOURCE_SNAPSHOT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_SNAPSHOT, SourceSnapshotPrivate)) enum { SOURCE_SNAPSHOT_DUMMY_PROPERTY @@ -423,7 +442,7 @@ static void source_snapshot_real_notify_broken (SourceSnapshot* self); gboolean source_snapshot_is_broken (SourceSnapshot* self); SourceSnapshot* source_snapshot_construct (GType object_type); static void source_snapshot_real_broken (SourceSnapshot* self); -static void source_snapshot_finalize (SourceSnapshot* obj); +static void source_snapshot_finalize (SourceSnapshot * obj); #define SOURCE_BACKLINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_BACKLINK, SourceBacklinkPrivate)) enum { SOURCE_BACKLINK_DUMMY_PROPERTY @@ -436,7 +455,7 @@ guint source_backlink_hash_func (SourceBacklink* backlink); gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink); const gchar* source_backlink_get_typename (SourceBacklink* self); gint64 source_backlink_get_instance_id (SourceBacklink* self); -static void source_backlink_finalize (SourceBacklink* obj); +static void source_backlink_finalize (SourceBacklink * obj); gpointer source_proxy_ref (gpointer instance); void source_proxy_unref (gpointer instance); GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -471,7 +490,7 @@ gboolean data_collection_contains (DataCollection* self, DataObject* object); static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source); static void source_proxy_real_dehydrated (SourceProxy* self); static void source_proxy_real_broken (SourceProxy* self); -static void source_proxy_finalize (SourceProxy* obj); +static void source_proxy_finalize (SourceProxy * obj); GType proxyable_get_type (void) G_GNUC_CONST; SourceProxy* proxyable_get_proxy (Proxyable* self); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -481,23 +500,23 @@ static gint _vala_array_length (gpointer array); DataSource* data_source_construct (GType object_type, gint64 object_id) { DataSource * self = NULL; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 64 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = object_id; #line 64 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (DataSource*) data_object_construct (object_type, _tmp0_); #line 63 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 492 "DataSource.c" +#line 511 "DataSource.c" } static void data_source_real_notify_membership_changed (DataObject* base, DataCollection* collection) { DataSource * self; - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; gboolean _tmp5_ = FALSE; - DataCollection* _tmp6_ = NULL; - DataCollection* _tmp8_ = NULL; + DataCollection* _tmp6_; + DataCollection* _tmp8_; #line 73 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_SOURCE, DataSource); #line 73 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -506,78 +525,78 @@ static void data_source_real_notify_membership_changed (DataObject* base, DataCo _tmp0_ = collection; #line 75 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_ == NULL) { -#line 510 "DataSource.c" +#line 529 "DataSource.c" gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->is_destroyed; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp2_) { #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; -#line 519 "DataSource.c" +#line 538 "DataSource.c" } else { - GeeHashMap* _tmp3_ = NULL; + GeeHashMap* _tmp3_; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = self->priv->backlinks; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = _tmp3_ != NULL; -#line 526 "DataSource.c" +#line 545 "DataSource.c" } #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp1_, "is_destroyed || backlinks != null"); -#line 530 "DataSource.c" +#line 549 "DataSource.c" } else { - gboolean _tmp4_ = FALSE; + gboolean _tmp4_; #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = self->priv->is_destroyed; #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (!_tmp4_, "!is_destroyed"); -#line 537 "DataSource.c" +#line 556 "DataSource.c" } #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = collection; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp6_ == NULL) { -#line 543 "DataSource.c" - GeeHashMap* _tmp7_ = NULL; +#line 562 "DataSource.c" + GeeHashMap* _tmp7_; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = self->priv->backlinks; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = _tmp7_ != NULL; -#line 549 "DataSource.c" +#line 568 "DataSource.c" } else { #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = FALSE; -#line 553 "DataSource.c" +#line 572 "DataSource.c" } #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp5_) { #line 83 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_notify_unlinked (self); -#line 559 "DataSource.c" +#line 578 "DataSource.c" } #line 85 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = collection; #line 85 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_OBJECT_CLASS (data_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp8_); -#line 565 "DataSource.c" +#line 584 "DataSource.c" } static gpointer _source_holding_tank_ref0 (gpointer self) { #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? source_holding_tank_ref (self) : NULL; -#line 572 "DataSource.c" +#line 591 "DataSource.c" } static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank) { - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; - SourceHoldingTank* _tmp2_ = NULL; - SourceHoldingTank* _tmp5_ = NULL; - SourceHoldingTank* _tmp6_ = NULL; + DataCollection* _tmp0_; + DataCollection* _tmp1_; + SourceHoldingTank* _tmp2_; + SourceHoldingTank* _tmp5_; + SourceHoldingTank* _tmp6_; #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail ((holding_tank == NULL) || IS_SOURCE_HOLDING_TANK (holding_tank)); #line 90 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -592,20 +611,20 @@ static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldin _tmp2_ = holding_tank; #line 94 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp2_ != NULL) { -#line 596 "DataSource.c" - SourceHoldingTank* _tmp3_ = NULL; +#line 615 "DataSource.c" + SourceHoldingTank* _tmp3_; #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = self->priv->holding_tank; #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp3_ == NULL, "this.holding_tank == null"); -#line 602 "DataSource.c" +#line 621 "DataSource.c" } else { - SourceHoldingTank* _tmp4_ = NULL; + SourceHoldingTank* _tmp4_; #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = self->priv->holding_tank; #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp4_ != NULL, "this.holding_tank != null"); -#line 609 "DataSource.c" +#line 628 "DataSource.c" } #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = holding_tank; @@ -615,7 +634,7 @@ static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldin _source_holding_tank_unref0 (self->priv->holding_tank); #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->holding_tank = _tmp6_; -#line 619 "DataSource.c" +#line 638 "DataSource.c" } @@ -624,13 +643,13 @@ void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holdi g_return_if_fail (IS_DATA_SOURCE (self)); #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_held_in_tank (self, holding_tank); -#line 628 "DataSource.c" +#line 647 "DataSource.c" } static void data_source_real_notify_altered (DataObject* base, Alteration* alteration) { DataSource * self; - SourceHoldingTank* _tmp0_ = NULL; + SourceHoldingTank* _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_SOURCE, DataSource); #line 103 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -639,19 +658,19 @@ static void data_source_real_notify_altered (DataObject* base, Alteration* alter _tmp0_ = self->priv->holding_tank; #line 105 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_ != NULL) { -#line 643 "DataSource.c" - SourceHoldingTank* _tmp1_ = NULL; - Alteration* _tmp2_ = NULL; +#line 662 "DataSource.c" + SourceHoldingTank* _tmp1_; + Alteration* _tmp2_; #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->holding_tank; #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = alteration; #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_holding_tank_internal_notify_altered (_tmp1_, self, _tmp2_); -#line 652 "DataSource.c" +#line 671 "DataSource.c" } else { - Alteration* _tmp3_ = NULL; - Alteration* _tmp4_ = NULL; + Alteration* _tmp3_; + Alteration* _tmp4_; #line 108 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = alteration; #line 108 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -660,33 +679,33 @@ static void data_source_real_notify_altered (DataObject* base, Alteration* alter _tmp4_ = alteration; #line 110 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_OBJECT_CLASS (data_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp4_); -#line 664 "DataSource.c" +#line 683 "DataSource.c" } } static void data_source_real_notify_unlinking (DataSource* self, SourceCollection* collection) { gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; - SourceCollection* _tmp3_ = NULL; - GeeHashMap* _tmp4_ = NULL; + GeeHashMap* _tmp1_; + SourceCollection* _tmp3_; + GeeHashMap* _tmp4_; #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (collection)); #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ == NULL) { -#line 680 "DataSource.c" - SourceCollection* _tmp2_ = NULL; +#line 699 "DataSource.c" + SourceCollection* _tmp2_; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ == NULL; -#line 686 "DataSource.c" +#line 705 "DataSource.c" } else { #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 690 "DataSource.c" +#line 709 "DataSource.c" } #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "backlinks == null && unlinked_from_collection == null"); @@ -700,7 +719,7 @@ static void data_source_real_notify_unlinking (DataSource* self, SourceCollectio _g_object_unref0 (self->priv->backlinks); #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->backlinks = _tmp4_; -#line 704 "DataSource.c" +#line 723 "DataSource.c" } @@ -709,39 +728,39 @@ void data_source_notify_unlinking (DataSource* self, SourceCollection* collectio g_return_if_fail (IS_DATA_SOURCE (self)); #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_unlinking (self, collection); -#line 713 "DataSource.c" +#line 732 "DataSource.c" } static void data_source_real_notify_unlinked (DataSource* self) { gboolean _tmp0_ = FALSE; - SourceCollection* _tmp1_ = NULL; - SourceCollection* _tmp3_ = NULL; - GeeHashMap* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + SourceCollection* _tmp1_; + SourceCollection* _tmp3_; + GeeHashMap* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->unlinked_from_collection; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 728 "DataSource.c" - GeeHashMap* _tmp2_ = NULL; +#line 747 "DataSource.c" + GeeHashMap* _tmp2_; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->backlinks; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ != NULL; -#line 734 "DataSource.c" +#line 753 "DataSource.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 738 "DataSource.c" +#line 757 "DataSource.c" } #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "unlinked_from_collection != null && backlinks != null"); #line 126 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = self->priv->unlinked_from_collection; #line 126 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "unlinked", _tmp3_); + g_signal_emit (self, data_source_signals[DATA_SOURCE_UNLINKED_SIGNAL], 0, _tmp3_); #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = self->priv->backlinks; #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -750,10 +769,10 @@ static void data_source_real_notify_unlinked (DataSource* self) { _tmp6_ = _tmp5_; #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp6_ > 0) { -#line 754 "DataSource.c" - SourceCollection* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 773 "DataSource.c" + SourceCollection* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = self->priv->unlinked_from_collection; #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -764,7 +783,7 @@ static void data_source_real_notify_unlinked (DataSource* self) { data_source_commit_backlinks (self, _tmp7_, _tmp9_); #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp9_); -#line 768 "DataSource.c" +#line 787 "DataSource.c" } } @@ -774,37 +793,37 @@ void data_source_notify_unlinked (DataSource* self) { g_return_if_fail (IS_DATA_SOURCE (self)); #line 123 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_unlinked (self); -#line 778 "DataSource.c" +#line 797 "DataSource.c" } static void data_source_real_notify_relinking (DataSource* self, SourceCollection* collection) { gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; + GeeHashMap* _tmp1_; #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (collection)); #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 791 "DataSource.c" - SourceCollection* _tmp2_ = NULL; - SourceCollection* _tmp3_ = NULL; +#line 810 "DataSource.c" + SourceCollection* _tmp2_; + SourceCollection* _tmp3_; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = collection; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ == _tmp3_; -#line 800 "DataSource.c" +#line 819 "DataSource.c" } else { #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 804 "DataSource.c" +#line 823 "DataSource.c" } #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "(backlinks != null) && (unlinked_from_collection == collection)"); -#line 808 "DataSource.c" +#line 827 "DataSource.c" } @@ -813,38 +832,38 @@ void data_source_notify_relinking (DataSource* self, SourceCollection* collectio g_return_if_fail (IS_DATA_SOURCE (self)); #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_relinking (self, collection); -#line 817 "DataSource.c" +#line 836 "DataSource.c" } static gpointer _data_collection_ref0 (gpointer self) { #line 142 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? data_collection_ref (self) : NULL; -#line 824 "DataSource.c" +#line 843 "DataSource.c" } static void data_source_real_notify_relinked (DataSource* self) { gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; + GeeHashMap* _tmp1_; SourceCollection* relinked_to = NULL; - SourceCollection* _tmp3_ = NULL; - SourceCollection* _tmp4_ = NULL; + SourceCollection* _tmp3_; + SourceCollection* _tmp4_; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 838 "DataSource.c" - SourceCollection* _tmp2_ = NULL; +#line 857 "DataSource.c" + SourceCollection* _tmp2_; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ != NULL; -#line 844 "DataSource.c" +#line 863 "DataSource.c" } else { #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 848 "DataSource.c" +#line 867 "DataSource.c" } #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "backlinks != null && unlinked_from_collection != null"); @@ -861,12 +880,12 @@ static void data_source_real_notify_relinked (DataSource* self) { #line 144 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->unlinked_from_collection = NULL; #line 145 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "relinked", relinked_to); + g_signal_emit (self, data_source_signals[DATA_SOURCE_RELINKED_SIGNAL], 0, relinked_to); #line 148 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_commit_backlinks (self, NULL, NULL); #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (relinked_to); -#line 870 "DataSource.c" +#line 889 "DataSource.c" } @@ -875,7 +894,7 @@ void data_source_notify_relinked (DataSource* self) { g_return_if_fail (IS_DATA_SOURCE (self)); #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_relinked (self); -#line 879 "DataSource.c" +#line 898 "DataSource.c" } @@ -884,7 +903,7 @@ static gchar* data_source_real_get_typename (DataSource* self) { g_critical ("Type `%s' does not implement abstract method `data_source_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 888 "DataSource.c" +#line 907 "DataSource.c" } @@ -893,7 +912,7 @@ gchar* data_source_get_typename (DataSource* self) { g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_typename (self); -#line 897 "DataSource.c" +#line 916 "DataSource.c" } @@ -903,7 +922,7 @@ static gint64 data_source_real_get_instance_id (DataSource* self) { g_critical ("Type `%s' does not implement abstract method `data_source_get_instance_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" return _tmp0_; -#line 907 "DataSource.c" +#line 926 "DataSource.c" } @@ -912,17 +931,17 @@ gint64 data_source_get_instance_id (DataSource* self) { g_return_val_if_fail (IS_DATA_SOURCE (self), 0LL); #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_instance_id (self); -#line 916 "DataSource.c" +#line 935 "DataSource.c" } static gchar* data_source_real_get_source_id (DataSource* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint64 _tmp2_ = 0LL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gint64 _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = data_source_get_typename (self); #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -939,7 +958,7 @@ static gchar* data_source_real_get_source_id (DataSource* self) { result = _tmp4_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 943 "DataSource.c" +#line 962 "DataSource.c" } @@ -948,21 +967,21 @@ gchar* data_source_get_source_id (DataSource* self) { g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 166 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_source_id (self); -#line 952 "DataSource.c" +#line 971 "DataSource.c" } gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* values = NULL; - GeeHashMap* _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeHashMap* _tmp1_; + SourceBacklink* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_; gboolean _tmp6_ = FALSE; - GeeList* _tmp7_ = NULL; + GeeList* _tmp7_; #line 170 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 170 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -975,7 +994,7 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { result = FALSE; #line 172 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 979 "DataSource.c" +#line 998 "DataSource.c" } #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; @@ -993,12 +1012,12 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { _tmp7_ = values; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 997 "DataSource.c" - GeeList* _tmp8_ = NULL; - SourceBacklink* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#line 1016 "DataSource.c" + GeeList* _tmp8_; + SourceBacklink* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + gboolean _tmp12_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = values; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1011,11 +1030,11 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { _tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = _tmp12_; -#line 1015 "DataSource.c" +#line 1034 "DataSource.c" } else { #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = FALSE; -#line 1019 "DataSource.c" +#line 1038 "DataSource.c" } #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = _tmp6_; @@ -1023,28 +1042,28 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { _g_object_unref0 (values); #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1027 "DataSource.c" +#line 1046 "DataSource.c" } static gpointer _g_object_ref0 (gpointer self) { #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? g_object_ref (self) : NULL; -#line 1034 "DataSource.c" +#line 1053 "DataSource.c" } GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { GeeList* result = NULL; - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* values = NULL; - GeeHashMap* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gpointer _tmp3_ = NULL; + GeeHashMap* _tmp1_; + const gchar* _tmp2_; + gpointer _tmp3_; gboolean _tmp4_ = FALSE; - GeeList* _tmp5_ = NULL; + GeeList* _tmp5_; GeeList* backlinks = NULL; - GeeArrayList* _tmp9_ = NULL; + GeeArrayList* _tmp9_; #line 179 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 179 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1057,7 +1076,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { result = NULL; #line 181 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1061 "DataSource.c" +#line 1080 "DataSource.c" } #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; @@ -1073,11 +1092,11 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { if (_tmp5_ == NULL) { #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = TRUE; -#line 1077 "DataSource.c" +#line 1096 "DataSource.c" } else { - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = values; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1086,7 +1105,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _tmp8_ = _tmp7_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = _tmp8_ == 0; -#line 1090 "DataSource.c" +#line 1109 "DataSource.c" } #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp4_) { @@ -1096,21 +1115,21 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _g_object_unref0 (values); #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1100 "DataSource.c" +#line 1119 "DataSource.c" } #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp9_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, NULL, NULL, NULL); #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala" backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList); -#line 1106 "DataSource.c" +#line 1125 "DataSource.c" { GeeList* _value_list = NULL; - GeeList* _tmp10_ = NULL; - GeeList* _tmp11_ = NULL; + GeeList* _tmp10_; + GeeList* _tmp11_; gint _value_size = 0; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; gint _value_index = 0; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp10_ = values; @@ -1130,19 +1149,19 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _value_index = -1; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1134 "DataSource.c" - gint _tmp15_ = 0; - gint _tmp16_ = 0; - gint _tmp17_ = 0; +#line 1153 "DataSource.c" + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; gchar* value = NULL; - GeeList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gpointer _tmp20_ = NULL; - GeeList* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - SourceBacklink* _tmp24_ = NULL; - SourceBacklink* _tmp25_ = NULL; + GeeList* _tmp18_; + gint _tmp19_; + gpointer _tmp20_; + GeeList* _tmp21_; + const gchar* _tmp22_; + const gchar* _tmp23_; + SourceBacklink* _tmp24_; + SourceBacklink* _tmp25_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp15_ = _value_index; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1155,7 +1174,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { if (!(_tmp16_ < _tmp17_)) { #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1159 "DataSource.c" +#line 1178 "DataSource.c" } #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp18_ = _value_list; @@ -1181,11 +1200,11 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _source_backlink_unref0 (_tmp25_); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 1185 "DataSource.c" +#line 1204 "DataSource.c" } #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_value_list); -#line 1189 "DataSource.c" +#line 1208 "DataSource.c" } #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = backlinks; @@ -1193,26 +1212,26 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _g_object_unref0 (values); #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1197 "DataSource.c" +#line 1216 "DataSource.c" } void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* values = NULL; - GeeHashMap* _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp13_ = NULL; - SourceBacklink* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; + GeeHashMap* _tmp1_; + SourceBacklink* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp13_; + SourceBacklink* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; SourceCollection* sources = NULL; - DataCollection* _tmp17_ = NULL; - SourceCollection* _tmp18_ = NULL; + DataCollection* _tmp17_; + SourceCollection* _tmp18_; #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1237,13 +1256,13 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { _tmp6_ = values; #line 199 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp6_ == NULL) { -#line 1241 "DataSource.c" - GeeArrayList* _tmp7_ = NULL; - GeeHashMap* _tmp8_ = NULL; - SourceBacklink* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GeeList* _tmp12_ = NULL; +#line 1260 "DataSource.c" + GeeArrayList* _tmp7_; + GeeHashMap* _tmp8_; + SourceBacklink* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + GeeList* _tmp12_; #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1262,7 +1281,7 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { _tmp12_ = values; #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); -#line 1266 "DataSource.c" +#line 1285 "DataSource.c" } #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp13_ = values; @@ -1282,56 +1301,56 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { _tmp18_ = sources; #line 207 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp18_ != NULL) { -#line 1286 "DataSource.c" - SourceCollection* _tmp19_ = NULL; - SourceBacklink* _tmp20_ = NULL; +#line 1305 "DataSource.c" + SourceCollection* _tmp19_; + SourceBacklink* _tmp20_; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp19_ = sources; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp20_ = backlink; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_collection_internal_backlink_set (_tmp19_, self, _tmp20_); -#line 1295 "DataSource.c" +#line 1314 "DataSource.c" } #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (sources); #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); -#line 1301 "DataSource.c" +#line 1320 "DataSource.c" } gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* values = NULL; - GeeHashMap* _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; + GeeHashMap* _tmp1_; + SourceBacklink* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_; + GeeList* _tmp6_; gint original_size = 0; - GeeList* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + GeeList* _tmp7_; + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; GeeIterator* iter = NULL; - GeeList* _tmp11_ = NULL; - GeeIterator* _tmp12_ = NULL; - GeeList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - SourceCollection* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + GeeList* _tmp11_; + GeeIterator* _tmp12_; + GeeList* _tmp23_; + gint _tmp24_; + gint _tmp25_; + SourceCollection* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; SourceCollection* sources = NULL; - DataCollection* _tmp33_ = NULL; - SourceCollection* _tmp34_ = NULL; - GeeList* _tmp37_ = NULL; - gint _tmp38_ = 0; - gint _tmp39_ = 0; - gint _tmp40_ = 0; + DataCollection* _tmp33_; + SourceCollection* _tmp34_; + GeeList* _tmp37_; + gint _tmp38_; + gint _tmp39_; + gint _tmp40_; #line 211 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 211 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1344,7 +1363,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink result = FALSE; #line 213 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1348 "DataSource.c" +#line 1367 "DataSource.c" } #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; @@ -1368,7 +1387,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _g_object_unref0 (values); #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1372 "DataSource.c" +#line 1391 "DataSource.c" } #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = values; @@ -1390,16 +1409,16 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink iter = _tmp12_; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1394 "DataSource.c" - GeeIterator* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - GeeIterator* _tmp15_ = NULL; - gpointer _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - SourceBacklink* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; +#line 1413 "DataSource.c" + GeeIterator* _tmp13_; + gboolean _tmp14_; + GeeIterator* _tmp15_; + gpointer _tmp16_; + gchar* _tmp17_; + SourceBacklink* _tmp18_; + const gchar* _tmp19_; + const gchar* _tmp20_; + gboolean _tmp21_; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp13_ = iter; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1408,7 +1427,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink if (!_tmp14_) { #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1412 "DataSource.c" +#line 1431 "DataSource.c" } #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp15_ = iter; @@ -1428,13 +1447,13 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _g_free0 (_tmp17_); #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp21_) { -#line 1432 "DataSource.c" - GeeIterator* _tmp22_ = NULL; +#line 1451 "DataSource.c" + GeeIterator* _tmp22_; #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp22_ = iter; #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala" gee_iterator_remove (_tmp22_); -#line 1438 "DataSource.c" +#line 1457 "DataSource.c" } } #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1445,11 +1464,11 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _tmp25_ = _tmp24_; #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp25_ == 0) { -#line 1449 "DataSource.c" - GeeHashMap* _tmp26_ = NULL; - SourceBacklink* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; +#line 1468 "DataSource.c" + GeeHashMap* _tmp26_; + SourceBacklink* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp29_; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp26_ = self->priv->backlinks; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1460,7 +1479,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _tmp29_ = _tmp28_; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL); -#line 1464 "DataSource.c" +#line 1483 "DataSource.c" } #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp30_ = self->priv->unlinked_from_collection; @@ -1480,16 +1499,16 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _tmp34_ = sources; #line 236 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp34_ != NULL) { -#line 1484 "DataSource.c" - SourceCollection* _tmp35_ = NULL; - SourceBacklink* _tmp36_ = NULL; +#line 1503 "DataSource.c" + SourceCollection* _tmp35_; + SourceBacklink* _tmp36_; #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp35_ = sources; #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp36_ = backlink; #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_collection_internal_backlink_removed (_tmp35_, self, _tmp36_); -#line 1493 "DataSource.c" +#line 1512 "DataSource.c" } #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp37_ = values; @@ -1509,13 +1528,13 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _g_object_unref0 (values); #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1513 "DataSource.c" +#line 1532 "DataSource.c" } static void data_source_real_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated) { gboolean _tmp0_ = FALSE; - SourceCollection* _tmp1_ = NULL; + SourceCollection* _tmp1_; #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1524,20 +1543,20 @@ static void data_source_real_commit_backlinks (DataSource* self, SourceCollectio if (_tmp1_ != NULL) { #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = TRUE; -#line 1528 "DataSource.c" +#line 1547 "DataSource.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = dehydrated; #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ != NULL; -#line 1535 "DataSource.c" +#line 1554 "DataSource.c" } #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { -#line 1539 "DataSource.c" - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; +#line 1558 "DataSource.c" + gchar* _tmp3_; + gchar* _tmp4_; #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1546,7 +1565,7 @@ static void data_source_real_commit_backlinks (DataSource* self, SourceCollectio g_warning ("DataSource.vala:250: No implementation to commit link state for %s", _tmp4_); #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp4_); -#line 1550 "DataSource.c" +#line 1569 "DataSource.c" } } @@ -1556,22 +1575,22 @@ void data_source_commit_backlinks (DataSource* self, SourceCollection* sources, g_return_if_fail (IS_DATA_SOURCE (self)); #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->commit_backlinks (self, sources, dehydrated); -#line 1560 "DataSource.c" +#line 1579 "DataSource.c" } static gchar* data_source_dehydrate_backlinks (DataSource* self) { gchar* result = NULL; gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; + GeeHashMap* _tmp1_; GString* builder = NULL; - GString* _tmp5_ = NULL; + GString* _tmp5_; const gchar* _tmp51_ = NULL; - GString* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; - gint _tmp54_ = 0; - gint _tmp55_ = 0; - gchar* _tmp58_ = NULL; + GString* _tmp52_; + const gchar* _tmp53_; + gint _tmp54_; + gint _tmp55_; + gchar* _tmp58_; #line 253 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1580,11 +1599,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (_tmp1_ == NULL) { #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = TRUE; -#line 1584 "DataSource.c" +#line 1603 "DataSource.c" } else { - GeeHashMap* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeHashMap* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->backlinks; #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1593,7 +1612,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp4_ = _tmp3_; #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp4_ == 0; -#line 1597 "DataSource.c" +#line 1616 "DataSource.c" } #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { @@ -1601,21 +1620,21 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { result = NULL; #line 255 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1605 "DataSource.c" +#line 1624 "DataSource.c" } #line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = g_string_new (""); #line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala" builder = _tmp5_; -#line 1611 "DataSource.c" +#line 1630 "DataSource.c" { GeeIterator* _name_it = NULL; - GeeHashMap* _tmp6_ = NULL; - GeeSet* _tmp7_ = NULL; - GeeSet* _tmp8_ = NULL; - GeeSet* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + GeeHashMap* _tmp6_; + GeeSet* _tmp7_; + GeeSet* _tmp8_; + GeeSet* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = self->priv->backlinks; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1634,23 +1653,23 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _name_it = _tmp11_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1638 "DataSource.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; +#line 1657 "DataSource.c" + GeeIterator* _tmp12_; + gboolean _tmp13_; gchar* name = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; + GeeIterator* _tmp14_; + gpointer _tmp15_; GeeList* values = NULL; - GeeHashMap* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; + GeeHashMap* _tmp16_; + const gchar* _tmp17_; + gpointer _tmp18_; gboolean _tmp19_ = FALSE; - GeeList* _tmp20_ = NULL; + GeeList* _tmp20_; gchar* value_field = NULL; - gchar* _tmp24_ = NULL; - const gchar* _tmp43_ = NULL; - gint _tmp44_ = 0; - gint _tmp45_ = 0; + gchar* _tmp24_; + const gchar* _tmp43_; + gint _tmp44_; + gint _tmp45_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp12_ = _name_it; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1659,7 +1678,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (!_tmp13_) { #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1663 "DataSource.c" +#line 1682 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp14_ = _name_it; @@ -1681,11 +1700,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (_tmp20_ == NULL) { #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp19_ = TRUE; -#line 1685 "DataSource.c" +#line 1704 "DataSource.c" } else { - GeeList* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; + GeeList* _tmp21_; + gint _tmp22_; + gint _tmp23_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp21_ = values; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1694,7 +1713,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp23_ = _tmp22_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp19_ = _tmp23_ == 0; -#line 1698 "DataSource.c" +#line 1717 "DataSource.c" } #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp19_) { @@ -1704,21 +1723,21 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _g_free0 (name); #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 1708 "DataSource.c" +#line 1727 "DataSource.c" } #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp24_ = g_strdup (""); #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala" value_field = _tmp24_; -#line 1714 "DataSource.c" +#line 1733 "DataSource.c" { GeeList* _value_list = NULL; - GeeList* _tmp25_ = NULL; - GeeList* _tmp26_ = NULL; + GeeList* _tmp25_; + GeeList* _tmp26_; gint _value_size = 0; - GeeList* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; + GeeList* _tmp27_; + gint _tmp28_; + gint _tmp29_; gint _value_index = 0; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp25_ = values; @@ -1738,16 +1757,16 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _value_index = -1; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1742 "DataSource.c" - gint _tmp30_ = 0; - gint _tmp31_ = 0; - gint _tmp32_ = 0; +#line 1761 "DataSource.c" + gint _tmp30_; + gint _tmp31_; + gint _tmp32_; gchar* value = NULL; - GeeList* _tmp33_ = NULL; - gint _tmp34_ = 0; - gpointer _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - gboolean _tmp37_ = FALSE; + GeeList* _tmp33_; + gint _tmp34_; + gpointer _tmp35_; + const gchar* _tmp36_; + gboolean _tmp37_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp30_ = _value_index; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1760,7 +1779,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (!(_tmp31_ < _tmp32_)) { #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1764 "DataSource.c" +#line 1783 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp33_ = _value_list; @@ -1776,12 +1795,12 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp37_ = is_string_empty (_tmp36_); #line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp37_) { -#line 1780 "DataSource.c" - const gchar* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; +#line 1799 "DataSource.c" + const gchar* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp38_ = value_field; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1798,15 +1817,15 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { value_field = _tmp42_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp41_); -#line 1802 "DataSource.c" +#line 1821 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 1806 "DataSource.c" +#line 1825 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_value_list); -#line 1810 "DataSource.c" +#line 1829 "DataSource.c" } #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp43_ = value_field; @@ -1816,12 +1835,12 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp45_ = _tmp44_; #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp45_ > 0) { -#line 1820 "DataSource.c" - GString* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; +#line 1839 "DataSource.c" + GString* _tmp46_; + const gchar* _tmp47_; + const gchar* _tmp48_; + gchar* _tmp49_; + gchar* _tmp50_; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp46_ = builder; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1836,7 +1855,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { g_string_append (_tmp46_, _tmp50_); #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp50_); -#line 1840 "DataSource.c" +#line 1859 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value_field); @@ -1844,11 +1863,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _g_object_unref0 (values); #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (name); -#line 1848 "DataSource.c" +#line 1867 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_name_it); -#line 1852 "DataSource.c" +#line 1871 "DataSource.c" } #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp52_ = builder; @@ -1860,20 +1879,20 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp55_ = _tmp54_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp55_ > 0) { -#line 1864 "DataSource.c" - GString* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; +#line 1883 "DataSource.c" + GString* _tmp56_; + const gchar* _tmp57_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp56_ = builder; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp57_ = _tmp56_->str; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp51_ = _tmp57_; -#line 1873 "DataSource.c" +#line 1892 "DataSource.c" } else { #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp51_ = NULL; -#line 1877 "DataSource.c" +#line 1896 "DataSource.c" } #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp58_ = g_strdup (_tmp51_); @@ -1883,22 +1902,22 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _g_string_free0 (builder); #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1887 "DataSource.c" +#line 1906 "DataSource.c" } void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated) { - SourceCollection* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + SourceCollection* _tmp0_; + GeeHashMap* _tmp1_; + const gchar* _tmp2_; gchar** lines = NULL; - const gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint lines_length1 = 0; - gint _lines_size_ = 0; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + const gchar* _tmp3_; + gchar** _tmp4_; + gchar** _tmp5_; + gint lines_length1; + gint _lines_size_; + gchar** _tmp6_; + gint _tmp6__length1; #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1919,7 +1938,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink if (_tmp2_ == NULL) { #line 283 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 1923 "DataSource.c" +#line 1942 "DataSource.c" } #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = dehydrated; @@ -1935,7 +1954,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp6_ = lines; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6__length1 = lines_length1; -#line 1939 "DataSource.c" +#line 1958 "DataSource.c" { gchar** line_collection = NULL; gint line_collection_length1 = 0; @@ -1947,41 +1966,41 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink line_collection_length1 = _tmp6__length1; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" for (line_it = 0; line_it < _tmp6__length1; line_it = line_it + 1) { -#line 1951 "DataSource.c" - gchar* _tmp7_ = NULL; +#line 1970 "DataSource.c" + gchar* _tmp7_; gchar* line = NULL; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = g_strdup (line_collection[line_it]); #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" line = _tmp7_; -#line 1958 "DataSource.c" +#line 1977 "DataSource.c" { - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; gchar** tokens = NULL; - const gchar* _tmp11_ = NULL; - gchar** _tmp12_ = NULL; - gchar** _tmp13_ = NULL; - gint tokens_length1 = 0; - gint _tokens_size_ = 0; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; + const gchar* _tmp11_; + gchar** _tmp12_; + gchar** _tmp13_; + gint tokens_length1; + gint _tokens_size_; + gchar** _tmp14_; + gint _tmp14__length1; gchar** decoded_values = NULL; - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - const gchar* _tmp19_ = NULL; - gchar** _tmp20_ = NULL; - gchar** _tmp21_ = NULL; - gint decoded_values_length1 = 0; - gint _decoded_values_size_ = 0; + gchar** _tmp18_; + gint _tmp18__length1; + const gchar* _tmp19_; + gchar** _tmp20_; + gchar** _tmp21_; + gint decoded_values_length1; + gint _decoded_values_size_; GeeList* values = NULL; - GeeArrayList* _tmp22_ = NULL; - gchar** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - GeeList* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint _tmp34_ = 0; + GeeArrayList* _tmp22_; + gchar** _tmp23_; + gint _tmp23__length1; + GeeList* _tmp32_; + gint _tmp33_; + gint _tmp34_; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = line; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1994,7 +2013,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _g_free0 (line); #line 288 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 1998 "DataSource.c" +#line 2017 "DataSource.c" } #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp11_ = line; @@ -2012,10 +2031,10 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp14__length1 = tokens_length1; #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp14__length1 < 2) { -#line 2016 "DataSource.c" - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; +#line 2035 "DataSource.c" + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp15_ = line; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2033,7 +2052,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _g_free0 (line); #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 2036 "DataSource.c" +#line 2055 "DataSource.c" } #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp18_ = tokens; @@ -2057,7 +2076,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp23_ = decoded_values; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp23__length1 = decoded_values_length1; -#line 2060 "DataSource.c" +#line 2079 "DataSource.c" { gchar** value_collection = NULL; gint value_collection_length1 = 0; @@ -2069,25 +2088,25 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink value_collection_length1 = _tmp23__length1; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" for (value_it = 0; value_it < _tmp23__length1; value_it = value_it + 1) { -#line 2072 "DataSource.c" - gchar* _tmp24_ = NULL; +#line 2091 "DataSource.c" + gchar* _tmp24_; gchar* value = NULL; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp24_ = g_strdup (value_collection[value_it]); #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" value = _tmp24_; -#line 2079 "DataSource.c" +#line 2098 "DataSource.c" { gboolean _tmp25_ = FALSE; - const gchar* _tmp26_ = NULL; + const gchar* _tmp26_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp26_ = value; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp26_ != NULL) { -#line 2087 "DataSource.c" - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; +#line 2106 "DataSource.c" + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp27_ = value; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2096,28 +2115,28 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp29_ = _tmp28_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp25_ = _tmp29_ > 0; -#line 2099 "DataSource.c" +#line 2118 "DataSource.c" } else { #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp25_ = FALSE; -#line 2103 "DataSource.c" +#line 2122 "DataSource.c" } #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp25_) { -#line 2107 "DataSource.c" - GeeList* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; +#line 2126 "DataSource.c" + GeeList* _tmp30_; + const gchar* _tmp31_; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp30_ = values; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp31_ = value; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_); -#line 2116 "DataSource.c" +#line 2135 "DataSource.c" } #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 2120 "DataSource.c" +#line 2139 "DataSource.c" } } } @@ -2129,12 +2148,12 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp34_ = _tmp33_; #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp34_ > 0) { -#line 2132 "DataSource.c" - GeeHashMap* _tmp35_ = NULL; - gchar** _tmp36_ = NULL; - gint _tmp36__length1 = 0; - const gchar* _tmp37_ = NULL; - GeeList* _tmp38_ = NULL; +#line 2151 "DataSource.c" + GeeHashMap* _tmp35_; + gchar** _tmp36_; + gint _tmp36__length1; + const gchar* _tmp37_; + GeeList* _tmp38_; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp35_ = self->priv->backlinks; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2147,7 +2166,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp38_ = values; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp37_, _tmp38_); -#line 2150 "DataSource.c" +#line 2169 "DataSource.c" } #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); @@ -2157,13 +2176,13 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink tokens = (_vala_array_free (tokens, tokens_length1, (GDestroyNotify) g_free), NULL); #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (line); -#line 2160 "DataSource.c" +#line 2179 "DataSource.c" } } } #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL); -#line 2166 "DataSource.c" +#line 2185 "DataSource.c" } @@ -2173,7 +2192,7 @@ static SourceSnapshot* data_source_real_save_snapshot (DataSource* self) { result = NULL; #line 312 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2176 "DataSource.c" +#line 2195 "DataSource.c" } @@ -2182,7 +2201,7 @@ SourceSnapshot* data_source_save_snapshot (DataSource* self) { g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 311 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->save_snapshot (self); -#line 2185 "DataSource.c" +#line 2204 "DataSource.c" } @@ -2191,7 +2210,7 @@ void data_source_internal_mark_for_destroy (DataSource* self) { g_return_if_fail (IS_DATA_SOURCE (self)); #line 317 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->marked_for_destroy = TRUE; -#line 2194 "DataSource.c" +#line 2213 "DataSource.c" } @@ -2201,7 +2220,7 @@ static gboolean data_source_real_internal_delete_backing (DataSource* self, GErr result = TRUE; #line 325 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2204 "DataSource.c" +#line 2223 "DataSource.c" } @@ -2210,13 +2229,13 @@ gboolean data_source_internal_delete_backing (DataSource* self, GError** error) g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 324 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->internal_delete_backing (self, error); -#line 2213 "DataSource.c" +#line 2232 "DataSource.c" } static gboolean data_source_real_equals (DataSource* self, DataSource* source) { gboolean result = FALSE; - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2225,7 +2244,7 @@ static gboolean data_source_real_equals (DataSource* self, DataSource* source) { result = self == _tmp0_; #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2228 "DataSource.c" +#line 2247 "DataSource.c" } @@ -2234,47 +2253,47 @@ gboolean data_source_equals (DataSource* self, DataSource* source) { g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->equals (self, source); -#line 2237 "DataSource.c" +#line 2256 "DataSource.c" } static void data_source_real_destroy (DataSource* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 341 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = self->priv->marked_for_destroy; #line 341 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "marked_for_destroy"); #line 344 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->is_destroyed = TRUE; -#line 2249 "DataSource.c" +#line 2268 "DataSource.c" { gint ctr = 0; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2254 "DataSource.c" +#line 2273 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2261 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; +#line 2280 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2271 "DataSource.c" - gint _tmp2_ = 0; +#line 2290 "DataSource.c" + gint _tmp2_; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2277 "DataSource.c" +#line 2296 "DataSource.c" } #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2288,7 +2307,7 @@ static void data_source_real_destroy (DataSource* self) { if (!(_tmp3_ < _tmp4__length1)) { #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2291 "DataSource.c" +#line 2310 "DataSource.c" } #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2300,18 +2319,18 @@ static void data_source_real_destroy (DataSource* self) { _tmp7_ = _tmp5_[_tmp6_]; #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2303 "DataSource.c" +#line 2322 "DataSource.c" DataView* view = NULL; - DataView** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - DataView* _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - DataView** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - DataView* _tmp14_ = NULL; - DataView* _tmp15_ = NULL; + DataView** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + DataView* _tmp10_; + DataView* _tmp11_; + DataView** _tmp12_; + gint _tmp12__length1; + gint _tmp13_; + DataView* _tmp14_; + DataView* _tmp15_; #line 349 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = self->priv->subscribers; #line 349 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2342,14 +2361,14 @@ static void data_source_real_destroy (DataSource* self) { data_view_notify_unsubscribed (_tmp15_, self); #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (view); -#line 2345 "DataSource.c" +#line 2364 "DataSource.c" } } } } #line 357 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "destroyed"); -#line 2352 "DataSource.c" + g_signal_emit (self, data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL], 0); +#line 2371 "DataSource.c" } @@ -2358,15 +2377,15 @@ void data_source_destroy (DataSource* self) { g_return_if_fail (IS_DATA_SOURCE (self)); #line 340 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->destroy (self); -#line 2361 "DataSource.c" +#line 2380 "DataSource.c" } gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) { gboolean result = FALSE; gboolean ret = FALSE; - gboolean _tmp0_ = FALSE; - SourceCollection* _tmp11_ = NULL; + gboolean _tmp0_; + SourceCollection* _tmp11_; GError * _inner_error_ = NULL; #line 366 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); @@ -2376,18 +2395,18 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) _tmp0_ = delete_backing; #line 368 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { -#line 2379 "DataSource.c" +#line 2398 "DataSource.c" { gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_; + gboolean _tmp3_; #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = data_source_internal_delete_backing (self, &_inner_error_); #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = _tmp2_; #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2390 "DataSource.c" +#line 2409 "DataSource.c" goto __catch50_g_error; } #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2396,9 +2415,9 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) _tmp3_ = ret; #line 371 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp3_) { -#line 2399 "DataSource.c" - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; +#line 2418 "DataSource.c" + gchar* _tmp4_; + gchar* _tmp5_; #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2407,17 +2426,17 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) g_warning ("DataSource.vala:372: Unable to delete backing for %s", _tmp5_); #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp5_); -#line 2410 "DataSource.c" +#line 2429 "DataSource.c" } } goto __finally50; __catch50_g_error: { GError* err = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + gchar* _tmp6_; + gchar* _tmp7_; + GError* _tmp8_; + const gchar* _tmp9_; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" err = _inner_error_; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2438,12 +2457,12 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) ret = FALSE; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_error_free0 (err); -#line 2441 "DataSource.c" +#line 2460 "DataSource.c" } __finally50: #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2446 "DataSource.c" +#line 2465 "DataSource.c" gboolean _tmp10_ = FALSE; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2451,7 +2470,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) g_clear_error (&_inner_error_); #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" return _tmp10_; -#line 2454 "DataSource.c" +#line 2473 "DataSource.c" } } #line 380 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2462,45 +2481,45 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) _tmp11_ = self->priv->unlinked_from_collection; #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp11_ != NULL) { -#line 2465 "DataSource.c" - SourceCollection* _tmp12_ = NULL; +#line 2484 "DataSource.c" + SourceCollection* _tmp12_; #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp12_ = self->priv->unlinked_from_collection; #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_collection_notify_unlinked_destroyed (_tmp12_, self); -#line 2471 "DataSource.c" +#line 2490 "DataSource.c" } #line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = ret; #line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2477 "DataSource.c" +#line 2496 "DataSource.c" } -static void _vala_array_add63 (DataView*** array, int* length, int* size, DataView* value) { +static void _vala_array_add63 (DataView** * array, int* length, int* size, DataView* value) { #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" if ((*length) == (*size)) { #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" *size = (*size) ? (2 * (*size)) : 4; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" *array = g_renew (DataView*, *array, (*size) + 1); -#line 2488 "DataSource.c" +#line 2507 "DataSource.c" } #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" (*array)[(*length)++] = value; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" (*array)[*length] = NULL; -#line 2494 "DataSource.c" +#line 2513 "DataSource.c" } void data_source_internal_subscribe (DataSource* self, DataView* view) { - gboolean _tmp0_ = FALSE; - DataView** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - DataView* _tmp14_ = NULL; - DataView* _tmp15_ = NULL; + gboolean _tmp0_; + DataView** _tmp13_; + gint _tmp13__length1; + DataView* _tmp14_; + DataView* _tmp15_; #line 395 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 395 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2509,35 +2528,35 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp0_ = self->priv->in_contact; #line 396 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (!_tmp0_, "!in_contact"); -#line 2512 "DataSource.c" +#line 2531 "DataSource.c" { gint ctr = 0; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2517 "DataSource.c" +#line 2536 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2524 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; +#line 2543 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2534 "DataSource.c" - gint _tmp2_ = 0; +#line 2553 "DataSource.c" + gint _tmp2_; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2540 "DataSource.c" +#line 2559 "DataSource.c" } #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2551,7 +2570,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { if (!(_tmp3_ < _tmp4__length1)) { #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2554 "DataSource.c" +#line 2573 "DataSource.c" } #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2563,13 +2582,13 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp7_ = _tmp5_[_tmp6_]; #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ == NULL) { -#line 2566 "DataSource.c" - DataView** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - DataView* _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - DataView* _tmp12_ = NULL; +#line 2585 "DataSource.c" + DataView** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + DataView* _tmp10_; + DataView* _tmp11_; + DataView* _tmp12_; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = self->priv->subscribers; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2588,7 +2607,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp12_ = _tmp8_[_tmp9_]; #line 402 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 2591 "DataSource.c" +#line 2610 "DataSource.c" } } } @@ -2603,12 +2622,12 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp15_ = _g_object_ref0 (_tmp14_); #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_array_add63 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_); -#line 2606 "DataSource.c" +#line 2625 "DataSource.c" } void data_source_internal_unsubscribe (DataSource* self, DataView* view) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 411 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 411 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2617,36 +2636,36 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { _tmp0_ = self->priv->in_contact; #line 412 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (!_tmp0_, "!in_contact"); -#line 2620 "DataSource.c" +#line 2639 "DataSource.c" { gint ctr = 0; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2625 "DataSource.c" +#line 2644 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2632 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; - DataView* _tmp8_ = NULL; +#line 2651 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; + DataView* _tmp8_; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2643 "DataSource.c" - gint _tmp2_ = 0; +#line 2662 "DataSource.c" + gint _tmp2_; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2649 "DataSource.c" +#line 2668 "DataSource.c" } #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2660,7 +2679,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { if (!(_tmp3_ < _tmp4__length1)) { #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2663 "DataSource.c" +#line 2682 "DataSource.c" } #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2674,11 +2693,11 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { _tmp8_ = view; #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ == _tmp8_) { -#line 2677 "DataSource.c" - DataView** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gint _tmp10_ = 0; - DataView* _tmp11_ = NULL; +#line 2696 "DataSource.c" + DataView** _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + DataView* _tmp11_; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp9_ = self->priv->subscribers; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2693,7 +2712,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { _tmp11_ = _tmp9_[_tmp10_]; #line 418 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 2696 "DataSource.c" +#line 2715 "DataSource.c" } } } @@ -2702,7 +2721,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 423 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 424 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2711,35 +2730,35 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri _vala_assert (!_tmp0_, "!in_contact"); #line 426 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = TRUE; -#line 2714 "DataSource.c" +#line 2733 "DataSource.c" { gint ctr = 0; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2719 "DataSource.c" +#line 2738 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2726 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; +#line 2745 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2736 "DataSource.c" - gint _tmp2_ = 0; +#line 2755 "DataSource.c" + gint _tmp2_; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2742 "DataSource.c" +#line 2761 "DataSource.c" } #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2753,7 +2772,7 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri if (!(_tmp3_ < _tmp4__length1)) { #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2756 "DataSource.c" +#line 2775 "DataSource.c" } #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2765,13 +2784,13 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri _tmp7_ = _tmp5_[_tmp6_]; #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2768 "DataSource.c" - DataSourceContactSubscriber _tmp8_ = NULL; - void* _tmp8__target = NULL; - DataView** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gint _tmp10_ = 0; - DataView* _tmp11_ = NULL; +#line 2787 "DataSource.c" + DataSourceContactSubscriber _tmp8_; + void* _tmp8__target; + DataView** _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + DataView* _tmp11_; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = contact_subscriber; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2786,19 +2805,19 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri _tmp11_ = _tmp9_[_tmp10_]; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ (_tmp11_, _tmp8__target); -#line 2789 "DataSource.c" +#line 2808 "DataSource.c" } } } } #line 431 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = FALSE; -#line 2796 "DataSource.c" +#line 2815 "DataSource.c" } void data_source_contact_subscribers_alteration (DataSource* self, Alteration* alteration) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 434 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 434 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2809,35 +2828,35 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a _vala_assert (!_tmp0_, "!in_contact"); #line 437 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = TRUE; -#line 2812 "DataSource.c" +#line 2831 "DataSource.c" { gint ctr = 0; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2817 "DataSource.c" +#line 2836 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2824 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; +#line 2843 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2834 "DataSource.c" - gint _tmp2_ = 0; +#line 2853 "DataSource.c" + gint _tmp2_; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2840 "DataSource.c" +#line 2859 "DataSource.c" } #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2851,7 +2870,7 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a if (!(_tmp3_ < _tmp4__length1)) { #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2854 "DataSource.c" +#line 2873 "DataSource.c" } #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2863,12 +2882,12 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a _tmp7_ = _tmp5_[_tmp6_]; #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2866 "DataSource.c" - DataView** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - DataView* _tmp10_ = NULL; - Alteration* _tmp11_ = NULL; +#line 2885 "DataSource.c" + DataView** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + DataView* _tmp10_; + Alteration* _tmp11_; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = self->priv->subscribers; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2881,21 +2900,21 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a _tmp11_ = alteration; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject), _tmp11_); -#line 2884 "DataSource.c" +#line 2903 "DataSource.c" } } } } #line 442 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = FALSE; -#line 2891 "DataSource.c" +#line 2910 "DataSource.c" } static void data_source_real_unlinked (DataSource* self, SourceCollection* sources) { #line 51 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (sources)); -#line 2898 "DataSource.c" +#line 2917 "DataSource.c" } @@ -2914,26 +2933,26 @@ static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, G data1 = closure->data; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data2 = param_values->data[0].v_pointer; -#line 2917 "DataSource.c" +#line 2936 "DataSource.c" } else { #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data1 = param_values->data[0].v_pointer; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data2 = closure->data; -#line 2923 "DataSource.c" +#line 2942 "DataSource.c" } #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" callback = (GMarshalFunc_VOID__DATA_COLLECTION) (marshal_data ? marshal_data : cc->callback); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" callback (data1, value_get_data_collection (param_values + 1), data2); -#line 2929 "DataSource.c" +#line 2948 "DataSource.c" } static void data_source_real_relinked (DataSource* self, SourceCollection* sources) { #line 55 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (sources)); -#line 2936 "DataSource.c" +#line 2955 "DataSource.c" } @@ -2947,35 +2966,35 @@ static void data_source_class_init (DataSourceClass * klass) { #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (DataSourcePrivate)); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) data_source_real_notify_membership_changed; + ((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) data_source_real_notify_membership_changed; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_held_in_tank = (void (*)(DataSource*, SourceHoldingTank*)) data_source_real_notify_held_in_tank; + ((DataSourceClass *) klass)->notify_held_in_tank = (void (*) (DataSource *, SourceHoldingTank*)) data_source_real_notify_held_in_tank; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) data_source_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) data_source_real_notify_altered; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_unlinking = (void (*)(DataSource*, SourceCollection*)) data_source_real_notify_unlinking; + ((DataSourceClass *) klass)->notify_unlinking = (void (*) (DataSource *, SourceCollection*)) data_source_real_notify_unlinking; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_unlinked = (void (*)(DataSource*)) data_source_real_notify_unlinked; + ((DataSourceClass *) klass)->notify_unlinked = (void (*) (DataSource *)) data_source_real_notify_unlinked; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_relinking = (void (*)(DataSource*, SourceCollection*)) data_source_real_notify_relinking; + ((DataSourceClass *) klass)->notify_relinking = (void (*) (DataSource *, SourceCollection*)) data_source_real_notify_relinking; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_relinked = (void (*)(DataSource*)) data_source_real_notify_relinked; + ((DataSourceClass *) klass)->notify_relinked = (void (*) (DataSource *)) data_source_real_notify_relinked; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) data_source_real_get_typename; + ((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) data_source_real_get_typename; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) data_source_real_get_instance_id; + ((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) data_source_real_get_instance_id; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->get_source_id = (gchar* (*)(DataSource*)) data_source_real_get_source_id; + ((DataSourceClass *) klass)->get_source_id = (gchar* (*) (DataSource *)) data_source_real_get_source_id; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->commit_backlinks = (void (*)(DataSource*, SourceCollection*, const gchar*)) data_source_real_commit_backlinks; + ((DataSourceClass *) klass)->commit_backlinks = (void (*) (DataSource *, SourceCollection*, const gchar*)) data_source_real_commit_backlinks; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*)(DataSource*)) data_source_real_save_snapshot; + ((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*) (DataSource *)) data_source_real_save_snapshot; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) data_source_real_internal_delete_backing; + ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) data_source_real_internal_delete_backing; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) data_source_real_equals; + ((DataSourceClass *) klass)->equals = (gboolean (*) (DataSource *, DataSource*)) data_source_real_equals; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) data_source_real_destroy; + ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) data_source_real_destroy; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((DataSourceClass *) klass)->unlinked = data_source_real_unlinked; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2985,17 +3004,17 @@ static void data_source_class_init (DataSourceClass * klass) { #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" G_OBJECT_CLASS (klass)->finalize = data_source_finalize; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("unlinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, unlinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION); + data_source_signals[DATA_SOURCE_UNLINKED_SIGNAL] = g_signal_new ("unlinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, unlinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("relinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, relinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION); + data_source_signals[DATA_SOURCE_RELINKED_SIGNAL] = g_signal_new ("relinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, relinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("destroyed", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, destroyed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 2993 "DataSource.c" + data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL] = g_signal_new ("destroyed", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, destroyed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 3012 "DataSource.c" } static void data_source_instance_init (DataSource * self) { - DataView** _tmp0_ = NULL; + DataView** _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = DATA_SOURCE_GET_PRIVATE (self); #line 42 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3018,11 +3037,11 @@ static void data_source_instance_init (DataSource * self) { self->priv->marked_for_destroy = FALSE; #line 48 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->is_destroyed = FALSE; -#line 3021 "DataSource.c" +#line 3040 "DataSource.c" } -static void data_source_finalize (GObject* obj) { +static void data_source_finalize (GObject * obj) { DataSource * self; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_SOURCE, DataSource); @@ -3034,7 +3053,7 @@ static void data_source_finalize (GObject* obj) { _g_object_unref0 (self->priv->backlinks); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" G_OBJECT_CLASS (data_source_parent_class)->finalize (obj); -#line 3037 "DataSource.c" +#line 3056 "DataSource.c" } @@ -3054,8 +3073,8 @@ static void source_snapshot_real_notify_broken (SourceSnapshot* self) { #line 455 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->snapshot_broken = TRUE; #line 457 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "broken"); -#line 3058 "DataSource.c" + g_signal_emit (self, source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL], 0); +#line 3077 "DataSource.c" } @@ -3064,13 +3083,13 @@ void source_snapshot_notify_broken (SourceSnapshot* self) { g_return_if_fail (IS_SOURCE_SNAPSHOT (self)); #line 454 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_SNAPSHOT_GET_CLASS (self)->notify_broken (self); -#line 3067 "DataSource.c" +#line 3086 "DataSource.c" } gboolean source_snapshot_is_broken (SourceSnapshot* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 460 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_SNAPSHOT (self), FALSE); #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3079,7 +3098,7 @@ gboolean source_snapshot_is_broken (SourceSnapshot* self) { result = _tmp0_; #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3082 "DataSource.c" +#line 3101 "DataSource.c" } @@ -3089,7 +3108,7 @@ SourceSnapshot* source_snapshot_construct (GType object_type) { self = (SourceSnapshot*) g_type_create_instance (object_type); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3092 "DataSource.c" +#line 3111 "DataSource.c" } @@ -3100,7 +3119,7 @@ static void source_snapshot_real_broken (SourceSnapshot* self) { static void value_source_snapshot_init (GValue* value) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3103 "DataSource.c" +#line 3122 "DataSource.c" } @@ -3109,7 +3128,7 @@ static void value_source_snapshot_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (value->data[0].v_pointer); -#line 3112 "DataSource.c" +#line 3131 "DataSource.c" } } @@ -3119,11 +3138,11 @@ static void value_source_snapshot_copy_value (const GValue* src_value, GValue* d if (src_value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_snapshot_ref (src_value->data[0].v_pointer); -#line 3122 "DataSource.c" +#line 3141 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 3126 "DataSource.c" +#line 3145 "DataSource.c" } } @@ -3131,66 +3150,66 @@ static void value_source_snapshot_copy_value (const GValue* src_value, GValue* d static gpointer value_source_snapshot_peek_pointer (const GValue* value) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3134 "DataSource.c" +#line 3153 "DataSource.c" } static gchar* value_source_snapshot_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 3141 "DataSource.c" - SourceSnapshot* object; +#line 3160 "DataSource.c" + SourceSnapshot * object; object = collect_values[0].v_pointer; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3148 "DataSource.c" +#line 3167 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.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 3152 "DataSource.c" +#line 3171 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_snapshot_ref (object); -#line 3156 "DataSource.c" +#line 3175 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3160 "DataSource.c" +#line 3179 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3164 "DataSource.c" +#line 3183 "DataSource.c" } static gchar* value_source_snapshot_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SourceSnapshot** object_p; + SourceSnapshot ** object_p; object_p = collect_values[0].v_pointer; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3175 "DataSource.c" +#line 3194 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 3181 "DataSource.c" +#line 3200 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 3185 "DataSource.c" +#line 3204 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_snapshot_ref (value->data[0].v_pointer); -#line 3189 "DataSource.c" +#line 3208 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3193 "DataSource.c" +#line 3212 "DataSource.c" } @@ -3204,7 +3223,7 @@ GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 3207 "DataSource.c" +#line 3226 "DataSource.c" } @@ -3213,12 +3232,12 @@ gpointer value_get_source_snapshot (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT), NULL); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3216 "DataSource.c" +#line 3235 "DataSource.c" } void value_set_source_snapshot (GValue* value, gpointer v_object) { - SourceSnapshot* old; + SourceSnapshot * old; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT)); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3233,23 +3252,23 @@ void value_set_source_snapshot (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_ref (value->data[0].v_pointer); -#line 3236 "DataSource.c" +#line 3255 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3240 "DataSource.c" +#line 3259 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (old); -#line 3246 "DataSource.c" +#line 3265 "DataSource.c" } } void value_take_source_snapshot (GValue* value, gpointer v_object) { - SourceSnapshot* old; + SourceSnapshot * old; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT)); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3262,17 +3281,17 @@ void value_take_source_snapshot (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 3265 "DataSource.c" +#line 3284 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3269 "DataSource.c" +#line 3288 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (old); -#line 3275 "DataSource.c" +#line 3294 "DataSource.c" } } @@ -3285,12 +3304,12 @@ static void source_snapshot_class_init (SourceSnapshotClass * klass) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (SourceSnapshotPrivate)); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) source_snapshot_real_notify_broken; + ((SourceSnapshotClass *) klass)->notify_broken = (void (*) (SourceSnapshot *)) source_snapshot_real_notify_broken; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((SourceSnapshotClass *) klass)->broken = source_snapshot_real_broken; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("broken", TYPE_SOURCE_SNAPSHOT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceSnapshotClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3293 "DataSource.c" + source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_SOURCE_SNAPSHOT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceSnapshotClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 3312 "DataSource.c" } @@ -3301,17 +3320,17 @@ static void source_snapshot_instance_init (SourceSnapshot * self) { self->priv->snapshot_broken = FALSE; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 3304 "DataSource.c" +#line 3323 "DataSource.c" } -static void source_snapshot_finalize (SourceSnapshot* obj) { +static void source_snapshot_finalize (SourceSnapshot * obj) { SourceSnapshot * self; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_SNAPSHOT, SourceSnapshot); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_handlers_destroy (self); -#line 3314 "DataSource.c" +#line 3333 "DataSource.c" } @@ -3330,18 +3349,18 @@ GType source_snapshot_get_type (void) { gpointer source_snapshot_ref (gpointer instance) { - SourceSnapshot* self; + SourceSnapshot * self; self = instance; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 3339 "DataSource.c" +#line 3358 "DataSource.c" } void source_snapshot_unref (gpointer instance) { - SourceSnapshot* self; + SourceSnapshot * self; self = instance; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3349,7 +3368,7 @@ void source_snapshot_unref (gpointer instance) { SOURCE_SNAPSHOT_GET_CLASS (self)->finalize (self); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3352 "DataSource.c" +#line 3371 "DataSource.c" } } @@ -3357,35 +3376,35 @@ void source_snapshot_unref (gpointer instance) { static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3376 "DataSource.c" +#line 3395 "DataSource.c" } SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, const gchar* value) { SourceBacklink* self = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (name != NULL, NULL); #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3418,31 +3437,31 @@ SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, self->priv->_value = _tmp6_; #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3421 "DataSource.c" +#line 3440 "DataSource.c" } SourceBacklink* source_backlink_new (const gchar* name, const gchar* value) { #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" return source_backlink_construct (TYPE_SOURCE_BACKLINK, name, value); -#line 3428 "DataSource.c" +#line 3447 "DataSource.c" } SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source) { SourceBacklink* self = NULL; - DataSource* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; - gint64 _tmp5_ = 0LL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + DataSource* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + DataSource* _tmp4_; + gint64 _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3487,34 +3506,34 @@ SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSo _vala_assert (_tmp11_, "validate_name_value(_name, _value)"); #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3490 "DataSource.c" +#line 3509 "DataSource.c" } SourceBacklink* source_backlink_new_from_source (DataSource* source) { #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" return source_backlink_construct_from_source (TYPE_SOURCE_BACKLINK, source); -#line 3497 "DataSource.c" +#line 3516 "DataSource.c" } static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3517 "DataSource.c" +#line 3536 "DataSource.c" } @@ -3522,8 +3541,8 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + const gchar* _tmp2_; + gboolean _tmp3_; #line 512 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (name != NULL, FALSE); #line 512 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3534,53 +3553,53 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc _tmp3_ = string_contains (_tmp2_, "="); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp3_) { -#line 3537 "DataSource.c" - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 3556 "DataSource.c" + const gchar* _tmp4_; + gboolean _tmp5_; #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = name; #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = string_contains (_tmp4_, "|"); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = !_tmp5_; -#line 3546 "DataSource.c" +#line 3565 "DataSource.c" } else { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; -#line 3550 "DataSource.c" +#line 3569 "DataSource.c" } #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_) { -#line 3554 "DataSource.c" - const gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 3573 "DataSource.c" + const gchar* _tmp6_; + gboolean _tmp7_; #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = value; #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = string_contains (_tmp6_, "|"); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = !_tmp7_; -#line 3563 "DataSource.c" +#line 3582 "DataSource.c" } else { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 3567 "DataSource.c" +#line 3586 "DataSource.c" } #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = _tmp0_; #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3573 "DataSource.c" +#line 3592 "DataSource.c" } gchar* source_backlink_to_string (SourceBacklink* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; #line 516 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL); #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3597,20 +3616,20 @@ gchar* source_backlink_to_string (SourceBacklink* self) { result = _tmp4_; #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3600 "DataSource.c" +#line 3619 "DataSource.c" } guint source_backlink_hash_func (SourceBacklink* backlink) { guint result = 0U; - GHashFunc _tmp0_ = NULL; - SourceBacklink* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GHashFunc _tmp4_ = NULL; - SourceBacklink* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - guint _tmp7_ = 0U; + GHashFunc _tmp0_; + SourceBacklink* _tmp1_; + const gchar* _tmp2_; + guint _tmp3_; + GHashFunc _tmp4_; + SourceBacklink* _tmp5_; + const gchar* _tmp6_; + guint _tmp7_; #line 520 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((backlink == NULL) || IS_SOURCE_BACKLINK (backlink), 0U); #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3633,19 +3652,19 @@ guint source_backlink_hash_func (SourceBacklink* backlink) { result = _tmp3_ ^ _tmp7_; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3636 "DataSource.c" +#line 3655 "DataSource.c" } gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GEqualFunc _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SourceBacklink* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + GEqualFunc _tmp1_; + SourceBacklink* _tmp2_; + const gchar* _tmp3_; + SourceBacklink* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; #line 524 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((alink == NULL) || IS_SOURCE_BACKLINK (alink), FALSE); #line 524 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3664,13 +3683,13 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin _tmp6_ = _tmp1_ (_tmp3_, _tmp5_); #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp6_) { -#line 3667 "DataSource.c" - GEqualFunc _tmp7_ = NULL; - SourceBacklink* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - SourceBacklink* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#line 3686 "DataSource.c" + GEqualFunc _tmp7_; + SourceBacklink* _tmp8_; + const gchar* _tmp9_; + SourceBacklink* _tmp10_; + const gchar* _tmp11_; + gboolean _tmp12_; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = g_str_equal; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3685,23 +3704,23 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin _tmp12_ = _tmp7_ (_tmp9_, _tmp11_); #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp12_; -#line 3688 "DataSource.c" +#line 3707 "DataSource.c" } else { #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 3692 "DataSource.c" +#line 3711 "DataSource.c" } #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = _tmp0_; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3698 "DataSource.c" +#line 3717 "DataSource.c" } const gchar* source_backlink_get_name (SourceBacklink* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 473 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL); #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3710,13 +3729,13 @@ const gchar* source_backlink_get_name (SourceBacklink* self) { result = _tmp0_; #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3713 "DataSource.c" +#line 3732 "DataSource.c" } const gchar* source_backlink_get_value (SourceBacklink* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 479 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL); #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3725,13 +3744,13 @@ const gchar* source_backlink_get_value (SourceBacklink* self) { result = _tmp0_; #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3728 "DataSource.c" +#line 3747 "DataSource.c" } const gchar* source_backlink_get_typename (SourceBacklink* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 486 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL); #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3740,32 +3759,32 @@ const gchar* source_backlink_get_typename (SourceBacklink* self) { result = _tmp0_; #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3743 "DataSource.c" +#line 3762 "DataSource.c" } static gint64 int64_parse (const gchar* str) { gint64 result = 0LL; - const gchar* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gint64 _tmp1_; +#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3761 "DataSource.c" +#line 3780 "DataSource.c" } gint64 source_backlink_get_instance_id (SourceBacklink* self) { gint64 result; - const gchar* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; + const gchar* _tmp0_; + gint64 _tmp1_; #line 493 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), 0LL); #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3776,14 +3795,14 @@ gint64 source_backlink_get_instance_id (SourceBacklink* self) { result = _tmp1_; #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3779 "DataSource.c" +#line 3798 "DataSource.c" } static void value_source_backlink_init (GValue* value) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3786 "DataSource.c" +#line 3805 "DataSource.c" } @@ -3792,7 +3811,7 @@ static void value_source_backlink_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (value->data[0].v_pointer); -#line 3795 "DataSource.c" +#line 3814 "DataSource.c" } } @@ -3802,11 +3821,11 @@ static void value_source_backlink_copy_value (const GValue* src_value, GValue* d if (src_value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_backlink_ref (src_value->data[0].v_pointer); -#line 3805 "DataSource.c" +#line 3824 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 3809 "DataSource.c" +#line 3828 "DataSource.c" } } @@ -3814,66 +3833,66 @@ static void value_source_backlink_copy_value (const GValue* src_value, GValue* d static gpointer value_source_backlink_peek_pointer (const GValue* value) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3817 "DataSource.c" +#line 3836 "DataSource.c" } static gchar* value_source_backlink_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 3824 "DataSource.c" - SourceBacklink* object; +#line 3843 "DataSource.c" + SourceBacklink * object; object = collect_values[0].v_pointer; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3831 "DataSource.c" +#line 3850 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.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 3835 "DataSource.c" +#line 3854 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_backlink_ref (object); -#line 3839 "DataSource.c" +#line 3858 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3843 "DataSource.c" +#line 3862 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3847 "DataSource.c" +#line 3866 "DataSource.c" } static gchar* value_source_backlink_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SourceBacklink** object_p; + SourceBacklink ** object_p; object_p = collect_values[0].v_pointer; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3858 "DataSource.c" +#line 3877 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 3864 "DataSource.c" +#line 3883 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 3868 "DataSource.c" +#line 3887 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_backlink_ref (value->data[0].v_pointer); -#line 3872 "DataSource.c" +#line 3891 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3876 "DataSource.c" +#line 3895 "DataSource.c" } @@ -3887,7 +3906,7 @@ GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 3890 "DataSource.c" +#line 3909 "DataSource.c" } @@ -3896,12 +3915,12 @@ gpointer value_get_source_backlink (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK), NULL); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3899 "DataSource.c" +#line 3918 "DataSource.c" } void value_set_source_backlink (GValue* value, gpointer v_object) { - SourceBacklink* old; + SourceBacklink * old; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK)); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3916,23 +3935,23 @@ void value_set_source_backlink (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_ref (value->data[0].v_pointer); -#line 3919 "DataSource.c" +#line 3938 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3923 "DataSource.c" +#line 3942 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (old); -#line 3929 "DataSource.c" +#line 3948 "DataSource.c" } } void value_take_source_backlink (GValue* value, gpointer v_object) { - SourceBacklink* old; + SourceBacklink * old; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK)); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3945,17 +3964,17 @@ void value_take_source_backlink (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 3948 "DataSource.c" +#line 3967 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3952 "DataSource.c" +#line 3971 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (old); -#line 3958 "DataSource.c" +#line 3977 "DataSource.c" } } @@ -3967,7 +3986,7 @@ static void source_backlink_class_init (SourceBacklinkClass * klass) { ((SourceBacklinkClass *) klass)->finalize = source_backlink_finalize; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (SourceBacklinkPrivate)); -#line 3970 "DataSource.c" +#line 3989 "DataSource.c" } @@ -3976,11 +3995,11 @@ static void source_backlink_instance_init (SourceBacklink * self) { self->priv = SOURCE_BACKLINK_GET_PRIVATE (self); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 3979 "DataSource.c" +#line 3998 "DataSource.c" } -static void source_backlink_finalize (SourceBacklink* obj) { +static void source_backlink_finalize (SourceBacklink * obj) { SourceBacklink * self; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_BACKLINK, SourceBacklink); @@ -3990,7 +4009,7 @@ static void source_backlink_finalize (SourceBacklink* obj) { _g_free0 (self->priv->_name); #line 470 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_value); -#line 3993 "DataSource.c" +#line 4012 "DataSource.c" } @@ -4009,18 +4028,18 @@ GType source_backlink_get_type (void) { gpointer source_backlink_ref (gpointer instance) { - SourceBacklink* self; + SourceBacklink * self; self = instance; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 4018 "DataSource.c" +#line 4037 "DataSource.c" } void source_backlink_unref (gpointer instance) { - SourceBacklink* self; + SourceBacklink * self; self = instance; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -4028,7 +4047,7 @@ void source_backlink_unref (gpointer instance) { SOURCE_BACKLINK_GET_CLASS (self)->finalize (self); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4031 "DataSource.c" +#line 4050 "DataSource.c" } } @@ -4036,32 +4055,32 @@ void source_backlink_unref (gpointer instance) { static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { #line 588 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_source_added ((SourceProxy*) self, added); -#line 4039 "DataSource.c" +#line 4058 "DataSource.c" } static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, gpointer self) { #line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_snapshot_broken ((SourceProxy*) self); -#line 4046 "DataSource.c" +#line 4065 "DataSource.c" } SourceProxy* source_proxy_construct (GType object_type, DataSource* source) { SourceProxy* self = NULL; - DataSource* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - DataSource* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; - SourceSnapshot* _tmp5_ = NULL; - SourceSnapshot* _tmp6_ = NULL; - SourceSnapshot* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - DataCollection* _tmp10_ = NULL; - SourceCollection* _tmp11_ = NULL; - SourceCollection* _tmp12_ = NULL; + DataSource* _tmp0_; + gint64 _tmp1_; + DataSource* _tmp2_; + gchar* _tmp3_; + DataSource* _tmp4_; + SourceSnapshot* _tmp5_; + SourceSnapshot* _tmp6_; + SourceSnapshot* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + DataCollection* _tmp10_; + SourceCollection* _tmp11_; + SourceCollection* _tmp12_; #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4118,7 +4137,7 @@ SourceProxy* source_proxy_construct (GType object_type, DataSource* source) { g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _source_proxy_on_source_added_data_collection_items_added, self); #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 4121 "DataSource.c" +#line 4140 "DataSource.c" } @@ -4127,7 +4146,7 @@ static DataSource* source_proxy_real_reconstitute (SourceProxy* self, gint64 obj g_critical ("Type `%s' does not implement abstract method `source_proxy_reconstitute'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4130 "DataSource.c" +#line 4149 "DataSource.c" } @@ -4136,19 +4155,19 @@ DataSource* source_proxy_reconstitute (SourceProxy* self, gint64 object_id, Sour g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL); #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" return SOURCE_PROXY_GET_CLASS (self)->reconstitute (self, object_id, snapshot); -#line 4139 "DataSource.c" +#line 4158 "DataSource.c" } static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSource* source) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = source; #line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "reconstituted", _tmp0_); -#line 4151 "DataSource.c" + g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL], 0, _tmp0_); +#line 4170 "DataSource.c" } @@ -4157,14 +4176,14 @@ void source_proxy_notify_reconstituted (SourceProxy* self, DataSource* source) { g_return_if_fail (IS_SOURCE_PROXY (self)); #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_reconstituted (self, source); -#line 4160 "DataSource.c" +#line 4179 "DataSource.c" } static void source_proxy_real_notify_dehydrated (SourceProxy* self) { #line 598 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "dehydrated"); -#line 4167 "DataSource.c" + g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL], 0); +#line 4186 "DataSource.c" } @@ -4173,14 +4192,14 @@ void source_proxy_notify_dehydrated (SourceProxy* self) { g_return_if_fail (IS_SOURCE_PROXY (self)); #line 597 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_dehydrated (self); -#line 4176 "DataSource.c" +#line 4195 "DataSource.c" } static void source_proxy_real_notify_broken (SourceProxy* self) { #line 602 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "broken"); -#line 4183 "DataSource.c" + g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL], 0); +#line 4202 "DataSource.c" } @@ -4189,7 +4208,7 @@ void source_proxy_notify_broken (SourceProxy* self) { g_return_if_fail (IS_SOURCE_PROXY (self)); #line 601 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_broken (self); -#line 4192 "DataSource.c" +#line 4211 "DataSource.c" } @@ -4200,21 +4219,21 @@ static void source_proxy_on_snapshot_broken (SourceProxy* self) { source_proxy_drop_source (self); #line 608 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_notify_broken (self); -#line 4203 "DataSource.c" +#line 4222 "DataSource.c" } static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) { #line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_destroyed ((SourceProxy*) self); -#line 4210 "DataSource.c" +#line 4229 "DataSource.c" } static void source_proxy_set_source (SourceProxy* self, DataSource* source) { - DataSource* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - DataSource* _tmp2_ = NULL; + DataSource* _tmp0_; + DataSource* _tmp1_; + DataSource* _tmp2_; #line 611 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 611 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4233,14 +4252,14 @@ static void source_proxy_set_source (SourceProxy* self, DataSource* source) { _tmp2_ = source; #line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_connect (_tmp2_, "destroyed", (GCallback) _source_proxy_on_destroyed_data_source_destroyed, self); -#line 4236 "DataSource.c" +#line 4255 "DataSource.c" } static void source_proxy_drop_source (SourceProxy* self) { - DataSource* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - guint _tmp2_ = 0U; + DataSource* _tmp0_; + DataSource* _tmp1_; + guint _tmp2_; #line 618 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 619 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4249,7 +4268,7 @@ static void source_proxy_drop_source (SourceProxy* self) { if (_tmp0_ == NULL) { #line 620 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 4252 "DataSource.c" +#line 4271 "DataSource.c" } #line 622 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->source; @@ -4261,32 +4280,32 @@ static void source_proxy_drop_source (SourceProxy* self) { _g_object_unref0 (self->priv->source); #line 623 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->source = NULL; -#line 4264 "DataSource.c" +#line 4283 "DataSource.c" } DataSource* source_proxy_get_source (SourceProxy* self) { DataSource* result = NULL; - SourceSnapshot* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - DataSource* _tmp2_ = NULL; + SourceSnapshot* _tmp0_; + gboolean _tmp1_; + DataSource* _tmp2_; DataSource* new_source = NULL; - gint64 _tmp5_ = 0LL; - SourceSnapshot* _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - gint64 _tmp12_ = 0LL; - DataSource* _tmp13_ = NULL; - gint64 _tmp14_ = 0LL; - DataSource* _tmp17_ = NULL; - gint64 _tmp18_ = 0LL; - gint64 _tmp19_ = 0LL; - SourceCollection* _tmp20_ = NULL; - DataSource* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - DataSource* _tmp23_ = NULL; - DataSource* _tmp24_ = NULL; + gint64 _tmp5_; + SourceSnapshot* _tmp6_; + DataSource* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + gint64 _tmp12_; + DataSource* _tmp13_; + gint64 _tmp14_; + DataSource* _tmp17_; + gint64 _tmp18_; + gint64 _tmp19_; + SourceCollection* _tmp20_; + DataSource* _tmp21_; + gboolean _tmp22_; + DataSource* _tmp23_; + DataSource* _tmp24_; #line 626 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL); #line 627 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4299,15 +4318,15 @@ DataSource* source_proxy_get_source (SourceProxy* self) { result = NULL; #line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4302 "DataSource.c" +#line 4321 "DataSource.c" } #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->source; #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp2_ != NULL) { -#line 4308 "DataSource.c" - DataSource* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; +#line 4327 "DataSource.c" + DataSource* _tmp3_; + DataSource* _tmp4_; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = self->priv->source; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4316,7 +4335,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) { result = _tmp4_; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4319 "DataSource.c" +#line 4338 "DataSource.c" } #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->object_id; @@ -4332,9 +4351,9 @@ DataSource* source_proxy_get_source (SourceProxy* self) { _tmp9_ = new_source; #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp8_ != _tmp9_) { -#line 4335 "DataSource.c" - DataSource* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; +#line 4354 "DataSource.c" + DataSource* _tmp10_; + DataSource* _tmp11_; #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp10_ = new_source; #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4343,7 +4362,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) { _g_object_unref0 (self->priv->source); #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->source = _tmp11_; -#line 4346 "DataSource.c" +#line 4365 "DataSource.c" } #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp12_ = self->priv->object_id; @@ -4353,16 +4372,16 @@ DataSource* source_proxy_get_source (SourceProxy* self) { _tmp14_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp12_ != _tmp14_) { -#line 4356 "DataSource.c" - DataSource* _tmp15_ = NULL; - gint64 _tmp16_ = 0LL; +#line 4375 "DataSource.c" + DataSource* _tmp15_; + gint64 _tmp16_; #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp15_ = new_source; #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp16_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)); #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->object_id = _tmp16_; -#line 4365 "DataSource.c" +#line 4384 "DataSource.c" } #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp17_ = self->priv->source; @@ -4390,12 +4409,12 @@ DataSource* source_proxy_get_source (SourceProxy* self) { _g_object_unref0 (new_source); #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4393 "DataSource.c" +#line 4412 "DataSource.c" } static void source_proxy_on_destroyed (SourceProxy* self) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 647 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 648 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4406,12 +4425,12 @@ static void source_proxy_on_destroyed (SourceProxy* self) { source_proxy_drop_source (self); #line 653 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_notify_dehydrated (self); -#line 4409 "DataSource.c" +#line 4428 "DataSource.c" } static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 656 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 656 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4422,12 +4441,12 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) if (_tmp0_ != NULL) { #line 659 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 4425 "DataSource.c" +#line 4444 "DataSource.c" } { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeIterable* _tmp1_; + GeeIterator* _tmp2_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = added; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4436,17 +4455,17 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) _object_it = _tmp2_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 4439 "DataSource.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 4458 "DataSource.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; - gint64 _tmp8_ = 0LL; - gint64 _tmp9_ = 0LL; - DataObject* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataObject* _tmp7_; + gint64 _tmp8_; + gint64 _tmp9_; + DataObject* _tmp10_; + DataObject* _tmp11_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = _object_it; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4455,7 +4474,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) if (!_tmp4_) { #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 4458 "DataSource.c" +#line 4477 "DataSource.c" } #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = _object_it; @@ -4475,7 +4494,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) _g_object_unref0 (object); #line 664 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 4478 "DataSource.c" +#line 4497 "DataSource.c" } #line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp10_ = object; @@ -4489,11 +4508,11 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) _g_object_unref0 (object); #line 671 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 4492 "DataSource.c" +#line 4511 "DataSource.c" } #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_object_it); -#line 4496 "DataSource.c" +#line 4515 "DataSource.c" } } @@ -4501,7 +4520,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source) { #line 558 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 4504 "DataSource.c" +#line 4523 "DataSource.c" } @@ -4516,7 +4535,7 @@ static void source_proxy_real_broken (SourceProxy* self) { static void value_source_proxy_init (GValue* value) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4519 "DataSource.c" +#line 4538 "DataSource.c" } @@ -4525,7 +4544,7 @@ static void value_source_proxy_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (value->data[0].v_pointer); -#line 4528 "DataSource.c" +#line 4547 "DataSource.c" } } @@ -4535,11 +4554,11 @@ static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest if (src_value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_proxy_ref (src_value->data[0].v_pointer); -#line 4538 "DataSource.c" +#line 4557 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 4542 "DataSource.c" +#line 4561 "DataSource.c" } } @@ -4547,66 +4566,66 @@ static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest static gpointer value_source_proxy_peek_pointer (const GValue* value) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 4550 "DataSource.c" +#line 4569 "DataSource.c" } static gchar* value_source_proxy_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 4557 "DataSource.c" - SourceProxy* object; +#line 4576 "DataSource.c" + SourceProxy * object; object = collect_values[0].v_pointer; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4564 "DataSource.c" +#line 4583 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.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 4568 "DataSource.c" +#line 4587 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_proxy_ref (object); -#line 4572 "DataSource.c" +#line 4591 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4576 "DataSource.c" +#line 4595 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4580 "DataSource.c" +#line 4599 "DataSource.c" } static gchar* value_source_proxy_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SourceProxy** object_p; + SourceProxy ** object_p; object_p = collect_values[0].v_pointer; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4591 "DataSource.c" +#line 4610 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 4597 "DataSource.c" +#line 4616 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 4601 "DataSource.c" +#line 4620 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_proxy_ref (value->data[0].v_pointer); -#line 4605 "DataSource.c" +#line 4624 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4609 "DataSource.c" +#line 4628 "DataSource.c" } @@ -4620,7 +4639,7 @@ GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 4623 "DataSource.c" +#line 4642 "DataSource.c" } @@ -4629,12 +4648,12 @@ gpointer value_get_source_proxy (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY), NULL); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 4632 "DataSource.c" +#line 4651 "DataSource.c" } void value_set_source_proxy (GValue* value, gpointer v_object) { - SourceProxy* old; + SourceProxy * old; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY)); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4649,23 +4668,23 @@ void value_set_source_proxy (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_ref (value->data[0].v_pointer); -#line 4652 "DataSource.c" +#line 4671 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4656 "DataSource.c" +#line 4675 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (old); -#line 4662 "DataSource.c" +#line 4681 "DataSource.c" } } void value_take_source_proxy (GValue* value, gpointer v_object) { - SourceProxy* old; + SourceProxy * old; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY)); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4678,17 +4697,17 @@ void value_take_source_proxy (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 4681 "DataSource.c" +#line 4700 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4685 "DataSource.c" +#line 4704 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (old); -#line 4691 "DataSource.c" +#line 4710 "DataSource.c" } } @@ -4701,13 +4720,13 @@ static void source_proxy_class_init (SourceProxyClass * klass) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (SourceProxyPrivate)); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) source_proxy_real_reconstitute; + ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*) (SourceProxy *, gint64, SourceSnapshot*)) source_proxy_real_reconstitute; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceProxyClass *) klass)->notify_reconstituted = (void (*)(SourceProxy*, DataSource*)) source_proxy_real_notify_reconstituted; + ((SourceProxyClass *) klass)->notify_reconstituted = (void (*) (SourceProxy *, DataSource*)) source_proxy_real_notify_reconstituted; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceProxyClass *) klass)->notify_dehydrated = (void (*)(SourceProxy*)) source_proxy_real_notify_dehydrated; + ((SourceProxyClass *) klass)->notify_dehydrated = (void (*) (SourceProxy *)) source_proxy_real_notify_dehydrated; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceProxyClass *) klass)->notify_broken = (void (*)(SourceProxy*)) source_proxy_real_notify_broken; + ((SourceProxyClass *) klass)->notify_broken = (void (*) (SourceProxy *)) source_proxy_real_notify_broken; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((SourceProxyClass *) klass)->reconstituted = source_proxy_real_reconstituted; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4715,12 +4734,12 @@ static void source_proxy_class_init (SourceProxyClass * klass) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((SourceProxyClass *) klass)->broken = source_proxy_real_broken; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("reconstituted", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, reconstituted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); + source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL] = g_signal_new ("reconstituted", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, reconstituted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("dehydrated", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, dehydrated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL] = g_signal_new ("dehydrated", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, dehydrated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("broken", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4723 "DataSource.c" + source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 4742 "DataSource.c" } @@ -4729,14 +4748,14 @@ static void source_proxy_instance_init (SourceProxy * self) { self->priv = SOURCE_PROXY_GET_PRIVATE (self); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 4732 "DataSource.c" +#line 4751 "DataSource.c" } -static void source_proxy_finalize (SourceProxy* obj) { +static void source_proxy_finalize (SourceProxy * obj) { SourceProxy * self; - SourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; + SourceCollection* _tmp0_; + guint _tmp1_; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_PROXY, SourceProxy); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4757,7 +4776,7 @@ static void source_proxy_finalize (SourceProxy* obj) { _source_snapshot_unref0 (self->priv->snapshot); #line 554 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (self->priv->membership); -#line 4760 "DataSource.c" +#line 4779 "DataSource.c" } @@ -4776,18 +4795,18 @@ GType source_proxy_get_type (void) { gpointer source_proxy_ref (gpointer instance) { - SourceProxy* self; + SourceProxy * self; self = instance; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 4785 "DataSource.c" +#line 4804 "DataSource.c" } void source_proxy_unref (gpointer instance) { - SourceProxy* self; + SourceProxy * self; self = instance; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -4795,7 +4814,7 @@ void source_proxy_unref (gpointer instance) { SOURCE_PROXY_GET_CLASS (self)->finalize (self); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4798 "DataSource.c" +#line 4817 "DataSource.c" } } @@ -4805,7 +4824,7 @@ SourceProxy* proxyable_get_proxy (Proxyable* self) { g_return_val_if_fail (IS_PROXYABLE (self), NULL); #line 677 "/home/jens/Source/shotwell/src/core/DataSource.vala" return PROXYABLE_GET_INTERFACE (self)->get_proxy (self); -#line 4808 "DataSource.c" +#line 4827 "DataSource.c" } @@ -4816,7 +4835,7 @@ static void proxyable_base_init (ProxyableIface * iface) { if (!initialized) { #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala" initialized = TRUE; -#line 4819 "DataSource.c" +#line 4838 "DataSource.c" } } -- cgit v1.2.3