diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
| commit | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch) | |
| tree | 26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/core/SourceCollection.c | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | dd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/core/SourceCollection.c')
| -rw-r--r-- | src/core/SourceCollection.c | 548 |
1 files changed, 279 insertions, 269 deletions
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 96c0bfd..0e96c86 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -1,4 +1,4 @@ -/* SourceCollection.c generated by valac 0.34.7, the Vala compiler +/* SourceCollection.c generated by valac 0.36.6, the Vala compiler * generated from SourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -116,6 +116,16 @@ typedef struct _SourceCollectionDestroyCounter SourceCollectionDestroyCounter; typedef struct _SourceCollectionDestroyCounterClass SourceCollectionDestroyCounterClass; typedef struct _SourceCollectionDestroyCounterPrivate SourceCollectionDestroyCounterPrivate; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +enum { + SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL, + SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL, + SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL, + SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL, + SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL, + SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL, + SOURCE_COLLECTION_LAST_SIGNAL +}; +static guint source_collection_signals[SOURCE_COLLECTION_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -321,13 +331,13 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo enum { SOURCE_COLLECTION_DESTROY_COUNTER_DUMMY_PROPERTY }; -static void source_collection_destroy_counter_finalize (GObject* obj); -static void source_collection_finalize (DataCollection* obj); +static void source_collection_destroy_counter_finalize (GObject * obj); +static void source_collection_finalize (DataCollection * obj); SourceCollection* source_collection_construct (GType object_type, const gchar* name) { SourceCollection* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 51 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -336,7 +346,7 @@ SourceCollection* source_collection_construct (GType object_type, const gchar* n self = (SourceCollection*) data_collection_construct (object_type, _tmp0_); #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 340 "SourceCollection.c" +#line 350 "SourceCollection.c" } @@ -346,7 +356,7 @@ static gboolean source_collection_real_holds_type_of_source (SourceCollection* s g_critical ("Type `%s' does not implement abstract method `source_collection_holds_type_of_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return _tmp0_; -#line 350 "SourceCollection.c" +#line 360 "SourceCollection.c" } @@ -355,19 +365,19 @@ gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSou g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return SOURCE_COLLECTION_GET_CLASS (self)->holds_type_of_source (self, source); -#line 359 "SourceCollection.c" +#line 369 "SourceCollection.c" } static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (unlinking)); #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = unlinking; #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit_by_name (self, "items-unlinking", _tmp0_); -#line 371 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, _tmp0_); +#line 381 "SourceCollection.c" } @@ -376,19 +386,19 @@ void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollec g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_unlinking (self, unlinking); -#line 380 "SourceCollection.c" +#line 390 "SourceCollection.c" } static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relinked)); #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = relinked; #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit_by_name (self, "items-relinked", _tmp0_); -#line 392 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, _tmp0_); +#line 402 "SourceCollection.c" } @@ -397,19 +407,19 @@ void source_collection_notify_items_relinked (SourceCollection* self, GeeCollect g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_relinked (self, relinked); -#line 401 "SourceCollection.c" +#line 411 "SourceCollection.c" } static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = source; #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit_by_name (self, "item-destroyed", _tmp0_); -#line 413 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, _tmp0_); +#line 423 "SourceCollection.c" } @@ -418,19 +428,19 @@ void source_collection_notify_item_destroyed (SourceCollection* self, DataSource g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_item_destroyed (self, source); -#line 422 "SourceCollection.c" +#line 432 "SourceCollection.c" } static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = destroyed; #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit_by_name (self, "items-destroyed", _tmp0_); -#line 434 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, _tmp0_); +#line 444 "SourceCollection.c" } @@ -439,19 +449,19 @@ void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollec g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_destroyed (self, destroyed); -#line 443 "SourceCollection.c" +#line 453 "SourceCollection.c" } static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (unlinked)); #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = unlinked; #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit_by_name (self, "unlinked-destroyed", _tmp0_); -#line 455 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, _tmp0_); +#line 465 "SourceCollection.c" } @@ -460,13 +470,13 @@ void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSo g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_unlinked_destroyed (self, unlinked); -#line 464 "SourceCollection.c" +#line 474 "SourceCollection.c" } static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { - SourceBacklink* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + SourceBacklink* _tmp0_; + GeeCollection* _tmp1_; #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -476,8 +486,8 @@ static void source_collection_real_notify_backlink_removed (SourceCollection* se #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = sources; #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit_by_name (self, "backlink-removed", _tmp0_, _tmp1_); -#line 481 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); +#line 491 "SourceCollection.c" } @@ -486,14 +496,14 @@ void source_collection_notify_backlink_removed (SourceCollection* self, SourceBa g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_removed (self, backlink, sources); -#line 490 "SourceCollection.c" +#line 500 "SourceCollection.c" } static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object) { SourceCollection * self; gboolean result = FALSE; - DataObject* _tmp0_ = NULL; + DataObject* _tmp0_; #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SOURCE_COLLECTION, SourceCollection); #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -504,7 +514,7 @@ static gboolean source_collection_real_valid_type (DataCollection* base, DataObj result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_SOURCE); #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 508 "SourceCollection.c" +#line 518 "SourceCollection.c" } @@ -513,7 +523,7 @@ static gboolean _source_collection_destroy_and_delete_source_marked_action (Data result = source_collection_destroy_and_delete_source ((SourceCollection*) self, object, user); #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 517 "SourceCollection.c" +#line 527 "SourceCollection.c" } @@ -522,34 +532,34 @@ static gboolean _source_collection_destroy_source_marked_action (DataObject* obj result = source_collection_destroy_source ((SourceCollection*) self, object, user); #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 526 "SourceCollection.c" +#line 536 "SourceCollection.c" } static gpointer _g_object_ref0 (gpointer self) { #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 533 "SourceCollection.c" +#line 543 "SourceCollection.c" } gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { gint result = 0; SourceCollectionDestroyCounter* counter = NULL; - Marker* _tmp0_ = NULL; - Marker* _tmp1_ = NULL; - SourceCollectionDestroyCounter* _tmp2_ = NULL; - SourceCollectionDestroyCounter* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - SourceCollectionDestroyCounter* _tmp24_ = NULL; - GeeArrayList* _tmp25_ = NULL; - SourceCollectionDestroyCounter* _tmp26_ = NULL; - Marker* _tmp27_ = NULL; - GeeList* _tmp28_ = NULL; - SourceCollectionDestroyCounter* _tmp32_ = NULL; - GeeArrayList* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; + Marker* _tmp0_; + Marker* _tmp1_; + SourceCollectionDestroyCounter* _tmp2_; + SourceCollectionDestroyCounter* _tmp3_; + gboolean _tmp4_; + SourceCollectionDestroyCounter* _tmp24_; + GeeArrayList* _tmp25_; + SourceCollectionDestroyCounter* _tmp26_; + Marker* _tmp27_; + GeeList* _tmp28_; + SourceCollectionDestroyCounter* _tmp32_; + GeeArrayList* _tmp33_; + gint _tmp34_; + gint _tmp35_; #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), 0); #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -572,11 +582,11 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp4_ = delete_backing; #line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp4_) { -#line 576 "SourceCollection.c" - Marker* _tmp5_ = NULL; - ProgressMonitor _tmp6_ = NULL; - void* _tmp6__target = NULL; - SourceCollectionDestroyCounter* _tmp7_ = NULL; +#line 586 "SourceCollection.c" + Marker* _tmp5_; + ProgressMonitor _tmp6_; + void* _tmp6__target; + SourceCollectionDestroyCounter* _tmp7_; #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp5_ = marker; #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -587,12 +597,12 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp7_ = counter; #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_, _source_collection_destroy_and_delete_source_marked_action, self, _tmp6_, _tmp6__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject)); -#line 591 "SourceCollection.c" +#line 601 "SourceCollection.c" } else { - Marker* _tmp8_ = NULL; - ProgressMonitor _tmp9_ = NULL; - void* _tmp9__target = NULL; - SourceCollectionDestroyCounter* _tmp10_ = NULL; + Marker* _tmp8_; + ProgressMonitor _tmp9_; + void* _tmp9__target; + SourceCollectionDestroyCounter* _tmp10_; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp8_ = marker; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -603,17 +613,17 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp10_ = counter; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_, _source_collection_destroy_source_marked_action, self, _tmp9_, _tmp9__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_OBJECT, GObject)); -#line 607 "SourceCollection.c" +#line 617 "SourceCollection.c" } { GeeArrayList* _source_list = NULL; - SourceCollectionDestroyCounter* _tmp11_ = NULL; - GeeArrayList* _tmp12_ = NULL; - GeeArrayList* _tmp13_ = NULL; + SourceCollectionDestroyCounter* _tmp11_; + GeeArrayList* _tmp12_; + GeeArrayList* _tmp13_; gint _source_size = 0; - GeeArrayList* _tmp14_ = NULL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; + GeeArrayList* _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _source_index = 0; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp11_ = counter; @@ -635,15 +645,15 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _source_index = -1; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 639 "SourceCollection.c" - gint _tmp17_ = 0; - gint _tmp18_ = 0; - gint _tmp19_ = 0; +#line 649 "SourceCollection.c" + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; DataSource* source = NULL; - GeeArrayList* _tmp20_ = NULL; - gint _tmp21_ = 0; - gpointer _tmp22_ = NULL; - DataSource* _tmp23_ = NULL; + GeeArrayList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; + DataSource* _tmp23_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp17_ = _source_index; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -656,7 +666,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g if (!(_tmp18_ < _tmp19_)) { #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 660 "SourceCollection.c" +#line 670 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp20_ = _source_list; @@ -672,11 +682,11 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g source_collection_notify_item_destroyed (self, _tmp23_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 676 "SourceCollection.c" +#line 686 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 680 "SourceCollection.c" +#line 690 "SourceCollection.c" } #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp24_ = counter; @@ -694,10 +704,10 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp28_ = not_removed; #line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (NULL != _tmp28_) { -#line 698 "SourceCollection.c" - GeeList* _tmp29_ = NULL; - SourceCollectionDestroyCounter* _tmp30_ = NULL; - GeeArrayList* _tmp31_ = NULL; +#line 708 "SourceCollection.c" + GeeList* _tmp29_; + SourceCollectionDestroyCounter* _tmp30_; + GeeArrayList* _tmp31_; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp29_ = not_removed; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -706,7 +716,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp31_ = _tmp30_->not_removed; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 710 "SourceCollection.c" +#line 720 "SourceCollection.c" } #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp32_ = counter; @@ -722,7 +732,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _g_object_unref0 (counter); #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 726 "SourceCollection.c" +#line 736 "SourceCollection.c" } @@ -730,11 +740,11 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s gboolean result = FALSE; gboolean success = FALSE; gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + gboolean _tmp5_; gboolean _tmp10_ = FALSE; - DataObject* _tmp11_ = NULL; - GObject* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + DataObject* _tmp11_; + GObject* _tmp12_; + gboolean _tmp13_; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); @@ -744,11 +754,11 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 113 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = FALSE; -#line 748 "SourceCollection.c" +#line 758 "SourceCollection.c" { gboolean _tmp0_ = FALSE; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + DataObject* _tmp1_; + gboolean _tmp2_; #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = object; #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -757,12 +767,12 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _tmp0_ = _tmp2_; #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 761 "SourceCollection.c" +#line 771 "SourceCollection.c" goto __catch49_g_error; } #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = _tmp0_; -#line 766 "SourceCollection.c" +#line 776 "SourceCollection.c" } goto __finally49; __catch49_g_error: @@ -776,12 +786,12 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s success = FALSE; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_error_free0 (err); -#line 780 "SourceCollection.c" +#line 790 "SourceCollection.c" } __finally49: #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 785 "SourceCollection.c" +#line 795 "SourceCollection.c" gboolean _tmp3_ = FALSE; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.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); @@ -789,30 +799,30 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s g_clear_error (&_inner_error_); #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return _tmp3_; -#line 793 "SourceCollection.c" +#line 803 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp5_ = success; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (!_tmp5_) { -#line 799 "SourceCollection.c" - DataObject* _tmp6_ = NULL; +#line 809 "SourceCollection.c" + DataObject* _tmp6_; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp6_ = object; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE); -#line 805 "SourceCollection.c" +#line 815 "SourceCollection.c" } else { #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp4_ = FALSE; -#line 809 "SourceCollection.c" +#line 819 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp4_) { -#line 813 "SourceCollection.c" - GObject* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; - DataObject* _tmp9_ = NULL; +#line 823 "SourceCollection.c" + GObject* _tmp7_; + GeeArrayList* _tmp8_; + DataObject* _tmp9_; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = user; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -821,7 +831,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _tmp9_ = object; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 825 "SourceCollection.c" +#line 835 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp11_ = object; @@ -831,35 +841,35 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _tmp13_ = source_collection_destroy_source (self, _tmp11_, _tmp12_); #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp13_) { -#line 835 "SourceCollection.c" - gboolean _tmp14_ = FALSE; +#line 845 "SourceCollection.c" + gboolean _tmp14_; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp14_ = success; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp10_ = _tmp14_; -#line 841 "SourceCollection.c" +#line 851 "SourceCollection.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp10_ = FALSE; -#line 845 "SourceCollection.c" +#line 855 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = _tmp10_; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 851 "SourceCollection.c" +#line 861 "SourceCollection.c" } static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user) { gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - GObject* _tmp2_ = NULL; - Marker* _tmp3_ = NULL; - GObject* _tmp4_ = NULL; - GeeArrayList* _tmp5_ = NULL; + DataObject* _tmp0_; + DataSource* _tmp1_; + GObject* _tmp2_; + Marker* _tmp3_; + GObject* _tmp4_; + GeeArrayList* _tmp5_; #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -894,7 +904,7 @@ static gboolean source_collection_destroy_source (SourceCollection* self, DataOb _g_object_unref0 (source); #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 898 "SourceCollection.c" +#line 908 "SourceCollection.c" } @@ -903,7 +913,7 @@ static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpo result = source_backlink_hash_func ((SourceBacklink*) v); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 907 "SourceCollection.c" +#line 917 "SourceCollection.c" } @@ -912,15 +922,15 @@ static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a result = source_backlink_equal_func ((SourceBacklink*) a, (SourceBacklink*) b); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 916 "SourceCollection.c" +#line 926 "SourceCollection.c" } void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { - GeeMultiMap* _tmp0_ = NULL; - GeeMultiMap* _tmp2_ = NULL; - SourceBacklink* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; + GeeMultiMap* _tmp0_; + GeeMultiMap* _tmp2_; + SourceBacklink* _tmp3_; + DataSource* _tmp4_; #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -931,15 +941,15 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _tmp0_ = self->priv->backlinks; #line 141 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp0_ == NULL) { -#line 935 "SourceCollection.c" - GeeHashMultiMap* _tmp1_ = NULL; +#line 945 "SourceCollection.c" + GeeHashMultiMap* _tmp1_; #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = gee_hash_multi_map_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _source_backlink_hash_func_gee_hash_data_func, NULL, NULL, _source_backlink_equal_func_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (self->priv->backlinks); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 943 "SourceCollection.c" +#line 953 "SourceCollection.c" } #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp2_ = self->priv->backlinks; @@ -949,17 +959,17 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _tmp4_ = source; #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" gee_multi_map_set (_tmp2_, _tmp3_, _tmp4_); -#line 953 "SourceCollection.c" +#line 963 "SourceCollection.c" } void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { - GeeMultiMap* _tmp0_ = NULL; + GeeMultiMap* _tmp0_; gboolean removed = FALSE; - GeeMultiMap* _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - DataSource* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeMultiMap* _tmp1_; + SourceBacklink* _tmp2_; + DataSource* _tmp3_; + gboolean _tmp4_; #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -982,24 +992,24 @@ void source_collection_internal_backlink_removed (SourceCollection* self, DataSo removed = _tmp4_; #line 154 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _vala_assert (removed, "removed"); -#line 986 "SourceCollection.c" +#line 996 "SourceCollection.c" } static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GeeMultiMap* _tmp1_ = NULL; + GeeMultiMap* _tmp1_; #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE); #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = self->priv->backlinks; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp1_ != NULL) { -#line 1000 "SourceCollection.c" - GeeMultiMap* _tmp2_ = NULL; - SourceBacklink* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 1010 "SourceCollection.c" + GeeMultiMap* _tmp2_; + SourceBacklink* _tmp3_; + gboolean _tmp4_; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp2_ = self->priv->backlinks; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1008,17 +1018,17 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou _tmp4_ = gee_multi_map_contains (_tmp2_, _tmp3_); #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = _tmp4_; -#line 1012 "SourceCollection.c" +#line 1022 "SourceCollection.c" } else { #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = FALSE; -#line 1016 "SourceCollection.c" +#line 1026 "SourceCollection.c" } #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = _tmp0_; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1022 "SourceCollection.c" +#line 1032 "SourceCollection.c" } @@ -1027,7 +1037,7 @@ gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return SOURCE_COLLECTION_GET_CLASS (self)->has_backlink (self, backlink); -#line 1031 "SourceCollection.c" +#line 1041 "SourceCollection.c" } @@ -1036,25 +1046,25 @@ static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* result = source_collection_prepare_for_unlink ((SourceCollection*) self, object, user); #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1040 "SourceCollection.c" +#line 1050 "SourceCollection.c" } GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target) { GeeCollection* result = NULL; GeeArrayList* list = NULL; - GeeArrayList* _tmp0_ = NULL; - Marker* _tmp1_ = NULL; - ProgressMonitor _tmp2_ = NULL; - void* _tmp2__target = NULL; - GeeArrayList* _tmp3_ = NULL; - GeeArrayList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - GeeArrayList* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; - Marker* _tmp9_ = NULL; - Marker* _tmp10_ = NULL; + GeeArrayList* _tmp0_; + Marker* _tmp1_; + ProgressMonitor _tmp2_; + void* _tmp2__target; + GeeArrayList* _tmp3_; + GeeArrayList* _tmp4_; + gint _tmp5_; + gint _tmp6_; + GeeArrayList* _tmp7_; + GeeArrayList* _tmp8_; + Marker* _tmp9_; + Marker* _tmp10_; #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), NULL); #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1087,7 +1097,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* _g_object_unref0 (list); #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1091 "SourceCollection.c" +#line 1101 "SourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = list; @@ -1107,16 +1117,16 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection); #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1111 "SourceCollection.c" +#line 1121 "SourceCollection.c" } static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user) { gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - GObject* _tmp2_ = NULL; + DataObject* _tmp0_; + DataSource* _tmp1_; + GObject* _tmp2_; #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1141,17 +1151,17 @@ static gboolean source_collection_prepare_for_unlink (SourceCollection* self, Da _g_object_unref0 (source); #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1145 "SourceCollection.c" +#line 1155 "SourceCollection.c" } void source_collection_relink (SourceCollection* self, DataSource* source) { - DataSource* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - DataSource* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - DataSource* _tmp5_ = NULL; + DataSource* _tmp0_; + DataSource* _tmp1_; + DataSource* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + DataSource* _tmp5_; #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1178,18 +1188,18 @@ void source_collection_relink (SourceCollection* self, DataSource* source) { _tmp5_ = source; #line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_notify_relinked (_tmp5_); -#line 1182 "SourceCollection.c" +#line 1192 "SourceCollection.c" } void source_collection_relink_many (SourceCollection* self, GeeCollection* relink) { - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GeeCollection* _tmp10_ = NULL; - GeeCollection* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - GeeCollection* _tmp13_ = NULL; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; + GeeCollection* _tmp13_; #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1204,12 +1214,12 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (_tmp2_ == 0) { #line 195 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1208 "SourceCollection.c" +#line 1218 "SourceCollection.c" } { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp3_ = relink; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1218,13 +1228,13 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _source_it = _tmp4_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1222 "SourceCollection.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 1232 "SourceCollection.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; DataSource* source = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataSource* _tmp9_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp5_ = _source_it; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1233,7 +1243,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (!_tmp6_) { #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1237 "SourceCollection.c" +#line 1247 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = _source_it; @@ -1247,11 +1257,11 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin data_source_notify_relinking (_tmp9_, self); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1251 "SourceCollection.c" +#line 1261 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1255 "SourceCollection.c" +#line 1265 "SourceCollection.c" } #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp10_ = relink; @@ -1265,11 +1275,11 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _tmp13_ = relink; #line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_notify_items_relinked (self, _tmp13_); -#line 1269 "SourceCollection.c" +#line 1279 "SourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp14_ = NULL; - GeeIterator* _tmp15_ = NULL; + GeeCollection* _tmp14_; + GeeIterator* _tmp15_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp14_ = relink; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1278,13 +1288,13 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _source_it = _tmp15_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1282 "SourceCollection.c" - GeeIterator* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; +#line 1292 "SourceCollection.c" + GeeIterator* _tmp16_; + gboolean _tmp17_; DataSource* source = NULL; - GeeIterator* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - DataSource* _tmp20_ = NULL; + GeeIterator* _tmp18_; + gpointer _tmp19_; + DataSource* _tmp20_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp16_ = _source_it; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1293,7 +1303,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (!_tmp17_) { #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1297 "SourceCollection.c" +#line 1307 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp18_ = _source_it; @@ -1307,26 +1317,26 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin data_source_notify_relinked (_tmp20_); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1311 "SourceCollection.c" +#line 1321 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1315 "SourceCollection.c" +#line 1325 "SourceCollection.c" } } static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink) { - GeeMultiMap* _tmp0_ = NULL; + GeeMultiMap* _tmp0_; GeeArrayList* sources = NULL; - GeeArrayList* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - GeeMultiMap* _tmp3_ = NULL; - SourceBacklink* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - SourceBacklink* _tmp20_ = NULL; - GeeArrayList* _tmp21_ = NULL; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp2_; + GeeMultiMap* _tmp3_; + SourceBacklink* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + SourceBacklink* _tmp20_; + GeeArrayList* _tmp21_; #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 208 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1335,7 +1345,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour if (_tmp0_ == NULL) { #line 209 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1339 "SourceCollection.c" +#line 1349 "SourceCollection.c" } #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); @@ -1355,15 +1365,15 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour gee_array_list_add_all (_tmp2_, _tmp6_); #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_tmp6_); -#line 1359 "SourceCollection.c" +#line 1369 "SourceCollection.c" { GeeArrayList* _source_list = NULL; - GeeArrayList* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; + GeeArrayList* _tmp7_; + GeeArrayList* _tmp8_; gint _source_size = 0; - GeeArrayList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + GeeArrayList* _tmp9_; + gint _tmp10_; + gint _tmp11_; gint _source_index = 0; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = sources; @@ -1383,16 +1393,16 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour _source_index = -1; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1387 "SourceCollection.c" - gint _tmp12_ = 0; - gint _tmp13_ = 0; - gint _tmp14_ = 0; +#line 1397 "SourceCollection.c" + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; DataSource* source = NULL; - GeeArrayList* _tmp15_ = NULL; - gint _tmp16_ = 0; - gpointer _tmp17_ = NULL; - DataSource* _tmp18_ = NULL; - SourceBacklink* _tmp19_ = NULL; + GeeArrayList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; + DataSource* _tmp18_; + SourceBacklink* _tmp19_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp12_ = _source_index; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1405,7 +1415,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour if (!(_tmp13_ < _tmp14_)) { #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1409 "SourceCollection.c" +#line 1419 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp15_ = _source_list; @@ -1423,11 +1433,11 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour data_source_remove_backlink (_tmp18_, _tmp19_); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1427 "SourceCollection.c" +#line 1437 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 1431 "SourceCollection.c" +#line 1441 "SourceCollection.c" } #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp20_ = backlink; @@ -1437,7 +1447,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour source_collection_notify_backlink_removed (self, _tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (sources); -#line 1441 "SourceCollection.c" +#line 1451 "SourceCollection.c" } @@ -1446,42 +1456,42 @@ void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->remove_backlink (self, backlink); -#line 1450 "SourceCollection.c" +#line 1460 "SourceCollection.c" } static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { #line 20 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (unlinking)); -#line 1457 "SourceCollection.c" +#line 1467 "SourceCollection.c" } static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked) { #line 25 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relinked)); -#line 1464 "SourceCollection.c" +#line 1474 "SourceCollection.c" } static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source) { #line 30 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1471 "SourceCollection.c" +#line 1481 "SourceCollection.c" } static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { #line 35 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 1478 "SourceCollection.c" +#line 1488 "SourceCollection.c" } static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source) { #line 40 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1485 "SourceCollection.c" +#line 1495 "SourceCollection.c" } @@ -1490,7 +1500,7 @@ static void source_collection_real_backlink_removed (SourceCollection* self, Sou g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 1494 "SourceCollection.c" +#line 1504 "SourceCollection.c" } @@ -1509,26 +1519,26 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1513 "SourceCollection.c" +#line 1523 "SourceCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data2 = closure->data; -#line 1519 "SourceCollection.c" +#line 1529 "SourceCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" callback = (GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" callback (data1, value_get_source_backlink (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1525 "SourceCollection.c" +#line 1535 "SourceCollection.c" } static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker) { SourceCollectionDestroyCounter * self = NULL; - Marker* _tmp0_ = NULL; - Marker* _tmp1_ = NULL; + Marker* _tmp0_; + Marker* _tmp1_; #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_MARKER (remove_marker), NULL); #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1543,14 +1553,14 @@ static SourceCollectionDestroyCounter* source_collection_destroy_counter_constru self->remove_marker = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 1547 "SourceCollection.c" +#line 1557 "SourceCollection.c" } static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker) { #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return source_collection_destroy_counter_construct (SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, remove_marker); -#line 1554 "SourceCollection.c" +#line 1564 "SourceCollection.c" } @@ -1559,13 +1569,13 @@ static void source_collection_destroy_counter_class_init (SourceCollectionDestro source_collection_destroy_counter_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" G_OBJECT_CLASS (klass)->finalize = source_collection_destroy_counter_finalize; -#line 1563 "SourceCollection.c" +#line 1573 "SourceCollection.c" } static void source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) { - GeeArrayList* _tmp0_ = NULL; - GeeArrayList* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp1_; #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1574,11 +1584,11 @@ static void source_collection_destroy_counter_instance_init (SourceCollectionDes _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 11 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->not_removed = _tmp1_; -#line 1578 "SourceCollection.c" +#line 1588 "SourceCollection.c" } -static void source_collection_destroy_counter_finalize (GObject* obj) { +static void source_collection_destroy_counter_finalize (GObject * obj) { SourceCollectionDestroyCounter * self; #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter); @@ -1590,7 +1600,7 @@ static void source_collection_destroy_counter_finalize (GObject* obj) { _g_object_unref0 (self->not_removed); #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" G_OBJECT_CLASS (source_collection_destroy_counter_parent_class)->finalize (obj); -#line 1594 "SourceCollection.c" +#line 1604 "SourceCollection.c" } @@ -1614,25 +1624,25 @@ static void source_collection_class_init (SourceCollectionClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_type_class_add_private (klass, sizeof (SourceCollectionPrivate)); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) source_collection_real_holds_type_of_source; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_unlinking = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_unlinking; + ((SourceCollectionClass *) klass)->notify_items_unlinking = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_unlinking; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_relinked = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_relinked; + ((SourceCollectionClass *) klass)->notify_items_relinked = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_relinked; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*)(SourceCollection*, DataSource*)) source_collection_real_notify_item_destroyed; + ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*) (SourceCollection *, DataSource*)) source_collection_real_notify_item_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_destroyed = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_destroyed; + ((SourceCollectionClass *) klass)->notify_items_destroyed = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_unlinked_destroyed = (void (*)(SourceCollection*, DataSource*)) source_collection_real_notify_unlinked_destroyed; + ((SourceCollectionClass *) klass)->notify_unlinked_destroyed = (void (*) (SourceCollection *, DataSource*)) source_collection_real_notify_unlinked_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*)(SourceCollection*, SourceBacklink*, GeeCollection*)) source_collection_real_notify_backlink_removed; + ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*) (SourceCollection *, SourceBacklink*, GeeCollection*)) source_collection_real_notify_backlink_removed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) source_collection_real_valid_type; + ((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) source_collection_real_valid_type; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*)(SourceCollection*, SourceBacklink*)) source_collection_real_has_backlink; + ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*) (SourceCollection *, SourceBacklink*)) source_collection_real_has_backlink; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->remove_backlink = (void (*)(SourceCollection*, SourceBacklink*)) source_collection_real_remove_backlink; + ((SourceCollectionClass *) klass)->remove_backlink = (void (*) (SourceCollection *, SourceBacklink*)) source_collection_real_remove_backlink; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" ((SourceCollectionClass *) klass)->items_unlinking = source_collection_real_items_unlinking; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1646,18 +1656,18 @@ static void source_collection_class_init (SourceCollectionClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" ((SourceCollectionClass *) klass)->backlink_removed = source_collection_real_backlink_removed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("items_unlinking", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_unlinking), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL] = g_signal_new ("items-unlinking", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_unlinking), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("items_relinked", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_relinked), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL] = g_signal_new ("items-relinked", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_relinked), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("item_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, item_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); + source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL] = g_signal_new ("item-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, item_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("items_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL] = g_signal_new ("items-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("unlinked_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, unlinked_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); + source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL] = g_signal_new ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, unlinked_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("backlink_removed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, backlink_removed), NULL, NULL, g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT, G_TYPE_NONE, 2, TYPE_SOURCE_BACKLINK, GEE_TYPE_COLLECTION); -#line 1661 "SourceCollection.c" + source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL] = g_signal_new ("backlink-removed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, backlink_removed), NULL, NULL, g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT, G_TYPE_NONE, 2, TYPE_SOURCE_BACKLINK, GEE_TYPE_COLLECTION); +#line 1671 "SourceCollection.c" } @@ -1666,11 +1676,11 @@ static void source_collection_instance_init (SourceCollection * self) { self->priv = SOURCE_COLLECTION_GET_PRIVATE (self); #line 48 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = NULL; -#line 1670 "SourceCollection.c" +#line 1680 "SourceCollection.c" } -static void source_collection_finalize (DataCollection* obj) { +static void source_collection_finalize (DataCollection * obj) { SourceCollection * self; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_COLLECTION, SourceCollection); @@ -1678,7 +1688,7 @@ static void source_collection_finalize (DataCollection* obj) { _g_object_unref0 (self->priv->backlinks); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" DATA_COLLECTION_CLASS (source_collection_parent_class)->finalize (obj); -#line 1682 "SourceCollection.c" +#line 1692 "SourceCollection.c" } |