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/ContainerSourceCollection.c | 744 ++++++++++++++++++----------------- 1 file changed, 376 insertions(+), 368 deletions(-) (limited to 'src/core/ContainerSourceCollection.c') diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c index 247e471..7bd5826 100644 --- a/src/core/ContainerSourceCollection.c +++ b/src/core/ContainerSourceCollection.c @@ -1,4 +1,4 @@ -/* ContainerSourceCollection.c generated by valac 0.34.7, the Vala compiler +/* ContainerSourceCollection.c generated by valac 0.36.6, the Vala compiler * generated from ContainerSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -155,6 +155,14 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; +enum { + CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL, + CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL, + CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL, + CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL, + CONTAINER_SOURCE_COLLECTION_LAST_SIGNAL +}; +static guint container_source_collection_signals[CONTAINER_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; } @@ -384,16 +392,16 @@ static void container_source_collection_real_container_contents_altered (Contain static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources); static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void container_source_collection_finalize (DataCollection* obj); +static void container_source_collection_finalize (DataCollection * obj); ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) { ContainerSourceCollection* self = NULL; - const gchar* _tmp0_ = NULL; - GetSourceDatabaseKey _tmp1_ = NULL; - void* _tmp1__target = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + GetSourceDatabaseKey _tmp1_; + void* _tmp1__target; + const gchar* _tmp2_; + gchar* _tmp3_; #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (backlink_name != NULL, NULL); #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -416,18 +424,18 @@ ContainerSourceCollection* container_source_collection_construct (GType object_t self->priv->backlink_name = _tmp3_; #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return self; -#line 420 "ContainerSourceCollection.c" +#line 428 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, SourceBacklink* backlink, GeeCollection* sources) { ContainerSourceCollection * self; - SourceBacklink* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + SourceBacklink* _tmp0_; + GeeCollection* _tmp1_; ContainerSource* container = NULL; - SourceBacklink* _tmp2_ = NULL; - ContainerSource* _tmp3_ = NULL; - ContainerSource* _tmp4_ = NULL; + SourceBacklink* _tmp2_; + ContainerSource* _tmp3_; + ContainerSource* _tmp4_; #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection); #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -450,30 +458,30 @@ static void container_source_collection_real_notify_backlink_removed (SourceColl _tmp4_ = container; #line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp4_ != NULL) { -#line 454 "ContainerSourceCollection.c" - ContainerSource* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; +#line 462 "ContainerSourceCollection.c" + ContainerSource* _tmp5_; + GeeCollection* _tmp6_; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp5_ = container; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp6_ = sources; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_notify_backlink_to_container_removed (self, _tmp5_, _tmp6_); -#line 463 "ContainerSourceCollection.c" +#line 471 "ContainerSourceCollection.c" } #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 467 "ContainerSourceCollection.c" +#line 475 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) { - GeeHashSet* _tmp0_ = NULL; - ContainerSource* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - ContainerSource* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GeeHashSet* _tmp0_; + ContainerSource* _tmp1_; + gboolean _tmp2_; + ContainerSource* _tmp8_; + GeeCollection* _tmp9_; + gboolean _tmp10_; #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -486,13 +494,13 @@ static void container_source_collection_real_notify_container_contents_added (Co _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); #line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp2_) { -#line 490 "ContainerSourceCollection.c" +#line 498 "ContainerSourceCollection.c" gboolean removed = FALSE; - GeeHashSet* _tmp3_ = NULL; - ContainerSource* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - ContainerSource* _tmp7_ = NULL; + GeeHashSet* _tmp3_; + ContainerSource* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + ContainerSource* _tmp7_; #line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp3_ = self->priv->holding_tank; #line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -509,7 +517,7 @@ static void container_source_collection_real_notify_container_contents_added (Co _tmp7_ = container; #line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); -#line 513 "ContainerSourceCollection.c" +#line 521 "ContainerSourceCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp8_ = container; @@ -518,8 +526,8 @@ static void container_source_collection_real_notify_container_contents_added (Co #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp10_ = relinked; #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit_by_name (self, "container-contents-added", _tmp8_, _tmp9_, _tmp10_); -#line 523 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_); +#line 531 "ContainerSourceCollection.c" } @@ -528,14 +536,14 @@ void container_source_collection_notify_container_contents_added (ContainerSourc g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_added (self, container, added, relinked); -#line 532 "ContainerSourceCollection.c" +#line 540 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) { - ContainerSource* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + ContainerSource* _tmp0_; + GeeCollection* _tmp1_; + gboolean _tmp2_; #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -547,8 +555,8 @@ static void container_source_collection_real_notify_container_contents_removed ( #line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = unlinked; #line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit_by_name (self, "container-contents-removed", _tmp0_, _tmp1_, _tmp2_); -#line 552 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_); +#line 560 "ContainerSourceCollection.c" } @@ -557,16 +565,16 @@ void container_source_collection_notify_container_contents_removed (ContainerSou g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_removed (self, container, removed, unlinked); -#line 561 "ContainerSourceCollection.c" +#line 569 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) { - ContainerSource* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeCollection* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + ContainerSource* _tmp0_; + GeeCollection* _tmp1_; + gboolean _tmp2_; + GeeCollection* _tmp3_; + gboolean _tmp4_; #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -584,8 +592,8 @@ static void container_source_collection_real_notify_container_contents_altered ( #line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = unlinked; #line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit_by_name (self, "container-contents-altered", _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 589 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); +#line 597 "ContainerSourceCollection.c" } @@ -594,13 +602,13 @@ void container_source_collection_notify_container_contents_altered (ContainerSou g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_altered (self, container, added, relinked, removed, unlinked); -#line 598 "ContainerSourceCollection.c" +#line 606 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) { - ContainerSource* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + ContainerSource* _tmp0_; + GeeCollection* _tmp1_; #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -610,8 +618,8 @@ static void container_source_collection_real_notify_backlink_to_container_remove #line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp1_ = sources; #line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit_by_name (self, "backlink-to-container-removed", _tmp0_, _tmp1_); -#line 615 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); +#line 623 "ContainerSourceCollection.c" } @@ -620,7 +628,7 @@ void container_source_collection_notify_backlink_to_container_removed (Container g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_to_container_removed (self, container, sources); -#line 624 "ContainerSourceCollection.c" +#line 632 "ContainerSourceCollection.c" } @@ -629,7 +637,7 @@ static GeeCollection* container_source_collection_real_get_containers_holding_so g_critical ("Type `%s' does not implement abstract method `container_source_collection_get_containers_holding_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return NULL; -#line 633 "ContainerSourceCollection.c" +#line 641 "ContainerSourceCollection.c" } @@ -638,7 +646,7 @@ GeeCollection* container_source_collection_get_containers_holding_source (Contai g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL); #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->get_containers_holding_source (self, source); -#line 642 "ContainerSourceCollection.c" +#line 650 "ContainerSourceCollection.c" } @@ -647,7 +655,7 @@ static ContainerSource* container_source_collection_real_convert_backlink_to_con g_critical ("Type `%s' does not implement abstract method `container_source_collection_convert_backlink_to_container'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return NULL; -#line 651 "ContainerSourceCollection.c" +#line 659 "ContainerSourceCollection.c" } @@ -656,18 +664,18 @@ ContainerSource* container_source_collection_convert_backlink_to_container (Cont g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL); #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->convert_backlink_to_container (self, backlink); -#line 660 "ContainerSourceCollection.c" +#line 668 "ContainerSourceCollection.c" } void container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self) { #line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 667 "ContainerSourceCollection.c" +#line 675 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -676,13 +684,13 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC _collection_it = _tmp1_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 680 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 688 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -691,7 +699,7 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC if (!_tmp3_) { #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 695 "ContainerSourceCollection.c" +#line 703 "ContainerSourceCollection.c" } #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -705,11 +713,11 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 709 "ContainerSourceCollection.c" +#line 717 "ContainerSourceCollection.c" } #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 713 "ContainerSourceCollection.c" +#line 721 "ContainerSourceCollection.c" } } @@ -717,11 +725,11 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC void container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self) { #line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 721 "ContainerSourceCollection.c" +#line 729 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -730,13 +738,13 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol _collection_it = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 734 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 742 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -745,7 +753,7 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol if (!_tmp3_) { #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 749 "ContainerSourceCollection.c" +#line 757 "ContainerSourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -759,20 +767,20 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 763 "ContainerSourceCollection.c" +#line 771 "ContainerSourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 767 "ContainerSourceCollection.c" +#line 775 "ContainerSourceCollection.c" } } GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self) { GeeCollection* result = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; + GeeHashSet* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; #line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL); #line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -785,13 +793,13 @@ GeeCollection* container_source_collection_get_holding_tank (ContainerSourceColl result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 789 "ContainerSourceCollection.c" +#line 797 "ContainerSourceCollection.c" } void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked) { - GeeHashSet* _tmp0_ = NULL; - ContainerSource* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + ContainerSource* _tmp1_; #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -802,13 +810,13 @@ void container_source_collection_init_add_unlinked (ContainerSourceCollection* s _tmp1_ = unlinked; #line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 806 "ContainerSourceCollection.c" +#line 814 "ContainerSourceCollection.c" } void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked) { - GeeHashSet* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeCollection* _tmp1_; #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -819,16 +827,16 @@ void container_source_collection_init_add_many_unlinked (ContainerSourceCollecti _tmp1_ = unlinked; #line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 823 "ContainerSourceCollection.c" +#line 831 "ContainerSourceCollection.c" } gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, ContainerSource* source) { gboolean result = FALSE; - GeeHashSet* _tmp0_ = NULL; - ContainerSource* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - ContainerSource* _tmp3_ = NULL; + GeeHashSet* _tmp0_; + ContainerSource* _tmp1_; + gboolean _tmp2_; + ContainerSource* _tmp3_; #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), FALSE); #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -845,7 +853,7 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo result = FALSE; #line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 849 "ContainerSourceCollection.c" +#line 857 "ContainerSourceCollection.c" } #line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp3_ = source; @@ -855,13 +863,13 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo result = TRUE; #line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 859 "ContainerSourceCollection.c" +#line 867 "ContainerSourceCollection.c" } static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking) { GeeHashMultiMap* map = NULL; - GeeHashMultiMap* _tmp0_ = NULL; + GeeHashMultiMap* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -872,11 +880,11 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" map = _tmp0_; -#line 876 "ContainerSourceCollection.c" +#line 884 "ContainerSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp1_ = unlinking; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -885,17 +893,17 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _source_it = _tmp2_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 889 "ContainerSourceCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 897 "ContainerSourceCollection.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; GeeCollection* containers = NULL; - DataSource* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; + DataSource* _tmp7_; + GeeCollection* _tmp8_; gboolean _tmp9_ = FALSE; - GeeCollection* _tmp10_ = NULL; + GeeCollection* _tmp10_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp3_ = _source_it; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -904,7 +912,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe if (!_tmp4_) { #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 908 "ContainerSourceCollection.c" +#line 916 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp5_ = _source_it; @@ -924,11 +932,11 @@ static void container_source_collection_on_contained_sources_unlinking (Containe if (_tmp10_ == NULL) { #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp9_ = TRUE; -#line 928 "ContainerSourceCollection.c" +#line 936 "ContainerSourceCollection.c" } else { - GeeCollection* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; + GeeCollection* _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp11_ = containers; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -937,7 +945,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _tmp13_ = _tmp12_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp9_ = _tmp13_ == 0; -#line 941 "ContainerSourceCollection.c" +#line 949 "ContainerSourceCollection.c" } #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp9_) { @@ -947,12 +955,12 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _g_object_unref0 (source); #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" continue; -#line 951 "ContainerSourceCollection.c" +#line 959 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeCollection* _tmp14_ = NULL; - GeeIterator* _tmp15_ = NULL; + GeeCollection* _tmp14_; + GeeIterator* _tmp15_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp14_ = containers; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -961,19 +969,19 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _container_it = _tmp15_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 965 "ContainerSourceCollection.c" - GeeIterator* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; +#line 973 "ContainerSourceCollection.c" + GeeIterator* _tmp16_; + gboolean _tmp17_; ContainerSource* container = NULL; - GeeIterator* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - GeeHashMultiMap* _tmp20_ = NULL; - ContainerSource* _tmp21_ = NULL; - DataSource* _tmp22_ = NULL; - DataSource* _tmp23_ = NULL; - ContainerSource* _tmp24_ = NULL; - SourceBacklink* _tmp25_ = NULL; - SourceBacklink* _tmp26_ = NULL; + GeeIterator* _tmp18_; + gpointer _tmp19_; + GeeHashMultiMap* _tmp20_; + ContainerSource* _tmp21_; + DataSource* _tmp22_; + DataSource* _tmp23_; + ContainerSource* _tmp24_; + SourceBacklink* _tmp25_; + SourceBacklink* _tmp26_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp16_ = _container_it; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -982,7 +990,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe if (!_tmp17_) { #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 986 "ContainerSourceCollection.c" +#line 994 "ContainerSourceCollection.c" } #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp18_ = _container_it; @@ -1012,29 +1020,29 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _source_backlink_unref0 (_tmp26_); #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1016 "ContainerSourceCollection.c" +#line 1024 "ContainerSourceCollection.c" } #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1020 "ContainerSourceCollection.c" +#line 1028 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (containers); #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); -#line 1026 "ContainerSourceCollection.c" +#line 1034 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_source_it); -#line 1030 "ContainerSourceCollection.c" +#line 1038 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeHashMultiMap* _tmp27_ = NULL; - GeeSet* _tmp28_ = NULL; - GeeSet* _tmp29_ = NULL; - GeeIterator* _tmp30_ = NULL; - GeeIterator* _tmp31_ = NULL; + GeeHashMultiMap* _tmp27_; + GeeSet* _tmp28_; + GeeSet* _tmp29_; + GeeIterator* _tmp30_; + GeeIterator* _tmp31_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp27_ = map; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1051,17 +1059,17 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _container_it = _tmp31_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1055 "ContainerSourceCollection.c" - GeeIterator* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; +#line 1063 "ContainerSourceCollection.c" + GeeIterator* _tmp32_; + gboolean _tmp33_; ContainerSource* container = NULL; - GeeIterator* _tmp34_ = NULL; - gpointer _tmp35_ = NULL; - ContainerSource* _tmp36_ = NULL; - GeeHashMultiMap* _tmp37_ = NULL; - ContainerSource* _tmp38_ = NULL; - GeeCollection* _tmp39_ = NULL; - GeeCollection* _tmp40_ = NULL; + GeeIterator* _tmp34_; + gpointer _tmp35_; + ContainerSource* _tmp36_; + GeeHashMultiMap* _tmp37_; + ContainerSource* _tmp38_; + GeeCollection* _tmp39_; + GeeCollection* _tmp40_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp32_ = _container_it; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1070,7 +1078,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe if (!_tmp33_) { #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1074 "ContainerSourceCollection.c" +#line 1082 "ContainerSourceCollection.c" } #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp34_ = _container_it; @@ -1094,30 +1102,30 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _g_object_unref0 (_tmp40_); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1098 "ContainerSourceCollection.c" +#line 1106 "ContainerSourceCollection.c" } #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1102 "ContainerSourceCollection.c" +#line 1110 "ContainerSourceCollection.c" } #line 143 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_thaw_attached_notifications (self); #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (map); -#line 1108 "ContainerSourceCollection.c" +#line 1116 "ContainerSourceCollection.c" } static gpointer _g_object_ref0 (gpointer self) { #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 1115 "ContainerSourceCollection.c" +#line 1123 "ContainerSourceCollection.c" } static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked) { GeeHashMultiMap* map = NULL; - GeeHashMultiMap* _tmp0_ = NULL; + GeeHashMultiMap* _tmp0_; #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1128,11 +1136,11 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" map = _tmp0_; -#line 1132 "ContainerSourceCollection.c" +#line 1140 "ContainerSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp1_ = relinked; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1141,18 +1149,18 @@ static void container_source_collection_on_contained_sources_relinked (Container _source_it = _tmp2_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1145 "ContainerSourceCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 1153 "ContainerSourceCollection.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; GeeList* backlinks = NULL; - DataSource* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GeeList* _tmp9_ = NULL; + DataSource* _tmp7_; + const gchar* _tmp8_; + GeeList* _tmp9_; gboolean _tmp10_ = FALSE; - GeeList* _tmp11_ = NULL; + GeeList* _tmp11_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp3_ = _source_it; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1161,7 +1169,7 @@ static void container_source_collection_on_contained_sources_relinked (Container if (!_tmp4_) { #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1165 "ContainerSourceCollection.c" +#line 1173 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp5_ = _source_it; @@ -1183,11 +1191,11 @@ static void container_source_collection_on_contained_sources_relinked (Container if (_tmp11_ == NULL) { #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp10_ = TRUE; -#line 1187 "ContainerSourceCollection.c" +#line 1195 "ContainerSourceCollection.c" } else { - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp12_ = backlinks; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1196,7 +1204,7 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp14_ = _tmp13_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp10_ = _tmp14_ == 0; -#line 1200 "ContainerSourceCollection.c" +#line 1208 "ContainerSourceCollection.c" } #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp10_) { @@ -1206,16 +1214,16 @@ static void container_source_collection_on_contained_sources_relinked (Container _g_object_unref0 (source); #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" continue; -#line 1210 "ContainerSourceCollection.c" +#line 1218 "ContainerSourceCollection.c" } { GeeList* _backlink_list = NULL; - GeeList* _tmp15_ = NULL; - GeeList* _tmp16_ = NULL; + GeeList* _tmp15_; + GeeList* _tmp16_; gint _backlink_size = 0; - GeeList* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + GeeList* _tmp17_; + gint _tmp18_; + gint _tmp19_; gint _backlink_index = 0; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp15_ = backlinks; @@ -1235,18 +1243,18 @@ static void container_source_collection_on_contained_sources_relinked (Container _backlink_index = -1; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1239 "ContainerSourceCollection.c" - gint _tmp20_ = 0; - gint _tmp21_ = 0; - gint _tmp22_ = 0; +#line 1247 "ContainerSourceCollection.c" + gint _tmp20_; + gint _tmp21_; + gint _tmp22_; SourceBacklink* backlink = NULL; - GeeList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gpointer _tmp25_ = NULL; + GeeList* _tmp23_; + gint _tmp24_; + gpointer _tmp25_; ContainerSource* container = NULL; - SourceBacklink* _tmp26_ = NULL; - ContainerSource* _tmp27_ = NULL; - ContainerSource* _tmp28_ = NULL; + SourceBacklink* _tmp26_; + ContainerSource* _tmp27_; + ContainerSource* _tmp28_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp20_ = _backlink_index; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1259,7 +1267,7 @@ static void container_source_collection_on_contained_sources_relinked (Container if (!(_tmp21_ < _tmp22_)) { #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1263 "ContainerSourceCollection.c" +#line 1271 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp23_ = _backlink_list; @@ -1279,10 +1287,10 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp28_ = container; #line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp28_ != NULL) { -#line 1283 "ContainerSourceCollection.c" - GeeHashMultiMap* _tmp29_ = NULL; - ContainerSource* _tmp30_ = NULL; - DataSource* _tmp31_ = NULL; +#line 1291 "ContainerSourceCollection.c" + GeeHashMultiMap* _tmp29_; + ContainerSource* _tmp30_; + DataSource* _tmp31_; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp29_ = map; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1291,14 +1299,14 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp31_ = source; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp30_, _tmp31_); -#line 1295 "ContainerSourceCollection.c" +#line 1303 "ContainerSourceCollection.c" } else { - DataSource* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - SourceBacklink* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; + DataSource* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + SourceBacklink* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp32_ = source; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1318,35 +1326,35 @@ static void container_source_collection_on_contained_sources_relinked (Container _g_free0 (_tmp37_); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_free0 (_tmp34_); -#line 1321 "ContainerSourceCollection.c" +#line 1329 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _source_backlink_unref0 (backlink); -#line 1327 "ContainerSourceCollection.c" +#line 1335 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_backlink_list); -#line 1331 "ContainerSourceCollection.c" +#line 1339 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (backlinks); #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); -#line 1337 "ContainerSourceCollection.c" +#line 1345 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_source_it); -#line 1341 "ContainerSourceCollection.c" +#line 1349 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeHashMultiMap* _tmp38_ = NULL; - GeeSet* _tmp39_ = NULL; - GeeSet* _tmp40_ = NULL; - GeeIterator* _tmp41_ = NULL; - GeeIterator* _tmp42_ = NULL; + GeeHashMultiMap* _tmp38_; + GeeSet* _tmp39_; + GeeSet* _tmp40_; + GeeIterator* _tmp41_; + GeeIterator* _tmp42_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp38_ = map; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1363,17 +1371,17 @@ static void container_source_collection_on_contained_sources_relinked (Container _container_it = _tmp42_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1366 "ContainerSourceCollection.c" - GeeIterator* _tmp43_ = NULL; - gboolean _tmp44_ = FALSE; +#line 1374 "ContainerSourceCollection.c" + GeeIterator* _tmp43_; + gboolean _tmp44_; ContainerSource* container = NULL; - GeeIterator* _tmp45_ = NULL; - gpointer _tmp46_ = NULL; - ContainerSource* _tmp47_ = NULL; - GeeHashMultiMap* _tmp48_ = NULL; - ContainerSource* _tmp49_ = NULL; - GeeCollection* _tmp50_ = NULL; - GeeCollection* _tmp51_ = NULL; + GeeIterator* _tmp45_; + gpointer _tmp46_; + ContainerSource* _tmp47_; + GeeHashMultiMap* _tmp48_; + ContainerSource* _tmp49_; + GeeCollection* _tmp50_; + GeeCollection* _tmp51_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp43_ = _container_it; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1382,7 +1390,7 @@ static void container_source_collection_on_contained_sources_relinked (Container if (!_tmp44_) { #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1385 "ContainerSourceCollection.c" +#line 1393 "ContainerSourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp45_ = _container_it; @@ -1406,24 +1414,24 @@ static void container_source_collection_on_contained_sources_relinked (Container _g_object_unref0 (_tmp51_); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1409 "ContainerSourceCollection.c" +#line 1417 "ContainerSourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1413 "ContainerSourceCollection.c" +#line 1421 "ContainerSourceCollection.c" } #line 171 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_thaw_attached_notifications (self); #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (map); -#line 1419 "ContainerSourceCollection.c" +#line 1427 "ContainerSourceCollection.c" } static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, DataSource* source) { GeeIterator* iter = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1436,15 +1444,15 @@ static void container_source_collection_on_contained_source_destroyed (Container iter = _tmp1_; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1439 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1447 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; ContainerSource* container = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; gboolean _tmp6_ = FALSE; - ContainerSource* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + ContainerSource* _tmp7_; + gboolean _tmp8_; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = iter; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1453,7 +1461,7 @@ static void container_source_collection_on_contained_source_destroyed (Container if (!_tmp3_) { #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1456 "ContainerSourceCollection.c" +#line 1464 "ContainerSourceCollection.c" } #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = iter; @@ -1467,23 +1475,23 @@ static void container_source_collection_on_contained_source_destroyed (Container _tmp8_ = container_source_has_links (_tmp7_); #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (!_tmp8_) { -#line 1470 "ContainerSourceCollection.c" - ContainerSource* _tmp9_ = NULL; +#line 1478 "ContainerSourceCollection.c" + ContainerSource* _tmp9_; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp9_ = container; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp6_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_TAG); -#line 1476 "ContainerSourceCollection.c" +#line 1484 "ContainerSourceCollection.c" } else { #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp6_ = FALSE; -#line 1480 "ContainerSourceCollection.c" +#line 1488 "ContainerSourceCollection.c" } #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp6_) { -#line 1484 "ContainerSourceCollection.c" - GeeIterator* _tmp10_ = NULL; - ContainerSource* _tmp11_ = NULL; +#line 1492 "ContainerSourceCollection.c" + GeeIterator* _tmp10_; + ContainerSource* _tmp11_; #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp10_ = iter; #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1492,30 +1500,30 @@ static void container_source_collection_on_contained_source_destroyed (Container _tmp11_ = container; #line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource), TRUE); -#line 1495 "ContainerSourceCollection.c" +#line 1503 "ContainerSourceCollection.c" } #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1499 "ContainerSourceCollection.c" +#line 1507 "ContainerSourceCollection.c" } #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (iter); -#line 1503 "ContainerSourceCollection.c" +#line 1511 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source) { ContainerSourceCollection * self; - DataSource* _tmp10_ = NULL; + DataSource* _tmp10_; #line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection); #line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1514 "ContainerSourceCollection.c" +#line 1522 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1524,16 +1532,16 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec _collection_it = _tmp1_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1527 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1535 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; - SourceBacklink* _tmp8_ = NULL; - SourceBacklink* _tmp9_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; + DataSource* _tmp7_; + SourceBacklink* _tmp8_; + SourceBacklink* _tmp9_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1542,7 +1550,7 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec if (!_tmp3_) { #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1545 "ContainerSourceCollection.c" +#line 1553 "ContainerSourceCollection.c" } #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -1564,33 +1572,33 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec _source_backlink_unref0 (_tmp9_); #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1567 "ContainerSourceCollection.c" +#line 1575 "ContainerSourceCollection.c" } #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1571 "ContainerSourceCollection.c" +#line 1579 "ContainerSourceCollection.c" } #line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp10_ = source; #line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_item_destroyed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp10_); -#line 1577 "ContainerSourceCollection.c" +#line 1585 "ContainerSourceCollection.c" } void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container) { - ContainerSource* _tmp21_ = NULL; - Marker* _tmp22_ = NULL; - Marker* _tmp23_ = NULL; + ContainerSource* _tmp21_; + Marker* _tmp22_; + Marker* _tmp23_; #line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); -#line 1589 "ContainerSourceCollection.c" +#line 1597 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1599,18 +1607,18 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con _collection_it = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1602 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1610 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; - ContainerSource* _tmp7_ = NULL; - SourceBacklink* _tmp8_ = NULL; - SourceBacklink* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; + ContainerSource* _tmp7_; + SourceBacklink* _tmp8_; + SourceBacklink* _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1619,7 +1627,7 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con if (!_tmp3_) { #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1622 "ContainerSourceCollection.c" +#line 1630 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -1643,17 +1651,17 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con _source_backlink_unref0 (_tmp9_); #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp11_) { -#line 1646 "ContainerSourceCollection.c" - ContainerSource* _tmp12_ = NULL; - Marker* _tmp13_ = NULL; - Marker* _tmp14_ = NULL; - GeeCollection* _tmp15_ = NULL; - GeeCollection* _tmp16_ = NULL; +#line 1654 "ContainerSourceCollection.c" + ContainerSource* _tmp12_; + Marker* _tmp13_; + Marker* _tmp14_; + GeeCollection* _tmp15_; + GeeCollection* _tmp16_; gboolean added = FALSE; - GeeHashSet* _tmp17_ = NULL; - ContainerSource* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; + GeeHashSet* _tmp17_; + ContainerSource* _tmp18_; + gboolean _tmp19_; + gboolean _tmp20_; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp12_ = container; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1686,15 +1694,15 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con _g_object_unref0 (_collection_it); #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return; -#line 1689 "ContainerSourceCollection.c" +#line 1697 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1693 "ContainerSourceCollection.c" +#line 1701 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1697 "ContainerSourceCollection.c" +#line 1705 "ContainerSourceCollection.c" } #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp21_ = container; @@ -1706,48 +1714,48 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp23_, TRUE, NULL, NULL, NULL); #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_tmp23_); -#line 1709 "ContainerSourceCollection.c" +#line 1717 "ContainerSourceCollection.c" } static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) { #line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_sources_unlinking ((ContainerSourceCollection*) self, unlinking); -#line 1716 "ContainerSourceCollection.c" +#line 1724 "ContainerSourceCollection.c" } static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) { #line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_sources_relinked ((ContainerSourceCollection*) self, relinked); -#line 1723 "ContainerSourceCollection.c" +#line 1731 "ContainerSourceCollection.c" } static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { #line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source); -#line 1730 "ContainerSourceCollection.c" +#line 1738 "ContainerSourceCollection.c" } static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { #line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source); -#line 1737 "ContainerSourceCollection.c" +#line 1745 "ContainerSourceCollection.c" } void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection) { - GeeHashSet* _tmp0_ = NULL; - SourceCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashSet* _tmp8_ = NULL; - SourceCollection* _tmp9_ = NULL; - SourceCollection* _tmp10_ = NULL; - SourceCollection* _tmp11_ = NULL; - SourceCollection* _tmp12_ = NULL; - SourceCollection* _tmp13_ = NULL; + GeeHashSet* _tmp0_; + SourceCollection* _tmp1_; + gboolean _tmp2_; + GeeHashSet* _tmp8_; + SourceCollection* _tmp9_; + SourceCollection* _tmp10_; + SourceCollection* _tmp11_; + SourceCollection* _tmp12_; + SourceCollection* _tmp13_; #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1760,12 +1768,12 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); #line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp2_) { -#line 1763 "ContainerSourceCollection.c" - SourceCollection* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 1771 "ContainerSourceCollection.c" + SourceCollection* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp3_ = collection; #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1785,7 +1793,7 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s _g_free0 (_tmp5_); #line 216 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return; -#line 1787 "ContainerSourceCollection.c" +#line 1795 "ContainerSourceCollection.c" } #line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp8_ = self->priv->attached_collections; @@ -1809,19 +1817,19 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s _tmp13_ = collection; #line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_signal_connect (_tmp13_, "unlinked-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self); -#line 1811 "ContainerSourceCollection.c" +#line 1819 "ContainerSourceCollection.c" } void container_source_collection_detach_all_collections (ContainerSourceCollection* self) { - GeeHashSet* _tmp14_ = NULL; + GeeHashSet* _tmp14_; #line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 1819 "ContainerSourceCollection.c" +#line 1827 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1830,20 +1838,20 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti _collection_it = _tmp1_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1832 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1840 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; - guint _tmp7_ = 0U; - SourceCollection* _tmp8_ = NULL; - guint _tmp9_ = 0U; - SourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; - SourceCollection* _tmp12_ = NULL; - guint _tmp13_ = 0U; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; + guint _tmp7_; + SourceCollection* _tmp8_; + guint _tmp9_; + SourceCollection* _tmp10_; + guint _tmp11_; + SourceCollection* _tmp12_; + guint _tmp13_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1852,7 +1860,7 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti if (!_tmp3_) { #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1854 "ContainerSourceCollection.c" +#line 1862 "ContainerSourceCollection.c" } #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -1886,17 +1894,17 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self); #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1888 "ContainerSourceCollection.c" +#line 1896 "ContainerSourceCollection.c" } #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1892 "ContainerSourceCollection.c" +#line 1900 "ContainerSourceCollection.c" } #line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp14_ = self->priv->attached_collections; #line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1898 "ContainerSourceCollection.c" +#line 1906 "ContainerSourceCollection.c" } @@ -1905,7 +1913,7 @@ static void container_source_collection_real_container_contents_added (Container g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 20 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (added)); -#line 1907 "ContainerSourceCollection.c" +#line 1915 "ContainerSourceCollection.c" } @@ -1924,19 +1932,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * clos data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1926 "ContainerSourceCollection.c" +#line 1934 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 1932 "ContainerSourceCollection.c" +#line 1940 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boolean (param_values + 3), data2); -#line 1938 "ContainerSourceCollection.c" +#line 1946 "ContainerSourceCollection.c" } @@ -1945,7 +1953,7 @@ static void container_source_collection_real_container_contents_removed (Contain g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 24 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (removed)); -#line 1947 "ContainerSourceCollection.c" +#line 1955 "ContainerSourceCollection.c" } @@ -1956,7 +1964,7 @@ static void container_source_collection_real_container_contents_altered (Contain g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 28 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 1958 "ContainerSourceCollection.c" +#line 1966 "ContainerSourceCollection.c" } @@ -1975,19 +1983,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN ( data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1977 "ContainerSourceCollection.c" +#line 1985 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 1983 "ContainerSourceCollection.c" +#line 1991 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_object (param_values + 4), g_value_get_boolean (param_values + 5), data2); -#line 1989 "ContainerSourceCollection.c" +#line 1997 "ContainerSourceCollection.c" } @@ -1996,7 +2004,7 @@ static void container_source_collection_real_backlink_to_container_removed (Cont g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 1998 "ContainerSourceCollection.c" +#line 2006 "ContainerSourceCollection.c" } @@ -2015,19 +2023,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 2017 "ContainerSourceCollection.c" +#line 2025 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 2023 "ContainerSourceCollection.c" +#line 2031 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 2029 "ContainerSourceCollection.c" +#line 2037 "ContainerSourceCollection.c" } @@ -2039,21 +2047,21 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_type_class_add_private (klass, sizeof (ContainerSourceCollectionPrivate)); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*)(SourceCollection*, SourceBacklink*, GeeCollection*)) container_source_collection_real_notify_backlink_removed; + ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*) (SourceCollection *, SourceBacklink*, GeeCollection*)) container_source_collection_real_notify_backlink_removed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_added; + ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_added; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_removed; + ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_removed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->notify_container_contents_altered = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_altered; + ((ContainerSourceCollectionClass *) klass)->notify_container_contents_altered = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_altered; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->notify_backlink_to_container_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*)) container_source_collection_real_notify_backlink_to_container_removed; + ((ContainerSourceCollectionClass *) klass)->notify_backlink_to_container_removed = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*)) container_source_collection_real_notify_backlink_to_container_removed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*)(ContainerSourceCollection*, DataSource*)) container_source_collection_real_get_containers_holding_source; + ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*) (ContainerSourceCollection *, DataSource*)) container_source_collection_real_get_containers_holding_source; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*)(ContainerSourceCollection*, SourceBacklink*)) container_source_collection_real_convert_backlink_to_container; + ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*) (ContainerSourceCollection *, SourceBacklink*)) container_source_collection_real_convert_backlink_to_container; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*)(SourceCollection*, DataSource*)) container_source_collection_real_notify_item_destroyed; + ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*) (SourceCollection *, DataSource*)) container_source_collection_real_notify_item_destroyed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" ((ContainerSourceCollectionClass *) klass)->container_contents_added = container_source_collection_real_container_contents_added; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -2063,20 +2071,20 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" ((ContainerSourceCollectionClass *) klass)->backlink_to_container_removed = container_source_collection_real_backlink_to_container_removed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_new ("container_contents_added", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_added), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); + container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL] = g_signal_new ("container-contents-added", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_added), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_new ("container_contents_removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); + container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL] = g_signal_new ("container-contents-removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_new ("container_contents_altered", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN, G_TYPE_NONE, 5, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); + container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("container-contents-altered", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN, G_TYPE_NONE, 5, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_new ("backlink_to_container_removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, backlink_to_container_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION); -#line 2072 "ContainerSourceCollection.c" + container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL] = g_signal_new ("backlink-to-container-removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, backlink_to_container_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION); +#line 2080 "ContainerSourceCollection.c" } static void container_source_collection_instance_init (ContainerSourceCollection * self) { - GeeHashSet* _tmp0_ = NULL; - GeeHashSet* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeHashSet* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self->priv = CONTAINER_SOURCE_COLLECTION_GET_PRIVATE (self); #line 16 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -2087,11 +2095,11 @@ static void container_source_collection_instance_init (ContainerSourceCollection _tmp1_ = gee_hash_set_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 18 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self->priv->holding_tank = _tmp1_; -#line 2089 "ContainerSourceCollection.c" +#line 2097 "ContainerSourceCollection.c" } -static void container_source_collection_finalize (DataCollection* obj) { +static void container_source_collection_finalize (DataCollection * obj) { ContainerSourceCollection * self; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection); @@ -2105,7 +2113,7 @@ static void container_source_collection_finalize (DataCollection* obj) { _g_object_unref0 (self->priv->holding_tank); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" DATA_COLLECTION_CLASS (container_source_collection_parent_class)->finalize (obj); -#line 2107 "ContainerSourceCollection.c" +#line 2115 "ContainerSourceCollection.c" } -- cgit v1.2.3