diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:51:46 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:51:46 +0200 |
| commit | 9e7cd144725a270e0460b21747619f447ca87684 (patch) | |
| tree | 77916a766425839c1a2466afd2eb1244371b6b9b /src/MediaDataRepresentation.c | |
| parent | 3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff) | |
New upstream version 0.26.1upstream/0.26.1
Diffstat (limited to 'src/MediaDataRepresentation.c')
| -rw-r--r-- | src/MediaDataRepresentation.c | 1295 |
1 files changed, 655 insertions, 640 deletions
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c index f122b3e..e0df289 100644 --- a/src/MediaDataRepresentation.c +++ b/src/MediaDataRepresentation.c @@ -1,4 +1,4 @@ -/* MediaDataRepresentation.c generated by valac 0.34.4, the Vala compiler +/* MediaDataRepresentation.c generated by valac 0.34.7, the Vala compiler * generated from MediaDataRepresentation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2024,11 +2024,12 @@ static const gchar* media_source_real_get_indexable_keywords (Indexable* base) { static gboolean media_source_real_set_event_id (MediaSource* self, EventID* id) { + gboolean _tmp0_ = FALSE; #line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_set_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return FALSE; -#line 2032 "MediaDataRepresentation.c" + return _tmp0_; +#line 2033 "MediaDataRepresentation.c" } @@ -2037,14 +2038,14 @@ gboolean media_source_set_event_id (MediaSource* self, EventID* id) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->set_event_id (self, id); -#line 2041 "MediaDataRepresentation.c" +#line 2042 "MediaDataRepresentation.c" } static gpointer _g_object_ref0 (gpointer self) { #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? g_object_ref (self) : NULL; -#line 2048 "MediaDataRepresentation.c" +#line 2049 "MediaDataRepresentation.c" } @@ -2053,11 +2054,11 @@ gboolean media_source_delete_original_file (MediaSource* self) { gboolean ret = FALSE; GFile* file = NULL; GFile* _tmp0_ = NULL; - GFile* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GFile* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + GFile* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; + gboolean _tmp14_ = FALSE; GError * _inner_error_ = NULL; #line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); @@ -2067,7 +2068,7 @@ gboolean media_source_delete_original_file (MediaSource* self) { _tmp0_ = media_source_get_master_file (self); #line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" file = _tmp0_; -#line 2071 "MediaDataRepresentation.c" +#line 2072 "MediaDataRepresentation.c" { gboolean _tmp1_ = FALSE; GFile* _tmp2_ = NULL; @@ -2080,12 +2081,12 @@ gboolean media_source_delete_original_file (MediaSource* self) { _tmp1_ = _tmp3_; #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2084 "MediaDataRepresentation.c" +#line 2085 "MediaDataRepresentation.c" goto __catch561_g_error; } #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ret = _tmp1_; -#line 2089 "MediaDataRepresentation.c" +#line 2090 "MediaDataRepresentation.c" } goto __finally561; __catch561_g_error: @@ -2117,11 +2118,13 @@ gboolean media_source_delete_original_file (MediaSource* self) { _g_free0 (_tmp6_); #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 2120 "MediaDataRepresentation.c" +#line 2121 "MediaDataRepresentation.c" } __finally561: #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 2126 "MediaDataRepresentation.c" + gboolean _tmp9_ = FALSE; #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2129,161 +2132,163 @@ gboolean media_source_delete_original_file (MediaSource* self) { #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return FALSE; -#line 2133 "MediaDataRepresentation.c" + return _tmp9_; +#line 2136 "MediaDataRepresentation.c" } #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = file; + _tmp10_ = file; #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = app_dirs_get_import_dir (); + _tmp11_ = app_dirs_get_import_dir (); #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = _tmp10_; + _tmp12_ = _tmp11_; #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp12_ = g_file_has_prefix (_tmp9_, _tmp11_); + _tmp13_ = g_file_has_prefix (_tmp10_, _tmp12_); #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp13_ = _tmp12_; + _tmp14_ = _tmp13_; #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp12_); #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp13_) { -#line 2149 "MediaDataRepresentation.c" + if (_tmp14_) { +#line 2152 "MediaDataRepresentation.c" GFile* parent = NULL; - GFile* _tmp14_ = NULL; GFile* _tmp15_ = NULL; + GFile* _tmp16_ = NULL; #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp14_ = file; + _tmp15_ = file; #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - parent = _tmp15_; + parent = _tmp16_; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 2161 "MediaDataRepresentation.c" - GFile* _tmp16_ = NULL; +#line 2164 "MediaDataRepresentation.c" GFile* _tmp17_ = NULL; GFile* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + GFile* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; - GFile* _tmp21_ = NULL; + gboolean _tmp21_ = FALSE; GFile* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; - GFile* _tmp24_ = NULL; + GFile* _tmp23_ = NULL; + gboolean _tmp24_ = FALSE; + GFile* _tmp25_ = NULL; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp16_ = parent; + _tmp17_ = parent; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = app_dirs_get_import_dir (); + _tmp18_ = app_dirs_get_import_dir (); #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = _tmp17_; + _tmp19_ = _tmp18_; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = g_file_equal (_tmp16_, _tmp18_); + _tmp20_ = g_file_equal (_tmp17_, _tmp19_); #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = !(!_tmp19_); + _tmp21_ = !(!_tmp20_); #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp19_); #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp20_) { + if (_tmp21_) { #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2187 "MediaDataRepresentation.c" +#line 2190 "MediaDataRepresentation.c" } #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = parent; + _tmp22_ = parent; #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = g_file_get_parent (_tmp21_); + _tmp23_ = g_file_get_parent (_tmp22_); #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - parent = _tmp22_; + parent = _tmp23_; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = parent; + _tmp25_ = parent; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp24_ == NULL) { + if (_tmp25_ == NULL) { #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = TRUE; -#line 2203 "MediaDataRepresentation.c" + _tmp24_ = TRUE; +#line 2206 "MediaDataRepresentation.c" } else { - GFile* _tmp25_ = NULL; GFile* _tmp26_ = NULL; GFile* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; + GFile* _tmp28_ = NULL; + gboolean _tmp29_ = FALSE; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = parent; + _tmp26_ = parent; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = app_dirs_get_import_dir (); + _tmp27_ = app_dirs_get_import_dir (); #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = _tmp26_; + _tmp28_ = _tmp27_; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = g_file_equal (_tmp25_, _tmp27_); + _tmp29_ = g_file_equal (_tmp26_, _tmp28_); #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = _tmp28_; + _tmp24_ = _tmp29_; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp27_); -#line 2221 "MediaDataRepresentation.c" + _g_object_unref0 (_tmp28_); +#line 2224 "MediaDataRepresentation.c" } #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp23_) { + if (_tmp24_) { #line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2227 "MediaDataRepresentation.c" +#line 2230 "MediaDataRepresentation.c" } { - gboolean _tmp29_ = FALSE; - GFile* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; + gboolean _tmp30_ = FALSE; + GFile* _tmp31_ = NULL; + gboolean _tmp32_ = FALSE; #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp30_ = parent; + _tmp31_ = parent; #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp31_ = query_is_directory_empty (_tmp30_, &_inner_error_); + _tmp32_ = query_is_directory_empty (_tmp31_, &_inner_error_); #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp29_ = _tmp31_; + _tmp30_ = _tmp32_; #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2241 "MediaDataRepresentation.c" +#line 2244 "MediaDataRepresentation.c" goto __catch562_g_error; } #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp29_) { + if (!_tmp30_) { #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2248 "MediaDataRepresentation.c" +#line 2251 "MediaDataRepresentation.c" } } goto __finally562; __catch562_g_error: { GError* err = NULL; - GFile* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; + GFile* _tmp33_ = NULL; gchar* _tmp34_ = NULL; - GError* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; + gchar* _tmp35_ = NULL; + GError* _tmp36_ = NULL; + const gchar* _tmp37_ = NULL; #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp32_ = parent; + _tmp33_ = parent; #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp33_ = g_file_get_path (_tmp32_); + _tmp34_ = g_file_get_path (_tmp33_); #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp34_ = _tmp33_; + _tmp35_ = _tmp34_; #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35_ = err; + _tmp36_ = err; #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp36_ = _tmp35_->message; + _tmp37_ = _tmp36_->message; #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_warning ("MediaDataRepresentation.vala:122: Unable to query file info for %s: %s", _tmp34_, _tmp36_); + g_warning ("MediaDataRepresentation.vala:122: Unable to query file info for %s: %s", _tmp35_, _tmp37_); #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp35_); #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2282 "MediaDataRepresentation.c" +#line 2285 "MediaDataRepresentation.c" } __finally562: #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 2290 "MediaDataRepresentation.c" + gboolean _tmp38_ = FALSE; #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2293,70 +2298,72 @@ gboolean media_source_delete_original_file (MediaSource* self) { #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return FALSE; -#line 2297 "MediaDataRepresentation.c" + return _tmp38_; +#line 2302 "MediaDataRepresentation.c" } { - GFile* _tmp37_ = NULL; - GFile* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; + GFile* _tmp39_ = NULL; + GFile* _tmp40_ = NULL; + gchar* _tmp41_ = NULL; + gchar* _tmp42_ = NULL; #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp37_ = parent; + _tmp39_ = parent; #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_file_delete (_tmp37_, NULL, &_inner_error_); + g_file_delete (_tmp39_, NULL, &_inner_error_); #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2310 "MediaDataRepresentation.c" +#line 2315 "MediaDataRepresentation.c" goto __catch563_g_error; } #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp38_ = parent; + _tmp40_ = parent; #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp39_ = g_file_get_path (_tmp38_); + _tmp41_ = g_file_get_path (_tmp40_); #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp40_ = _tmp39_; + _tmp42_ = _tmp41_; #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_debug ("MediaDataRepresentation.vala:129: Deleted empty directory %s", _tmp40_); + g_debug ("MediaDataRepresentation.vala:129: Deleted empty directory %s", _tmp42_); #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp40_); -#line 2323 "MediaDataRepresentation.c" + _g_free0 (_tmp42_); +#line 2328 "MediaDataRepresentation.c" } goto __finally563; __catch563_g_error: { GError* err = NULL; - GFile* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; - GError* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; + GFile* _tmp43_ = NULL; + gchar* _tmp44_ = NULL; + gchar* _tmp45_ = NULL; + GError* _tmp46_ = NULL; + const gchar* _tmp47_ = NULL; #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp41_ = parent; + _tmp43_ = parent; #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp42_ = g_file_get_path (_tmp41_); + _tmp44_ = g_file_get_path (_tmp43_); #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp43_ = _tmp42_; + _tmp45_ = _tmp44_; #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp44_ = err; + _tmp46_ = err; #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp45_ = _tmp44_->message; + _tmp47_ = _tmp46_->message; #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_message ("MediaDataRepresentation.vala:132: Unable to delete empty directory %s:" \ -" %s", _tmp43_, _tmp45_); +" %s", _tmp45_, _tmp47_); #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp45_); #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 2354 "MediaDataRepresentation.c" +#line 2359 "MediaDataRepresentation.c" } __finally563: #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 2364 "MediaDataRepresentation.c" + gboolean _tmp48_ = FALSE; #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2366,13 +2373,13 @@ gboolean media_source_delete_original_file (MediaSource* self) { #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return FALSE; -#line 2369 "MediaDataRepresentation.c" + return _tmp48_; +#line 2376 "MediaDataRepresentation.c" } } #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); -#line 2374 "MediaDataRepresentation.c" +#line 2381 "MediaDataRepresentation.c" } #line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = ret; @@ -2380,7 +2387,7 @@ gboolean media_source_delete_original_file (MediaSource* self) { _g_object_unref0 (file); #line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2382 "MediaDataRepresentation.c" +#line 2389 "MediaDataRepresentation.c" } @@ -2404,7 +2411,7 @@ static gchar* media_source_real_get_name (DataObject* base) { _tmp3_ = is_string_empty (_tmp2_); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp3_) { -#line 2406 "MediaDataRepresentation.c" +#line 2413 "MediaDataRepresentation.c" gchar* _tmp4_ = NULL; #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = media_source_get_basename (self); @@ -2412,7 +2419,7 @@ static gchar* media_source_real_get_name (DataObject* base) { _g_free0 (_tmp1_); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp4_; -#line 2414 "MediaDataRepresentation.c" +#line 2421 "MediaDataRepresentation.c" } else { const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -2424,7 +2431,7 @@ static gchar* media_source_real_get_name (DataObject* base) { _g_free0 (_tmp1_); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp6_; -#line 2426 "MediaDataRepresentation.c" +#line 2433 "MediaDataRepresentation.c" } #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; @@ -2432,7 +2439,7 @@ static gchar* media_source_real_get_name (DataObject* base) { _g_free0 (title); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2434 "MediaDataRepresentation.c" +#line 2441 "MediaDataRepresentation.c" } @@ -2456,7 +2463,7 @@ static gchar* media_source_real_get_basename (MediaSource* self) { result = _tmp3_; #line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2458 "MediaDataRepresentation.c" +#line 2465 "MediaDataRepresentation.c" } @@ -2465,7 +2472,7 @@ gchar* media_source_get_basename (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 147 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_basename (self); -#line 2467 "MediaDataRepresentation.c" +#line 2474 "MediaDataRepresentation.c" } @@ -2474,7 +2481,7 @@ static GFile* media_source_real_get_file (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2476 "MediaDataRepresentation.c" +#line 2483 "MediaDataRepresentation.c" } @@ -2483,7 +2490,7 @@ GFile* media_source_get_file (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_file (self); -#line 2485 "MediaDataRepresentation.c" +#line 2492 "MediaDataRepresentation.c" } @@ -2492,7 +2499,7 @@ static GFile* media_source_real_get_master_file (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_master_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2494 "MediaDataRepresentation.c" +#line 2501 "MediaDataRepresentation.c" } @@ -2501,16 +2508,17 @@ GFile* media_source_get_master_file (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_file (self); -#line 2503 "MediaDataRepresentation.c" +#line 2510 "MediaDataRepresentation.c" } static guint64 media_source_real_get_master_filesize (MediaSource* self) { + guint64 _tmp0_ = 0ULL; #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_master_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return 0ULL; -#line 2512 "MediaDataRepresentation.c" + return _tmp0_; +#line 2520 "MediaDataRepresentation.c" } @@ -2519,16 +2527,17 @@ guint64 media_source_get_master_filesize (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL); #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_filesize (self); -#line 2521 "MediaDataRepresentation.c" +#line 2529 "MediaDataRepresentation.c" } static guint64 media_source_real_get_filesize (MediaSource* self) { + guint64 _tmp0_ = 0ULL; #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return 0ULL; -#line 2530 "MediaDataRepresentation.c" + return _tmp0_; +#line 2539 "MediaDataRepresentation.c" } @@ -2537,16 +2546,17 @@ guint64 media_source_get_filesize (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL); #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_filesize (self); -#line 2539 "MediaDataRepresentation.c" +#line 2548 "MediaDataRepresentation.c" } static time_t media_source_real_get_timestamp (MediaSource* self) { + time_t _tmp0_ = 0; #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_timestamp'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return 0; -#line 2548 "MediaDataRepresentation.c" + return _tmp0_; +#line 2558 "MediaDataRepresentation.c" } @@ -2555,7 +2565,7 @@ time_t media_source_get_timestamp (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_timestamp (self); -#line 2557 "MediaDataRepresentation.c" +#line 2567 "MediaDataRepresentation.c" } @@ -2564,7 +2574,7 @@ static BackingFileState** media_source_real_get_backing_files_state (MediaSource g_critical ("Type `%s' does not implement abstract method `media_source_get_backing_files_state'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2566 "MediaDataRepresentation.c" +#line 2576 "MediaDataRepresentation.c" } @@ -2573,7 +2583,7 @@ BackingFileState** media_source_get_backing_files_state (MediaSource* self, int* g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_backing_files_state (self, result_length1); -#line 2575 "MediaDataRepresentation.c" +#line 2585 "MediaDataRepresentation.c" } @@ -2582,7 +2592,7 @@ static gchar* media_source_real_get_title (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_title'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2584 "MediaDataRepresentation.c" +#line 2594 "MediaDataRepresentation.c" } @@ -2591,7 +2601,7 @@ gchar* media_source_get_title (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_title (self); -#line 2593 "MediaDataRepresentation.c" +#line 2603 "MediaDataRepresentation.c" } @@ -2600,7 +2610,7 @@ static gchar* media_source_real_get_comment (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2602 "MediaDataRepresentation.c" +#line 2612 "MediaDataRepresentation.c" } @@ -2609,7 +2619,7 @@ gchar* media_source_get_comment (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_comment (self); -#line 2611 "MediaDataRepresentation.c" +#line 2621 "MediaDataRepresentation.c" } @@ -2618,7 +2628,7 @@ static void media_source_real_set_title (MediaSource* self, const gchar* title) g_critical ("Type `%s' does not implement abstract method `media_source_set_title'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2620 "MediaDataRepresentation.c" +#line 2630 "MediaDataRepresentation.c" } @@ -2627,16 +2637,17 @@ void media_source_set_title (MediaSource* self, const gchar* title) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->set_title (self, title); -#line 2629 "MediaDataRepresentation.c" +#line 2639 "MediaDataRepresentation.c" } static gboolean media_source_real_set_comment (MediaSource* self, const gchar* comment) { + gboolean _tmp0_ = FALSE; #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return FALSE; -#line 2638 "MediaDataRepresentation.c" + return _tmp0_; +#line 2649 "MediaDataRepresentation.c" } @@ -2645,7 +2656,7 @@ gboolean media_source_set_comment (MediaSource* self, const gchar* comment) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->set_comment (self, comment); -#line 2647 "MediaDataRepresentation.c" +#line 2658 "MediaDataRepresentation.c" } @@ -2661,7 +2672,7 @@ gchar* media_source_prep_title (const gchar* title) { result = _tmp1_; #line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2663 "MediaDataRepresentation.c" +#line 2674 "MediaDataRepresentation.c" } @@ -2677,7 +2688,7 @@ gchar* media_source_prep_comment (const gchar* comment) { result = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2679 "MediaDataRepresentation.c" +#line 2690 "MediaDataRepresentation.c" } @@ -2686,7 +2697,7 @@ static Rating media_source_real_get_rating (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return 0; -#line 2688 "MediaDataRepresentation.c" +#line 2699 "MediaDataRepresentation.c" } @@ -2695,7 +2706,7 @@ Rating media_source_get_rating (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_rating (self); -#line 2697 "MediaDataRepresentation.c" +#line 2708 "MediaDataRepresentation.c" } @@ -2704,7 +2715,7 @@ static void media_source_real_set_rating (MediaSource* self, Rating rating) { g_critical ("Type `%s' does not implement abstract method `media_source_set_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2706 "MediaDataRepresentation.c" +#line 2717 "MediaDataRepresentation.c" } @@ -2713,7 +2724,7 @@ void media_source_set_rating (MediaSource* self, Rating rating) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->set_rating (self, rating); -#line 2715 "MediaDataRepresentation.c" +#line 2726 "MediaDataRepresentation.c" } @@ -2722,7 +2733,7 @@ static void media_source_real_increase_rating (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_increase_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2724 "MediaDataRepresentation.c" +#line 2735 "MediaDataRepresentation.c" } @@ -2731,7 +2742,7 @@ void media_source_increase_rating (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->increase_rating (self); -#line 2733 "MediaDataRepresentation.c" +#line 2744 "MediaDataRepresentation.c" } @@ -2740,7 +2751,7 @@ static void media_source_real_decrease_rating (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_decrease_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2742 "MediaDataRepresentation.c" +#line 2753 "MediaDataRepresentation.c" } @@ -2749,7 +2760,7 @@ void media_source_decrease_rating (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->decrease_rating (self); -#line 2751 "MediaDataRepresentation.c" +#line 2762 "MediaDataRepresentation.c" } @@ -2758,7 +2769,7 @@ static void media_source_real_get_dimensions (MediaSource* self, PhotoException g_critical ("Type `%s' does not implement abstract method `media_source_get_dimensions'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2760 "MediaDataRepresentation.c" +#line 2771 "MediaDataRepresentation.c" } @@ -2767,7 +2778,7 @@ void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_s g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_dimensions (self, disallowed_steps, result); -#line 2769 "MediaDataRepresentation.c" +#line 2780 "MediaDataRepresentation.c" } @@ -2776,7 +2787,7 @@ static GdkPixbuf* media_source_real_get_preview_pixbuf (MediaSource* self, Scali g_critical ("Type `%s' does not implement abstract method `media_source_get_preview_pixbuf'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2778 "MediaDataRepresentation.c" +#line 2789 "MediaDataRepresentation.c" } @@ -2785,16 +2796,17 @@ GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_preview_pixbuf (self, scaling, error); -#line 2787 "MediaDataRepresentation.c" +#line 2798 "MediaDataRepresentation.c" } static gboolean media_source_real_is_trashed (MediaSource* self) { + gboolean _tmp0_ = FALSE; #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_is_trashed'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return FALSE; -#line 2796 "MediaDataRepresentation.c" + return _tmp0_; +#line 2808 "MediaDataRepresentation.c" } @@ -2803,7 +2815,7 @@ gboolean media_source_is_trashed (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->is_trashed (self); -#line 2805 "MediaDataRepresentation.c" +#line 2817 "MediaDataRepresentation.c" } @@ -2812,7 +2824,7 @@ static void media_source_real_trash (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_trash'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2814 "MediaDataRepresentation.c" +#line 2826 "MediaDataRepresentation.c" } @@ -2821,7 +2833,7 @@ void media_source_trash (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->trash (self); -#line 2823 "MediaDataRepresentation.c" +#line 2835 "MediaDataRepresentation.c" } @@ -2830,7 +2842,7 @@ static void media_source_real_untrash (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_untrash'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2832 "MediaDataRepresentation.c" +#line 2844 "MediaDataRepresentation.c" } @@ -2839,16 +2851,17 @@ void media_source_untrash (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->untrash (self); -#line 2841 "MediaDataRepresentation.c" +#line 2853 "MediaDataRepresentation.c" } static gboolean media_source_real_is_offline (MediaSource* self) { + gboolean _tmp0_ = FALSE; #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_is_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return FALSE; -#line 2850 "MediaDataRepresentation.c" + return _tmp0_; +#line 2863 "MediaDataRepresentation.c" } @@ -2857,7 +2870,7 @@ gboolean media_source_is_offline (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->is_offline (self); -#line 2859 "MediaDataRepresentation.c" +#line 2872 "MediaDataRepresentation.c" } @@ -2866,7 +2879,7 @@ static void media_source_real_mark_offline (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_mark_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2868 "MediaDataRepresentation.c" +#line 2881 "MediaDataRepresentation.c" } @@ -2875,7 +2888,7 @@ void media_source_mark_offline (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->mark_offline (self); -#line 2877 "MediaDataRepresentation.c" +#line 2890 "MediaDataRepresentation.c" } @@ -2884,7 +2897,7 @@ static void media_source_real_mark_online (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_mark_online'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2886 "MediaDataRepresentation.c" +#line 2899 "MediaDataRepresentation.c" } @@ -2893,7 +2906,7 @@ void media_source_mark_online (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->mark_online (self); -#line 2895 "MediaDataRepresentation.c" +#line 2908 "MediaDataRepresentation.c" } @@ -2902,7 +2915,7 @@ static gchar* media_source_real_get_master_md5 (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_master_md5'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2904 "MediaDataRepresentation.c" +#line 2917 "MediaDataRepresentation.c" } @@ -2911,7 +2924,7 @@ gchar* media_source_get_master_md5 (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_md5 (self); -#line 2913 "MediaDataRepresentation.c" +#line 2926 "MediaDataRepresentation.c" } @@ -2920,7 +2933,7 @@ static void media_source_real_get_event_id (MediaSource* self, EventID* result) g_critical ("Type `%s' does not implement abstract method `media_source_get_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2922 "MediaDataRepresentation.c" +#line 2935 "MediaDataRepresentation.c" } @@ -2929,7 +2942,7 @@ void media_source_get_event_id (MediaSource* self, EventID* result) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_event_id (self, result); -#line 2931 "MediaDataRepresentation.c" +#line 2944 "MediaDataRepresentation.c" } @@ -2950,7 +2963,7 @@ Event* media_source_get_event (MediaSource* self) { _tmp0_ = self->priv->event; #line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 2952 "MediaDataRepresentation.c" +#line 2965 "MediaDataRepresentation.c" Event* _tmp1_ = NULL; Event* _tmp2_ = NULL; #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2961,7 +2974,7 @@ Event* media_source_get_event (MediaSource* self) { result = _tmp2_; #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2963 "MediaDataRepresentation.c" +#line 2976 "MediaDataRepresentation.c" } #line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_get_event_id (self, &_tmp3_); @@ -2975,7 +2988,7 @@ Event* media_source_get_event (MediaSource* self) { result = NULL; #line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2977 "MediaDataRepresentation.c" +#line 2990 "MediaDataRepresentation.c" } #line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = event_global; @@ -2995,7 +3008,7 @@ Event* media_source_get_event (MediaSource* self) { result = _tmp9_; #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2997 "MediaDataRepresentation.c" +#line 3010 "MediaDataRepresentation.c" } @@ -3020,7 +3033,7 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { _tmp1_ = new_event; #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_ != NULL) { -#line 3022 "MediaDataRepresentation.c" +#line 3035 "MediaDataRepresentation.c" Event* _tmp2_ = NULL; EventID _tmp3_ = {0}; #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3029,11 +3042,11 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { event_get_event_id (_tmp2_, &_tmp3_); #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = _tmp3_; -#line 3031 "MediaDataRepresentation.c" +#line 3044 "MediaDataRepresentation.c" } else { #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id_init (&_tmp0_, EVENT_ID_INVALID); -#line 3035 "MediaDataRepresentation.c" +#line 3048 "MediaDataRepresentation.c" } #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp0_; @@ -3051,7 +3064,7 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { result = TRUE; #line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3053 "MediaDataRepresentation.c" +#line 3066 "MediaDataRepresentation.c" } #line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = event_id; @@ -3063,7 +3076,7 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { _tmp10_ = committed; #line 223 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp10_) { -#line 3065 "MediaDataRepresentation.c" +#line 3078 "MediaDataRepresentation.c" Event* _tmp11_ = NULL; Event* _tmp13_ = NULL; Event* _tmp15_ = NULL; @@ -3074,25 +3087,25 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { _tmp11_ = self->priv->event; #line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp11_ != NULL) { -#line 3076 "MediaDataRepresentation.c" +#line 3089 "MediaDataRepresentation.c" Event* _tmp12_ = NULL; #line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = self->priv->event; #line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_detach (_tmp12_, self); -#line 3082 "MediaDataRepresentation.c" +#line 3095 "MediaDataRepresentation.c" } #line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = new_event; #line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp13_ != NULL) { -#line 3088 "MediaDataRepresentation.c" +#line 3101 "MediaDataRepresentation.c" Event* _tmp14_ = NULL; #line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = new_event; #line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_attach (_tmp14_, self); -#line 3094 "MediaDataRepresentation.c" +#line 3107 "MediaDataRepresentation.c" } #line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = new_event; @@ -3110,13 +3123,13 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); #line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (_tmp18_); -#line 3112 "MediaDataRepresentation.c" +#line 3125 "MediaDataRepresentation.c" } #line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = committed; #line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3118 "MediaDataRepresentation.c" +#line 3131 "MediaDataRepresentation.c" } @@ -3139,7 +3152,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _tmp1_ = event; #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_ != NULL) { -#line 3141 "MediaDataRepresentation.c" +#line 3154 "MediaDataRepresentation.c" Event* _tmp2_ = NULL; EventID _tmp3_ = {0}; #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3148,11 +3161,11 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, event_get_event_id (_tmp2_, &_tmp3_); #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = _tmp3_; -#line 3150 "MediaDataRepresentation.c" +#line 3163 "MediaDataRepresentation.c" } else { #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id_init (&_tmp0_, EVENT_ID_INVALID); -#line 3154 "MediaDataRepresentation.c" +#line 3167 "MediaDataRepresentation.c" } #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp0_; @@ -3160,7 +3173,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _tmp4_ = controller; #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" transaction_controller_begin (_tmp4_); -#line 3162 "MediaDataRepresentation.c" +#line 3175 "MediaDataRepresentation.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp5_ = NULL; @@ -3173,7 +3186,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _media_it = _tmp6_; #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3175 "MediaDataRepresentation.c" +#line 3188 "MediaDataRepresentation.c" GeeIterator* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; MediaSource* media = NULL; @@ -3196,7 +3209,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, if (!_tmp8_) { #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3198 "MediaDataRepresentation.c" +#line 3211 "MediaDataRepresentation.c" } #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = _media_it; @@ -3214,7 +3227,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _tmp13_ = old_event; #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp13_ != NULL) { -#line 3216 "MediaDataRepresentation.c" +#line 3229 "MediaDataRepresentation.c" Event* _tmp14_ = NULL; MediaSource* _tmp15_ = NULL; #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3223,7 +3236,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _tmp15_ = media; #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_detach (_tmp14_, _tmp15_); -#line 3225 "MediaDataRepresentation.c" +#line 3238 "MediaDataRepresentation.c" } #line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = media; @@ -3245,17 +3258,17 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _g_object_unref0 (old_event); #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 3247 "MediaDataRepresentation.c" +#line 3260 "MediaDataRepresentation.c" } #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_media_it); -#line 3251 "MediaDataRepresentation.c" +#line 3264 "MediaDataRepresentation.c" } #line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = event; #line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp21_ != NULL) { -#line 3257 "MediaDataRepresentation.c" +#line 3270 "MediaDataRepresentation.c" Event* _tmp22_ = NULL; GeeCollection* _tmp23_ = NULL; #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3264,13 +3277,13 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _tmp23_ = media_sources; #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_attach_many (_tmp22_, _tmp23_); -#line 3266 "MediaDataRepresentation.c" +#line 3279 "MediaDataRepresentation.c" } #line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = alteration_new ("metadata", "event"); #line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" alteration = _tmp24_; -#line 3272 "MediaDataRepresentation.c" +#line 3285 "MediaDataRepresentation.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp25_ = NULL; @@ -3283,7 +3296,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _media_it = _tmp26_; #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3285 "MediaDataRepresentation.c" +#line 3298 "MediaDataRepresentation.c" GeeIterator* _tmp27_ = NULL; gboolean _tmp28_ = FALSE; MediaSource* media = NULL; @@ -3299,7 +3312,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, if (!_tmp28_) { #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3301 "MediaDataRepresentation.c" +#line 3314 "MediaDataRepresentation.c" } #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = _media_it; @@ -3315,11 +3328,11 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject), _tmp32_); #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 3317 "MediaDataRepresentation.c" +#line 3330 "MediaDataRepresentation.c" } #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_media_it); -#line 3321 "MediaDataRepresentation.c" +#line 3334 "MediaDataRepresentation.c" } #line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = controller; @@ -3327,16 +3340,17 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, transaction_controller_commit (_tmp33_); #line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (alteration); -#line 3329 "MediaDataRepresentation.c" +#line 3342 "MediaDataRepresentation.c" } static time_t media_source_real_get_exposure_time (MediaSource* self) { + time_t _tmp0_ = 0; #line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_get_exposure_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return 0; -#line 3338 "MediaDataRepresentation.c" + return _tmp0_; +#line 3352 "MediaDataRepresentation.c" } @@ -3345,7 +3359,7 @@ time_t media_source_get_exposure_time (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_exposure_time (self); -#line 3347 "MediaDataRepresentation.c" +#line 3361 "MediaDataRepresentation.c" } @@ -3354,7 +3368,7 @@ static void media_source_real_get_import_id (MediaSource* self, ImportID* result g_critical ("Type `%s' does not implement abstract method `media_source_get_import_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 3356 "MediaDataRepresentation.c" +#line 3370 "MediaDataRepresentation.c" } @@ -3363,7 +3377,7 @@ void media_source_get_import_id (MediaSource* self, ImportID* result) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_import_id (self, result); -#line 3365 "MediaDataRepresentation.c" +#line 3379 "MediaDataRepresentation.c" } @@ -3372,7 +3386,7 @@ static void media_source_real_master_replaced (MediaSource* self, GFile* old_fil g_return_if_fail (G_IS_FILE (old_file)); #line 33 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 3374 "MediaDataRepresentation.c" +#line 3388 "MediaDataRepresentation.c" } @@ -3391,19 +3405,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = param_values->data[0].v_pointer; -#line 3393 "MediaDataRepresentation.c" +#line 3407 "MediaDataRepresentation.c" } else { #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data1 = param_values->data[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = closure->data; -#line 3399 "MediaDataRepresentation.c" +#line 3413 "MediaDataRepresentation.c" } #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 3405 "MediaDataRepresentation.c" +#line 3419 "MediaDataRepresentation.c" } @@ -3413,76 +3427,76 @@ static void media_source_class_init (MediaSourceClass * klass) { #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourcePrivate)); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->notify_master_replaced = media_source_real_notify_master_replaced; + ((MediaSourceClass *) klass)->notify_master_replaced = (void (*)(MediaSource*, GFile*, GFile*)) media_source_real_notify_master_replaced; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataObjectClass *) klass)->notify_altered = media_source_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) media_source_real_notify_altered; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataObjectClass *) klass)->notify_membership_changed = media_source_real_notify_membership_changed; + ((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) media_source_real_notify_membership_changed; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->set_event_id = media_source_real_set_event_id; + ((MediaSourceClass *) klass)->set_event_id = (gboolean (*)(MediaSource*, EventID*)) media_source_real_set_event_id; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataObjectClass *) klass)->get_name = media_source_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) media_source_real_get_name; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_basename = media_source_real_get_basename; + ((MediaSourceClass *) klass)->get_basename = (gchar* (*)(MediaSource*)) media_source_real_get_basename; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_file = media_source_real_get_file; + ((MediaSourceClass *) klass)->get_file = (GFile* (*)(MediaSource*)) media_source_real_get_file; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_master_file = media_source_real_get_master_file; + ((MediaSourceClass *) klass)->get_master_file = (GFile* (*)(MediaSource*)) media_source_real_get_master_file; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_master_filesize = media_source_real_get_master_filesize; + ((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*)(MediaSource*)) media_source_real_get_master_filesize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_filesize = media_source_real_get_filesize; + ((MediaSourceClass *) klass)->get_filesize = (guint64 (*)(MediaSource*)) media_source_real_get_filesize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_timestamp = media_source_real_get_timestamp; + ((MediaSourceClass *) klass)->get_timestamp = (time_t (*)(MediaSource*)) media_source_real_get_timestamp; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_backing_files_state = media_source_real_get_backing_files_state; + ((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*)(MediaSource*, int*)) media_source_real_get_backing_files_state; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_title = media_source_real_get_title; + ((MediaSourceClass *) klass)->get_title = (gchar* (*)(MediaSource*)) media_source_real_get_title; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_comment = media_source_real_get_comment; + ((MediaSourceClass *) klass)->get_comment = (gchar* (*)(MediaSource*)) media_source_real_get_comment; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->set_title = media_source_real_set_title; + ((MediaSourceClass *) klass)->set_title = (void (*)(MediaSource*, const gchar*)) media_source_real_set_title; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->set_comment = media_source_real_set_comment; + ((MediaSourceClass *) klass)->set_comment = (gboolean (*)(MediaSource*, const gchar*)) media_source_real_set_comment; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_rating = media_source_real_get_rating; + ((MediaSourceClass *) klass)->get_rating = (Rating (*)(MediaSource*)) media_source_real_get_rating; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->set_rating = media_source_real_set_rating; + ((MediaSourceClass *) klass)->set_rating = (void (*)(MediaSource*, Rating)) media_source_real_set_rating; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->increase_rating = media_source_real_increase_rating; + ((MediaSourceClass *) klass)->increase_rating = (void (*)(MediaSource*)) media_source_real_increase_rating; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->decrease_rating = media_source_real_decrease_rating; + ((MediaSourceClass *) klass)->decrease_rating = (void (*)(MediaSource*)) media_source_real_decrease_rating; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_dimensions = media_source_real_get_dimensions; + ((MediaSourceClass *) klass)->get_dimensions = (void (*)(MediaSource*, PhotoException, Dimensions*)) media_source_real_get_dimensions; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_preview_pixbuf = media_source_real_get_preview_pixbuf; + ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) media_source_real_get_preview_pixbuf; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->is_trashed = media_source_real_is_trashed; + ((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) media_source_real_is_trashed; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->trash = media_source_real_trash; + ((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) media_source_real_trash; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->untrash = media_source_real_untrash; + ((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) media_source_real_untrash; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->is_offline = media_source_real_is_offline; + ((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) media_source_real_is_offline; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->mark_offline = media_source_real_mark_offline; + ((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) media_source_real_mark_offline; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->mark_online = media_source_real_mark_online; + ((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) media_source_real_mark_online; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_master_md5 = media_source_real_get_master_md5; + ((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*)(MediaSource*)) media_source_real_get_master_md5; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_event_id = media_source_real_get_event_id; + ((MediaSourceClass *) klass)->get_event_id = (void (*)(MediaSource*, EventID*)) media_source_real_get_event_id; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_exposure_time = media_source_real_get_exposure_time; + ((MediaSourceClass *) klass)->get_exposure_time = (time_t (*)(MediaSource*)) media_source_real_get_exposure_time; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_import_id = media_source_real_get_import_id; + ((MediaSourceClass *) klass)->get_import_id = (void (*)(MediaSource*, ImportID*)) media_source_real_get_import_id; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceClass *) klass)->master_replaced = media_source_real_master_replaced; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" G_OBJECT_CLASS (klass)->finalize = media_source_finalize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_new ("master_replaced", TYPE_MEDIA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceClass, master_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ()); -#line 3484 "MediaDataRepresentation.c" +#line 3498 "MediaDataRepresentation.c" } @@ -3491,7 +3505,7 @@ static void media_source_indexable_interface_init (IndexableIface * iface) { media_source_indexable_parent_iface = g_type_interface_peek_parent (iface); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) media_source_real_get_indexable_keywords; -#line 3493 "MediaDataRepresentation.c" +#line 3507 "MediaDataRepresentation.c" } @@ -3502,7 +3516,7 @@ static void media_source_instance_init (MediaSource * self) { self->priv->event = NULL; #line 37 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->indexable_keywords = NULL; -#line 3504 "MediaDataRepresentation.c" +#line 3518 "MediaDataRepresentation.c" } @@ -3516,7 +3530,7 @@ static void media_source_finalize (GObject* obj) { _g_free0 (self->priv->indexable_keywords); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" G_OBJECT_CLASS (media_source_parent_class)->finalize (obj); -#line 3518 "MediaDataRepresentation.c" +#line 3532 "MediaDataRepresentation.c" } @@ -3539,7 +3553,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { result = file_hash ((GFile*) v); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3541 "MediaDataRepresentation.c" +#line 3555 "MediaDataRepresentation.c" } @@ -3548,7 +3562,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer result = file_equal ((GFile*) a, (GFile*) b); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3550 "MediaDataRepresentation.c" +#line 3564 "MediaDataRepresentation.c" } @@ -3575,14 +3589,14 @@ MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, self = (MediaSourceHoldingTank*) database_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); #line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 3577 "MediaDataRepresentation.c" +#line 3591 "MediaDataRepresentation.c" } MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { #line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_source_holding_tank_construct (TYPE_MEDIA_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 3584 "MediaDataRepresentation.c" +#line 3598 "MediaDataRepresentation.c" } @@ -3605,7 +3619,7 @@ MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingT result = (MediaSource*) _tmp2_; #line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3607 "MediaDataRepresentation.c" +#line 3621 "MediaDataRepresentation.c" } @@ -3615,7 +3629,7 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL); #line 281 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (md5 != NULL, NULL); -#line 3617 "MediaDataRepresentation.c" +#line 3631 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeHashMap* _tmp0_ = NULL; @@ -3627,7 +3641,7 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->master_file_map; #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3642,7 +3656,7 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel _source_it = _tmp5_; #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3644 "MediaDataRepresentation.c" +#line 3658 "MediaDataRepresentation.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; MediaSource* source = NULL; @@ -3661,7 +3675,7 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel if (!_tmp7_) { #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3663 "MediaDataRepresentation.c" +#line 3677 "MediaDataRepresentation.c" } #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _source_it; @@ -3689,28 +3703,28 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel _g_object_unref0 (_source_it); #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3691 "MediaDataRepresentation.c" +#line 3705 "MediaDataRepresentation.c" } #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3695 "MediaDataRepresentation.c" +#line 3709 "MediaDataRepresentation.c" } #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3699 "MediaDataRepresentation.c" +#line 3713 "MediaDataRepresentation.c" } #line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; #line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3705 "MediaDataRepresentation.c" +#line 3719 "MediaDataRepresentation.c" } static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) { #line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_holding_tank_on_master_source_replaced ((MediaSourceHoldingTank*) self, _sender, old_file, new_file); -#line 3712 "MediaDataRepresentation.c" +#line 3726 "MediaDataRepresentation.c" } @@ -3730,7 +3744,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _tmp0_ = added; #line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 3732 "MediaDataRepresentation.c" +#line 3746 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_ = NULL; @@ -3743,7 +3757,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _source_it = _tmp2_; #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3745 "MediaDataRepresentation.c" +#line 3759 "MediaDataRepresentation.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; DataSource* source = NULL; @@ -3766,7 +3780,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin if (!_tmp4_) { #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3768 "MediaDataRepresentation.c" +#line 3782 "MediaDataRepresentation.c" } #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _source_it; @@ -3802,18 +3816,18 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _g_object_unref0 (media_source); #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3804 "MediaDataRepresentation.c" +#line 3818 "MediaDataRepresentation.c" } #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3808 "MediaDataRepresentation.c" +#line 3822 "MediaDataRepresentation.c" } } #line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = removed; #line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp15_ != NULL) { -#line 3815 "MediaDataRepresentation.c" +#line 3829 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp16_ = NULL; @@ -3826,7 +3840,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _source_it = _tmp17_; #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3828 "MediaDataRepresentation.c" +#line 3842 "MediaDataRepresentation.c" GeeIterator* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; DataSource* source = NULL; @@ -3853,7 +3867,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin if (!_tmp19_) { #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3855 "MediaDataRepresentation.c" +#line 3869 "MediaDataRepresentation.c" } #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = _source_it; @@ -3897,11 +3911,11 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _g_object_unref0 (media_source); #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3899 "MediaDataRepresentation.c" +#line 3913 "MediaDataRepresentation.c" } #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3903 "MediaDataRepresentation.c" +#line 3917 "MediaDataRepresentation.c" } } #line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3910,7 +3924,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _tmp34_ = removed; #line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp33_, _tmp34_); -#line 3912 "MediaDataRepresentation.c" +#line 3926 "MediaDataRepresentation.c" } @@ -3948,7 +3962,7 @@ static void media_source_holding_tank_on_master_source_replaced (MediaSourceHold _tmp5_ = media_source; #line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, _tmp5_); -#line 3950 "MediaDataRepresentation.c" +#line 3964 "MediaDataRepresentation.c" } @@ -3960,8 +3974,8 @@ static void media_source_holding_tank_class_init (MediaSourceHoldingTankClass * #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceHoldingTankPrivate)); #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((SourceHoldingTankClass *) klass)->notify_contents_altered = media_source_holding_tank_real_notify_contents_altered; -#line 3963 "MediaDataRepresentation.c" + ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered; +#line 3977 "MediaDataRepresentation.c" } @@ -3970,10 +3984,10 @@ static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * se #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE (self); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->master_file_map = _tmp0_; -#line 3975 "MediaDataRepresentation.c" +#line 3989 "MediaDataRepresentation.c" } @@ -3985,7 +3999,7 @@ static void media_source_holding_tank_finalize (SourceHoldingTank* obj) { _g_object_unref0 (self->priv->master_file_map); #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->finalize (obj); -#line 3987 "MediaDataRepresentation.c" +#line 4001 "MediaDataRepresentation.c" } @@ -4004,7 +4018,7 @@ GType media_source_holding_tank_get_type (void) { static gpointer _data_collection_ref0 (gpointer self) { #line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? data_collection_ref (self) : NULL; -#line 4006 "MediaDataRepresentation.c" +#line 4020 "MediaDataRepresentation.c" } @@ -4026,14 +4040,14 @@ MediaSourceTransactionController* media_source_transaction_controller_construct self->priv->sources = _tmp1_; #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 4028 "MediaDataRepresentation.c" +#line 4042 "MediaDataRepresentation.c" } MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources) { #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_source_transaction_controller_construct (TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, sources); -#line 4035 "MediaDataRepresentation.c" +#line 4049 "MediaDataRepresentation.c" } @@ -4048,7 +4062,7 @@ static void media_source_transaction_controller_real_begin_impl (TransactionCont _tmp0_ = self->priv->sources; #line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 4050 "MediaDataRepresentation.c" +#line 4064 "MediaDataRepresentation.c" } @@ -4070,7 +4084,7 @@ static void media_source_transaction_controller_real_commit_impl (TransactionCon g_propagate_error (error, _inner_error_); #line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 4072 "MediaDataRepresentation.c" +#line 4086 "MediaDataRepresentation.c" } } @@ -4083,17 +4097,17 @@ static void media_source_transaction_controller_class_init (MediaSourceTransacti #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceTransactionControllerPrivate)); #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((TransactionControllerClass *) klass)->begin_impl = media_source_transaction_controller_real_begin_impl; + ((TransactionControllerClass *) klass)->begin_impl = (void (*)(TransactionController*, GError**)) media_source_transaction_controller_real_begin_impl; #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((TransactionControllerClass *) klass)->commit_impl = media_source_transaction_controller_real_commit_impl; -#line 4088 "MediaDataRepresentation.c" + ((TransactionControllerClass *) klass)->commit_impl = (void (*)(TransactionController*, GError**)) media_source_transaction_controller_real_commit_impl; +#line 4102 "MediaDataRepresentation.c" } static void media_source_transaction_controller_instance_init (MediaSourceTransactionController * self) { #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE (self); -#line 4095 "MediaDataRepresentation.c" +#line 4109 "MediaDataRepresentation.c" } @@ -4105,7 +4119,7 @@ static void media_source_transaction_controller_finalize (TransactionController* _data_collection_unref0 (self->priv->sources); #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" TRANSACTION_CONTROLLER_CLASS (media_source_transaction_controller_parent_class)->finalize (obj); -#line 4107 "MediaDataRepresentation.c" +#line 4121 "MediaDataRepresentation.c" } @@ -4126,7 +4140,7 @@ static gint _import_id_compare_func_gcompare_data_func (gconstpointer a, gconstp result = import_id_compare_func ((ImportID*) a, (ImportID*) b); #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4128 "MediaDataRepresentation.c" +#line 4142 "MediaDataRepresentation.c" } @@ -4161,7 +4175,7 @@ MediaSourceCollection* media_source_collection_construct (GType object_type, con self->priv->offline_bin = _tmp3_; #line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 4163 "MediaDataRepresentation.c" +#line 4177 "MediaDataRepresentation.c" } @@ -4172,7 +4186,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* g_return_if_fail ((photos == NULL) || GEE_IS_COLLECTION (photos)); #line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((videos == NULL) || GEE_IS_COLLECTION (videos)); -#line 4174 "MediaDataRepresentation.c" +#line 4188 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -4185,7 +4199,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* _source_it = _tmp1_; #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4187 "MediaDataRepresentation.c" +#line 4201 "MediaDataRepresentation.c" GeeIterator* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; MediaSource* source = NULL; @@ -4201,7 +4215,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* if (!_tmp3_) { #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4203 "MediaDataRepresentation.c" +#line 4217 "MediaDataRepresentation.c" } #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _source_it; @@ -4213,21 +4227,21 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* _tmp7_ = photos; #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp7_ != NULL) { -#line 4215 "MediaDataRepresentation.c" +#line 4229 "MediaDataRepresentation.c" MediaSource* _tmp8_ = NULL; #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = source; #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_LIBRARY_PHOTO); -#line 4221 "MediaDataRepresentation.c" +#line 4235 "MediaDataRepresentation.c" } else { #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = FALSE; -#line 4225 "MediaDataRepresentation.c" +#line 4239 "MediaDataRepresentation.c" } #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp6_) { -#line 4229 "MediaDataRepresentation.c" +#line 4243 "MediaDataRepresentation.c" GeeCollection* _tmp9_ = NULL; MediaSource* _tmp10_ = NULL; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4236,7 +4250,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* _tmp10_ = source; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_collection_add (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4238 "MediaDataRepresentation.c" +#line 4252 "MediaDataRepresentation.c" } else { gboolean _tmp11_ = FALSE; GeeCollection* _tmp12_ = NULL; @@ -4244,21 +4258,21 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* _tmp12_ = videos; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp12_ != NULL) { -#line 4246 "MediaDataRepresentation.c" +#line 4260 "MediaDataRepresentation.c" MediaSource* _tmp13_ = NULL; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = source; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO); -#line 4252 "MediaDataRepresentation.c" +#line 4266 "MediaDataRepresentation.c" } else { #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = FALSE; -#line 4256 "MediaDataRepresentation.c" +#line 4270 "MediaDataRepresentation.c" } #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp11_) { -#line 4260 "MediaDataRepresentation.c" +#line 4274 "MediaDataRepresentation.c" GeeCollection* _tmp14_ = NULL; MediaSource* _tmp15_ = NULL; #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4267,7 +4281,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* _tmp15_ = source; #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_collection_add (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIDEO, Video)); -#line 4269 "MediaDataRepresentation.c" +#line 4283 "MediaDataRepresentation.c" } else { gboolean _tmp16_ = FALSE; GeeCollection* _tmp17_ = NULL; @@ -4277,18 +4291,18 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* if (_tmp17_ != NULL) { #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = TRUE; -#line 4279 "MediaDataRepresentation.c" +#line 4293 "MediaDataRepresentation.c" } else { GeeCollection* _tmp18_ = NULL; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = videos; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = _tmp18_ != NULL; -#line 4286 "MediaDataRepresentation.c" +#line 4300 "MediaDataRepresentation.c" } #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp16_) { -#line 4290 "MediaDataRepresentation.c" +#line 4304 "MediaDataRepresentation.c" MediaSource* _tmp19_ = NULL; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; @@ -4302,17 +4316,17 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* g_warning ("MediaDataRepresentation.vala:397: Unrecognized media: %s", _tmp21_); #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp21_); -#line 4304 "MediaDataRepresentation.c" +#line 4318 "MediaDataRepresentation.c" } } } #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 4310 "MediaDataRepresentation.c" +#line 4324 "MediaDataRepresentation.c" } #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 4314 "MediaDataRepresentation.c" +#line 4328 "MediaDataRepresentation.c" } } @@ -4332,11 +4346,11 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" photos = _tmp0_; #line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" videos = _tmp1_; #line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4344,13 +4358,13 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun #line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_filter_media (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); #line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _tmp3_; #line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_photo_count = _tmp4_; #line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _tmp5_; #line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4363,13 +4377,13 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun if (photo_count) { #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *photo_count = _vala_photo_count; -#line 4365 "MediaDataRepresentation.c" +#line 4379 "MediaDataRepresentation.c" } #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (video_count) { #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *video_count = _vala_video_count; -#line 4371 "MediaDataRepresentation.c" +#line 4385 "MediaDataRepresentation.c" } } @@ -4378,7 +4392,7 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { gboolean result = FALSE; #line 412 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE); -#line 4380 "MediaDataRepresentation.c" +#line 4394 "MediaDataRepresentation.c" { GeeIterator* _current_media_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -4391,7 +4405,7 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { _current_media_it = _tmp1_; #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4393 "MediaDataRepresentation.c" +#line 4407 "MediaDataRepresentation.c" GeeIterator* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; MediaSource* current_media = NULL; @@ -4406,7 +4420,7 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { if (!_tmp3_) { #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4408 "MediaDataRepresentation.c" +#line 4422 "MediaDataRepresentation.c" } #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_media_it; @@ -4426,21 +4440,21 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { _g_object_unref0 (_current_media_it); #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4428 "MediaDataRepresentation.c" +#line 4442 "MediaDataRepresentation.c" } #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 4432 "MediaDataRepresentation.c" +#line 4446 "MediaDataRepresentation.c" } #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 4436 "MediaDataRepresentation.c" +#line 4450 "MediaDataRepresentation.c" } #line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; #line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4442 "MediaDataRepresentation.c" +#line 4456 "MediaDataRepresentation.c" } @@ -4448,7 +4462,7 @@ gboolean media_source_collection_has_video (GeeCollection* media) { gboolean result = FALSE; #line 422 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE); -#line 4450 "MediaDataRepresentation.c" +#line 4464 "MediaDataRepresentation.c" { GeeIterator* _current_media_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -4461,7 +4475,7 @@ gboolean media_source_collection_has_video (GeeCollection* media) { _current_media_it = _tmp1_; #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4463 "MediaDataRepresentation.c" +#line 4477 "MediaDataRepresentation.c" GeeIterator* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; MediaSource* current_media = NULL; @@ -4476,7 +4490,7 @@ gboolean media_source_collection_has_video (GeeCollection* media) { if (!_tmp3_) { #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4478 "MediaDataRepresentation.c" +#line 4492 "MediaDataRepresentation.c" } #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_media_it; @@ -4496,21 +4510,21 @@ gboolean media_source_collection_has_video (GeeCollection* media) { _g_object_unref0 (_current_media_it); #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4498 "MediaDataRepresentation.c" +#line 4512 "MediaDataRepresentation.c" } #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 4502 "MediaDataRepresentation.c" +#line 4516 "MediaDataRepresentation.c" } #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 4506 "MediaDataRepresentation.c" +#line 4520 "MediaDataRepresentation.c" } #line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; #line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4512 "MediaDataRepresentation.c" +#line 4526 "MediaDataRepresentation.c" } @@ -4519,7 +4533,7 @@ static MediaSourceHoldingTank* media_source_collection_real_create_trashcan (Med g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_trashcan'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4521 "MediaDataRepresentation.c" +#line 4535 "MediaDataRepresentation.c" } @@ -4528,7 +4542,7 @@ MediaSourceHoldingTank* media_source_collection_create_trashcan (MediaSourceColl g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_trashcan (self); -#line 4530 "MediaDataRepresentation.c" +#line 4544 "MediaDataRepresentation.c" } @@ -4537,7 +4551,7 @@ static MediaSourceHoldingTank* media_source_collection_real_create_offline_bin ( g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_offline_bin'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4539 "MediaDataRepresentation.c" +#line 4553 "MediaDataRepresentation.c" } @@ -4546,7 +4560,7 @@ MediaSourceHoldingTank* media_source_collection_create_offline_bin (MediaSourceC g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_offline_bin (self); -#line 4548 "MediaDataRepresentation.c" +#line 4562 "MediaDataRepresentation.c" } @@ -4555,7 +4569,7 @@ static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSou g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_media_monitor'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4557 "MediaDataRepresentation.c" +#line 4571 "MediaDataRepresentation.c" } @@ -4564,7 +4578,7 @@ MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollectio g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_media_monitor (self, workers, cancellable); -#line 4566 "MediaDataRepresentation.c" +#line 4580 "MediaDataRepresentation.c" } @@ -4573,7 +4587,7 @@ static gchar* media_source_collection_real_get_typename (MediaSourceCollection* g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4575 "MediaDataRepresentation.c" +#line 4589 "MediaDataRepresentation.c" } @@ -4582,16 +4596,17 @@ gchar* media_source_collection_get_typename (MediaSourceCollection* self) { g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_typename (self); -#line 4584 "MediaDataRepresentation.c" +#line 4598 "MediaDataRepresentation.c" } static gboolean media_source_collection_real_is_file_recognized (MediaSourceCollection* self, GFile* file) { + gboolean _tmp0_ = FALSE; #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("Type `%s' does not implement abstract method `media_source_collection_is_file_recognized'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - return FALSE; -#line 4593 "MediaDataRepresentation.c" + return _tmp0_; +#line 4608 "MediaDataRepresentation.c" } @@ -4600,14 +4615,14 @@ gboolean media_source_collection_is_file_recognized (MediaSourceCollection* self g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), FALSE); #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->is_file_recognized (self, file); -#line 4602 "MediaDataRepresentation.c" +#line 4617 "MediaDataRepresentation.c" } static gpointer _source_holding_tank_ref0 (gpointer self) { #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? source_holding_tank_ref (self) : NULL; -#line 4609 "MediaDataRepresentation.c" +#line 4624 "MediaDataRepresentation.c" } @@ -4625,7 +4640,7 @@ MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollect result = _tmp1_; #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4627 "MediaDataRepresentation.c" +#line 4642 "MediaDataRepresentation.c" } @@ -4643,7 +4658,7 @@ MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceColl result = _tmp1_; #line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4645 "MediaDataRepresentation.c" +#line 4660 "MediaDataRepresentation.c" } @@ -4652,7 +4667,7 @@ static MediaSource* media_source_collection_real_fetch_by_numeric_id (MediaSourc g_critical ("Type `%s' does not implement abstract method `media_source_collection_fetch_by_numeric_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4654 "MediaDataRepresentation.c" +#line 4669 "MediaDataRepresentation.c" } @@ -4661,14 +4676,14 @@ MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_numeric_id (self, numeric_id); -#line 4663 "MediaDataRepresentation.c" +#line 4678 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_import_roll_altered (MediaSourceCollection* self) { #line 456 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit_by_name (self, "import-roll-altered"); -#line 4670 "MediaDataRepresentation.c" +#line 4685 "MediaDataRepresentation.c" } @@ -4677,14 +4692,14 @@ void media_source_collection_notify_import_roll_altered (MediaSourceCollection* g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_import_roll_altered (self); -#line 4679 "MediaDataRepresentation.c" +#line 4694 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_flagged_contents_altered (MediaSourceCollection* self) { #line 460 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit_by_name (self, "flagged-contents-altered"); -#line 4686 "MediaDataRepresentation.c" +#line 4701 "MediaDataRepresentation.c" } @@ -4693,7 +4708,7 @@ void media_source_collection_notify_flagged_contents_altered (MediaSourceCollect g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 459 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_flagged_contents_altered (self); -#line 4695 "MediaDataRepresentation.c" +#line 4710 "MediaDataRepresentation.c" } @@ -4705,7 +4720,7 @@ static void media_source_collection_real_notify_media_import_starting (MediaSour _tmp0_ = media; #line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit_by_name (self, "media-import-starting", _tmp0_); -#line 4707 "MediaDataRepresentation.c" +#line 4722 "MediaDataRepresentation.c" } @@ -4714,7 +4729,7 @@ void media_source_collection_notify_media_import_starting (MediaSourceCollection g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_starting (self, media); -#line 4716 "MediaDataRepresentation.c" +#line 4731 "MediaDataRepresentation.c" } @@ -4726,7 +4741,7 @@ static void media_source_collection_real_notify_media_import_completed (MediaSou _tmp0_ = media; #line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit_by_name (self, "media-import-completed", _tmp0_); -#line 4728 "MediaDataRepresentation.c" +#line 4743 "MediaDataRepresentation.c" } @@ -4735,7 +4750,7 @@ void media_source_collection_notify_media_import_completed (MediaSourceCollectio g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_completed (self, media); -#line 4737 "MediaDataRepresentation.c" +#line 4752 "MediaDataRepresentation.c" } @@ -4758,7 +4773,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge to_offline = NULL; #line 474 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = FALSE; -#line 4760 "MediaDataRepresentation.c" +#line 4775 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; GeeMap* _tmp0_ = NULL; @@ -4785,7 +4800,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _object_it = _tmp5_; #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4787 "MediaDataRepresentation.c" +#line 4802 "MediaDataRepresentation.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; DataObject* object = NULL; @@ -4818,7 +4833,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge if (!_tmp7_) { #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4820 "MediaDataRepresentation.c" +#line 4835 "MediaDataRepresentation.c" } #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _object_it; @@ -4854,7 +4869,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _g_object_unref0 (object); #line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 4856 "MediaDataRepresentation.c" +#line 4871 "MediaDataRepresentation.c" } #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = source; @@ -4862,7 +4877,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp19_ = media_source_is_trashed (_tmp18_); #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp19_) { -#line 4864 "MediaDataRepresentation.c" +#line 4879 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp20_ = NULL; MediaSourceHoldingTank* _tmp21_ = NULL; MediaSource* _tmp22_ = NULL; @@ -4879,15 +4894,15 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp17_ = !_tmp23_; #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp21_); -#line 4881 "MediaDataRepresentation.c" +#line 4896 "MediaDataRepresentation.c" } else { #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = FALSE; -#line 4885 "MediaDataRepresentation.c" +#line 4900 "MediaDataRepresentation.c" } #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_) { -#line 4889 "MediaDataRepresentation.c" +#line 4904 "MediaDataRepresentation.c" GeeArrayList* _tmp24_ = NULL; GeeArrayList* _tmp26_ = NULL; MediaSource* _tmp27_ = NULL; @@ -4895,15 +4910,15 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp24_ = to_trashcan; #line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_ == NULL) { -#line 4897 "MediaDataRepresentation.c" +#line 4912 "MediaDataRepresentation.c" GeeArrayList* _tmp25_ = NULL; #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp25_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_trashcan); #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_trashcan = _tmp25_; -#line 4905 "MediaDataRepresentation.c" +#line 4920 "MediaDataRepresentation.c" } #line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = to_trashcan; @@ -4919,7 +4934,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _g_object_unref0 (object); #line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 4921 "MediaDataRepresentation.c" +#line 4936 "MediaDataRepresentation.c" } #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = source; @@ -4927,7 +4942,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp30_ = media_source_is_offline (_tmp29_); #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp30_) { -#line 4929 "MediaDataRepresentation.c" +#line 4944 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp31_ = NULL; MediaSourceHoldingTank* _tmp32_ = NULL; MediaSource* _tmp33_ = NULL; @@ -4944,15 +4959,15 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp28_ = !_tmp34_; #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp32_); -#line 4946 "MediaDataRepresentation.c" +#line 4961 "MediaDataRepresentation.c" } else { #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = FALSE; -#line 4950 "MediaDataRepresentation.c" +#line 4965 "MediaDataRepresentation.c" } #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp28_) { -#line 4954 "MediaDataRepresentation.c" +#line 4969 "MediaDataRepresentation.c" GeeArrayList* _tmp35_ = NULL; GeeArrayList* _tmp37_ = NULL; MediaSource* _tmp38_ = NULL; @@ -4960,15 +4975,15 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp35_ = to_offline; #line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp35_ == NULL) { -#line 4962 "MediaDataRepresentation.c" +#line 4977 "MediaDataRepresentation.c" GeeArrayList* _tmp36_ = NULL; #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp36_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp36_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_offline); #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_offline = _tmp36_; -#line 4970 "MediaDataRepresentation.c" +#line 4985 "MediaDataRepresentation.c" } #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = to_offline; @@ -4976,7 +4991,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp38_ = source; #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_); -#line 4978 "MediaDataRepresentation.c" +#line 4993 "MediaDataRepresentation.c" } #line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = source; @@ -4988,7 +5003,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp41_ = flaggable; #line 500 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp41_ != NULL) { -#line 4990 "MediaDataRepresentation.c" +#line 5005 "MediaDataRepresentation.c" Flaggable* _tmp42_ = NULL; gboolean _tmp43_ = FALSE; #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4997,7 +5012,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp43_ = flaggable_is_flagged (_tmp42_); #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp43_) { -#line 4999 "MediaDataRepresentation.c" +#line 5014 "MediaDataRepresentation.c" gboolean _tmp44_ = FALSE; GeeSet* _tmp45_ = NULL; MediaSource* _tmp46_ = NULL; @@ -5012,18 +5027,18 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge if (_tmp47_) { #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = TRUE; -#line 5014 "MediaDataRepresentation.c" +#line 5029 "MediaDataRepresentation.c" } else { gboolean _tmp48_ = FALSE; #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp48_ = flagged_altered; #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = _tmp48_; -#line 5021 "MediaDataRepresentation.c" +#line 5036 "MediaDataRepresentation.c" } #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp44_; -#line 5025 "MediaDataRepresentation.c" +#line 5040 "MediaDataRepresentation.c" } else { gboolean _tmp49_ = FALSE; GeeSet* _tmp50_ = NULL; @@ -5039,18 +5054,18 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge if (_tmp52_) { #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp49_ = TRUE; -#line 5041 "MediaDataRepresentation.c" +#line 5056 "MediaDataRepresentation.c" } else { gboolean _tmp53_ = FALSE; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp53_ = flagged_altered; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp49_ = _tmp53_; -#line 5048 "MediaDataRepresentation.c" +#line 5063 "MediaDataRepresentation.c" } #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp49_; -#line 5052 "MediaDataRepresentation.c" +#line 5067 "MediaDataRepresentation.c" } } #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5061,17 +5076,17 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _alteration_unref0 (alteration); #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5063 "MediaDataRepresentation.c" +#line 5078 "MediaDataRepresentation.c" } #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5067 "MediaDataRepresentation.c" +#line 5082 "MediaDataRepresentation.c" } #line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp54_ = to_trashcan; #line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp54_ != NULL) { -#line 5073 "MediaDataRepresentation.c" +#line 5088 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp55_ = NULL; MediaSourceHoldingTank* _tmp56_ = NULL; GeeArrayList* _tmp57_ = NULL; @@ -5085,13 +5100,13 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection)); #line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp56_); -#line 5087 "MediaDataRepresentation.c" +#line 5102 "MediaDataRepresentation.c" } #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp58_ = to_offline; #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp58_ != NULL) { -#line 5093 "MediaDataRepresentation.c" +#line 5108 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp59_ = NULL; MediaSourceHoldingTank* _tmp60_ = NULL; GeeArrayList* _tmp61_ = NULL; @@ -5105,7 +5120,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); #line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp60_); -#line 5107 "MediaDataRepresentation.c" +#line 5122 "MediaDataRepresentation.c" } #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp62_ = flagged_altered; @@ -5113,7 +5128,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge if (_tmp62_) { #line 515 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_flagged_contents_altered (self); -#line 5115 "MediaDataRepresentation.c" +#line 5130 "MediaDataRepresentation.c" } #line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp63_ = items; @@ -5123,14 +5138,14 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _g_object_unref0 (to_offline); #line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_trashcan); -#line 5125 "MediaDataRepresentation.c" +#line 5140 "MediaDataRepresentation.c" } static void _media_source_collection_on_master_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) { #line 529 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_on_master_replaced ((MediaSourceCollection*) self, _sender, old_file, new_file); -#line 5132 "MediaDataRepresentation.c" +#line 5147 "MediaDataRepresentation.c" } @@ -5158,7 +5173,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp0_ = added; #line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 5160 "MediaDataRepresentation.c" +#line 5175 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp1_ = NULL; @@ -5171,7 +5186,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _object_it = _tmp2_; #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 5173 "MediaDataRepresentation.c" +#line 5188 "MediaDataRepresentation.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; DataObject* object = NULL; @@ -5202,7 +5217,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (!_tmp4_) { #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 5204 "MediaDataRepresentation.c" +#line 5219 "MediaDataRepresentation.c" } #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _object_it; @@ -5244,7 +5259,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp17_ = import_id_is_valid (&import_id); #line 532 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_) { -#line 5246 "MediaDataRepresentation.c" +#line 5261 "MediaDataRepresentation.c" GeeTreeSet* _tmp18_ = NULL; ImportID _tmp19_ = {0}; GeeMultiMap* _tmp20_ = NULL; @@ -5266,7 +5281,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection gee_multi_map_set (_tmp20_, &_tmp21_, _tmp22_); #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = TRUE; -#line 5268 "MediaDataRepresentation.c" +#line 5283 "MediaDataRepresentation.c" } #line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = media; @@ -5278,7 +5293,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp25_ = flaggable; #line 540 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp25_ != NULL) { -#line 5280 "MediaDataRepresentation.c" +#line 5295 "MediaDataRepresentation.c" Flaggable* _tmp26_ = NULL; gboolean _tmp27_ = FALSE; #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5287,7 +5302,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp27_ = flaggable_is_flagged (_tmp26_); #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp27_) { -#line 5289 "MediaDataRepresentation.c" +#line 5304 "MediaDataRepresentation.c" gboolean _tmp28_ = FALSE; GeeSet* _tmp29_ = NULL; MediaSource* _tmp30_ = NULL; @@ -5302,18 +5317,18 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp31_) { #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = TRUE; -#line 5304 "MediaDataRepresentation.c" +#line 5319 "MediaDataRepresentation.c" } else { gboolean _tmp32_ = FALSE; #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp32_ = flagged_altered; #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = _tmp32_; -#line 5311 "MediaDataRepresentation.c" +#line 5326 "MediaDataRepresentation.c" } #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp28_; -#line 5315 "MediaDataRepresentation.c" +#line 5330 "MediaDataRepresentation.c" } else { gboolean _tmp33_ = FALSE; GeeSet* _tmp34_ = NULL; @@ -5329,18 +5344,18 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp36_) { #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = TRUE; -#line 5331 "MediaDataRepresentation.c" +#line 5346 "MediaDataRepresentation.c" } else { gboolean _tmp37_ = FALSE; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = flagged_altered; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = _tmp37_; -#line 5338 "MediaDataRepresentation.c" +#line 5353 "MediaDataRepresentation.c" } #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp33_; -#line 5342 "MediaDataRepresentation.c" +#line 5357 "MediaDataRepresentation.c" } } #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5349,18 +5364,18 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _g_object_unref0 (media); #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5351 "MediaDataRepresentation.c" +#line 5366 "MediaDataRepresentation.c" } #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5355 "MediaDataRepresentation.c" +#line 5370 "MediaDataRepresentation.c" } } #line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp38_ = removed; #line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp38_ != NULL) { -#line 5362 "MediaDataRepresentation.c" +#line 5377 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp39_ = NULL; @@ -5373,7 +5388,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _object_it = _tmp40_; #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 5375 "MediaDataRepresentation.c" +#line 5390 "MediaDataRepresentation.c" GeeIterator* _tmp41_ = NULL; gboolean _tmp42_ = FALSE; DataObject* object = NULL; @@ -5408,7 +5423,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (!_tmp42_) { #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 5410 "MediaDataRepresentation.c" +#line 5425 "MediaDataRepresentation.c" } #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp43_ = _object_it; @@ -5458,7 +5473,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp58_ = import_id_is_valid (&import_id); #line 558 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp58_) { -#line 5460 "MediaDataRepresentation.c" +#line 5475 "MediaDataRepresentation.c" GeeMultiMap* _tmp59_ = NULL; ImportID _tmp60_ = {0}; MediaSource* _tmp61_ = NULL; @@ -5489,7 +5504,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp66_ = gee_multi_map_contains (_tmp64_, &_tmp65_); #line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp66_) { -#line 5491 "MediaDataRepresentation.c" +#line 5506 "MediaDataRepresentation.c" GeeTreeSet* _tmp67_ = NULL; ImportID _tmp68_ = {0}; #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5498,11 +5513,11 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp68_ = import_id; #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp68_); -#line 5500 "MediaDataRepresentation.c" +#line 5515 "MediaDataRepresentation.c" } #line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = TRUE; -#line 5504 "MediaDataRepresentation.c" +#line 5519 "MediaDataRepresentation.c" } #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp70_ = self->priv->flagged; @@ -5514,14 +5529,14 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp72_) { #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp69_ = TRUE; -#line 5516 "MediaDataRepresentation.c" +#line 5531 "MediaDataRepresentation.c" } else { gboolean _tmp73_ = FALSE; #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp73_ = flagged_altered; #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp69_ = _tmp73_; -#line 5523 "MediaDataRepresentation.c" +#line 5538 "MediaDataRepresentation.c" } #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp69_; @@ -5529,11 +5544,11 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _g_object_unref0 (media); #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5531 "MediaDataRepresentation.c" +#line 5546 "MediaDataRepresentation.c" } #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5535 "MediaDataRepresentation.c" +#line 5550 "MediaDataRepresentation.c" } } #line 571 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5542,7 +5557,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp74_) { #line 572 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_import_roll_altered (self); -#line 5544 "MediaDataRepresentation.c" +#line 5559 "MediaDataRepresentation.c" } #line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp75_ = flagged_altered; @@ -5550,7 +5565,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp75_) { #line 575 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_flagged_contents_altered (self); -#line 5552 "MediaDataRepresentation.c" +#line 5567 "MediaDataRepresentation.c" } #line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp76_ = added; @@ -5558,7 +5573,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp77_ = removed; #line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_COLLECTION_CLASS (media_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp76_, _tmp77_); -#line 5560 "MediaDataRepresentation.c" +#line 5575 "MediaDataRepresentation.c" } @@ -5607,7 +5622,7 @@ static void media_source_collection_on_master_replaced (MediaSourceCollection* s _tmp8_ = new_file; #line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit_by_name (self, "master-file-replaced", _tmp6_, _tmp7_, _tmp8_); -#line 5609 "MediaDataRepresentation.c" +#line 5624 "MediaDataRepresentation.c" } @@ -5630,7 +5645,7 @@ MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection result = (MediaSource*) _tmp2_; #line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5632 "MediaDataRepresentation.c" +#line 5647 "MediaDataRepresentation.c" } @@ -5671,7 +5686,7 @@ static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSource components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); #line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5673 "MediaDataRepresentation.c" +#line 5688 "MediaDataRepresentation.c" } @@ -5680,7 +5695,7 @@ MediaSource* media_source_collection_fetch_by_source_id (MediaSourceCollection* g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_source_id (self, source_id); -#line 5682 "MediaDataRepresentation.c" +#line 5697 "MediaDataRepresentation.c" } @@ -5689,7 +5704,7 @@ static GeeCollection* media_source_collection_real_get_event_source_ids (MediaSo g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_event_source_ids'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 5691 "MediaDataRepresentation.c" +#line 5706 "MediaDataRepresentation.c" } @@ -5698,7 +5713,7 @@ GeeCollection* media_source_collection_get_event_source_ids (MediaSourceCollecti g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_event_source_ids (self, event_id); -#line 5700 "MediaDataRepresentation.c" +#line 5715 "MediaDataRepresentation.c" } @@ -5724,7 +5739,7 @@ GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollect result = _tmp3_; #line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5726 "MediaDataRepresentation.c" +#line 5741 "MediaDataRepresentation.c" } @@ -5750,7 +5765,7 @@ GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceColl result = _tmp3_; #line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5752 "MediaDataRepresentation.c" +#line 5767 "MediaDataRepresentation.c" } @@ -5771,7 +5786,7 @@ GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5773 "MediaDataRepresentation.c" +#line 5788 "MediaDataRepresentation.c" } @@ -5789,7 +5804,7 @@ GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection result = _tmp1_; #line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5791 "MediaDataRepresentation.c" +#line 5806 "MediaDataRepresentation.c" } @@ -5804,12 +5819,12 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = self->priv->sorted_import_ids; #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp3_ != 0) { -#line 5811 "MediaDataRepresentation.c" +#line 5826 "MediaDataRepresentation.c" GeeTreeSet* _tmp4_ = NULL; gpointer _tmp5_ = NULL; #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5820,19 +5835,19 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel _import_id_free0 (_tmp0_); #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = (ImportID*) _tmp5_; -#line 5822 "MediaDataRepresentation.c" +#line 5837 "MediaDataRepresentation.c" } else { #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (_tmp0_); #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = NULL; -#line 5828 "MediaDataRepresentation.c" +#line 5843 "MediaDataRepresentation.c" } #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp0_; #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5834 "MediaDataRepresentation.c" +#line 5849 "MediaDataRepresentation.c" } @@ -5855,7 +5870,7 @@ GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* s result = _tmp2_; #line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5857 "MediaDataRepresentation.c" +#line 5872 "MediaDataRepresentation.c" } @@ -5877,7 +5892,7 @@ void media_source_collection_add_many_to_trash (MediaSourceCollection* self, Gee source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); #line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 5879 "MediaDataRepresentation.c" +#line 5894 "MediaDataRepresentation.c" } @@ -5899,7 +5914,7 @@ void media_source_collection_add_many_to_offline (MediaSourceCollection* self, G source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); #line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 5901 "MediaDataRepresentation.c" +#line 5916 "MediaDataRepresentation.c" } @@ -5925,7 +5940,7 @@ gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) { result = _tmp3_; #line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5927 "MediaDataRepresentation.c" +#line 5942 "MediaDataRepresentation.c" } @@ -5958,7 +5973,7 @@ static void media_source_collection_real_import_many (MediaSourceCollection* sel _tmp5_ = media; #line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_media_import_completed (self, _tmp5_); -#line 5960 "MediaDataRepresentation.c" +#line 5975 "MediaDataRepresentation.c" } @@ -5967,14 +5982,14 @@ void media_source_collection_import_many (MediaSourceCollection* self, GeeCollec g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->import_many (self, media); -#line 5969 "MediaDataRepresentation.c" +#line 5984 "MediaDataRepresentation.c" } static void media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) { #line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 5976 "MediaDataRepresentation.c" +#line 5991 "MediaDataRepresentation.c" } @@ -5983,7 +5998,7 @@ void media_source_collection_postprocess_imported_media (MediaSourceCollection* g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->postprocess_imported_media (self, media); -#line 5985 "MediaDataRepresentation.c" +#line 6000 "MediaDataRepresentation.c" } @@ -5992,7 +6007,7 @@ static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 cu result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total); #line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5994 "MediaDataRepresentation.c" +#line 6009 "MediaDataRepresentation.c" } @@ -6051,39 +6066,39 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp2_ = delete_backing; #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp2_) { -#line 6053 "MediaDataRepresentation.c" +#line 6068 "MediaDataRepresentation.c" GeeHashSet* _tmp3_ = NULL; #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp3_; -#line 6061 "MediaDataRepresentation.c" +#line 6076 "MediaDataRepresentation.c" } else { #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = NULL; -#line 6067 "MediaDataRepresentation.c" +#line 6082 "MediaDataRepresentation.c" } #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _g_object_ref0 (_tmp1_); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_tombstone = _tmp4_; #line 667 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 667 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" trashed = _tmp5_; #line 668 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 668 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" offlined = _tmp6_; #line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" not_trashed = _tmp7_; -#line 6085 "MediaDataRepresentation.c" +#line 6100 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp8_ = NULL; @@ -6096,7 +6111,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _source_it = _tmp9_; #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 6098 "MediaDataRepresentation.c" +#line 6113 "MediaDataRepresentation.c" GeeIterator* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; MediaSource* source = NULL; @@ -6113,7 +6128,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo if (!_tmp11_) { #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 6115 "MediaDataRepresentation.c" +#line 6130 "MediaDataRepresentation.c" } #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = _source_it; @@ -6127,7 +6142,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp15_ = media_source_is_trashed (_tmp14_); #line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp15_) { -#line 6129 "MediaDataRepresentation.c" +#line 6144 "MediaDataRepresentation.c" GeeArrayList* _tmp16_ = NULL; MediaSource* _tmp17_ = NULL; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6136,7 +6151,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp17_ = source; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 6138 "MediaDataRepresentation.c" +#line 6153 "MediaDataRepresentation.c" } else { MediaSource* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; @@ -6146,7 +6161,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp19_ = media_source_is_offline (_tmp18_); #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp19_) { -#line 6148 "MediaDataRepresentation.c" +#line 6163 "MediaDataRepresentation.c" GeeArrayList* _tmp20_ = NULL; MediaSource* _tmp21_ = NULL; #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6155,7 +6170,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp21_ = source; #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 6157 "MediaDataRepresentation.c" +#line 6172 "MediaDataRepresentation.c" } else { GeeArrayList* _tmp22_ = NULL; MediaSource* _tmp23_ = NULL; @@ -6165,14 +6180,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp23_ = source; #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); -#line 6167 "MediaDataRepresentation.c" +#line 6182 "MediaDataRepresentation.c" } } #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = to_tombstone; #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_ != NULL) { -#line 6174 "MediaDataRepresentation.c" +#line 6189 "MediaDataRepresentation.c" GeeHashSet* _tmp25_ = NULL; MediaSource* _tmp26_ = NULL; #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6181,15 +6196,15 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp26_ = source; #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); -#line 6183 "MediaDataRepresentation.c" +#line 6198 "MediaDataRepresentation.c" } #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 6187 "MediaDataRepresentation.c" +#line 6202 "MediaDataRepresentation.c" } #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 6191 "MediaDataRepresentation.c" +#line 6206 "MediaDataRepresentation.c" } #line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = sources; @@ -6204,19 +6219,19 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = trashed; #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp32_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp32_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = _tmp32_; #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34_ = offlined; #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp36_ = _tmp35_; #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = not_trashed; #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = _tmp38_; #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6229,7 +6244,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp40__target = monitor_target; #line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp40_ != NULL) { -#line 6231 "MediaDataRepresentation.c" +#line 6246 "MediaDataRepresentation.c" gint _tmp41_ = 0; ProgressMonitor _tmp42_ = NULL; void* _tmp42__target = NULL; @@ -6253,17 +6268,17 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo monitor = _aggregate_progress_monitor_monitor_progress_monitor; #line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" monitor_target = _tmp44_; -#line 6255 "MediaDataRepresentation.c" +#line 6270 "MediaDataRepresentation.c" } #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp45_ = trashed; #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp46_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp46_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp47_ = _tmp46_; #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp47_ > 0) { -#line 6265 "MediaDataRepresentation.c" +#line 6280 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp48_ = NULL; MediaSourceHoldingTank* _tmp49_ = NULL; GeeArrayList* _tmp50_ = NULL; @@ -6289,17 +6304,17 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_LIST, GeeList), _tmp51_, _tmp52_, _tmp52__target, _tmp53_); #line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp49_); -#line 6291 "MediaDataRepresentation.c" +#line 6306 "MediaDataRepresentation.c" } #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp54_ = offlined; #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp55_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp55_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp56_ = _tmp55_; #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp56_ > 0) { -#line 6301 "MediaDataRepresentation.c" +#line 6316 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp57_ = NULL; MediaSourceHoldingTank* _tmp58_ = NULL; GeeArrayList* _tmp59_ = NULL; @@ -6325,17 +6340,17 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_LIST, GeeList), _tmp60_, _tmp61_, _tmp61__target, _tmp62_); #line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp58_); -#line 6327 "MediaDataRepresentation.c" +#line 6342 "MediaDataRepresentation.c" } #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp63_ = not_trashed; #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp64_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp64_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp65_ = _tmp64_; #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp65_ > 0) { -#line 6337 "MediaDataRepresentation.c" +#line 6352 "MediaDataRepresentation.c" GeeArrayList* _tmp66_ = NULL; Marker* _tmp67_ = NULL; Marker* _tmp68_ = NULL; @@ -6361,33 +6376,33 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp68_, _tmp69_, _tmp70_, _tmp70__target, _tmp71_); #line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp68_); -#line 6363 "MediaDataRepresentation.c" +#line 6378 "MediaDataRepresentation.c" } #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp73_ = to_tombstone; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp73_ != NULL) { -#line 6369 "MediaDataRepresentation.c" +#line 6384 "MediaDataRepresentation.c" GeeHashSet* _tmp74_ = NULL; gint _tmp75_ = 0; gint _tmp76_ = 0; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp74_ = to_tombstone; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp76_ = _tmp75_; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp72_ = _tmp76_ > 0; -#line 6381 "MediaDataRepresentation.c" +#line 6396 "MediaDataRepresentation.c" } else { #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp72_ = FALSE; -#line 6385 "MediaDataRepresentation.c" +#line 6400 "MediaDataRepresentation.c" } #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp72_) { -#line 6389 "MediaDataRepresentation.c" +#line 6404 "MediaDataRepresentation.c" { GeeHashSet* _tmp77_ = NULL; #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6398,7 +6413,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo if (G_UNLIKELY (_inner_error_ != NULL)) { #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6400 "MediaDataRepresentation.c" +#line 6415 "MediaDataRepresentation.c" goto __catch564_database_error; } #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6419,7 +6434,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo g_clear_error (&_inner_error_); #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6421 "MediaDataRepresentation.c" +#line 6436 "MediaDataRepresentation.c" } } goto __finally564; @@ -6437,7 +6452,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo app_window_database_error (_tmp78_); #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6439 "MediaDataRepresentation.c" +#line 6454 "MediaDataRepresentation.c" } __finally564: #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6460,7 +6475,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo g_clear_error (&_inner_error_); #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6462 "MediaDataRepresentation.c" +#line 6477 "MediaDataRepresentation.c" } } #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6475,7 +6490,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _g_object_unref0 (to_tombstone); #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 6477 "MediaDataRepresentation.c" +#line 6492 "MediaDataRepresentation.c" } @@ -6502,7 +6517,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, total_count = _tmp2_; #line 716 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" i = 1; -#line 6504 "MediaDataRepresentation.c" +#line 6519 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp3_ = NULL; @@ -6515,7 +6530,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _source_it = _tmp4_; #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 6517 "MediaDataRepresentation.c" +#line 6532 "MediaDataRepresentation.c" GeeIterator* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; MediaSource* source = NULL; @@ -6540,7 +6555,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, if (!_tmp6_) { #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 6542 "MediaDataRepresentation.c" +#line 6557 "MediaDataRepresentation.c" } #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _source_it; @@ -6554,7 +6569,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _tmp10_ = media_source_get_file (_tmp9_); #line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" file = _tmp10_; -#line 6556 "MediaDataRepresentation.c" +#line 6571 "MediaDataRepresentation.c" { GFile* _tmp11_ = NULL; #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6563,7 +6578,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, g_file_delete (_tmp11_, NULL, &_inner_error_); #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6565 "MediaDataRepresentation.c" +#line 6580 "MediaDataRepresentation.c" goto __catch565_g_error; } } @@ -6596,7 +6611,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _g_free0 (_tmp14_); #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6598 "MediaDataRepresentation.c" +#line 6613 "MediaDataRepresentation.c" } __finally565: #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6613,7 +6628,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, g_clear_error (&_inner_error_); #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6615 "MediaDataRepresentation.c" +#line 6630 "MediaDataRepresentation.c" } #line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = file; @@ -6625,21 +6640,21 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _tmp20_ = deleted; #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp20_) { -#line 6627 "MediaDataRepresentation.c" +#line 6642 "MediaDataRepresentation.c" GeeList* _tmp21_ = NULL; #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = not_deleted; #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = NULL != _tmp21_; -#line 6633 "MediaDataRepresentation.c" +#line 6648 "MediaDataRepresentation.c" } else { #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = FALSE; -#line 6637 "MediaDataRepresentation.c" +#line 6652 "MediaDataRepresentation.c" } #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp19_) { -#line 6641 "MediaDataRepresentation.c" +#line 6656 "MediaDataRepresentation.c" GeeList* _tmp22_ = NULL; MediaSource* _tmp23_ = NULL; #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6648,7 +6663,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _tmp23_ = source; #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 6650 "MediaDataRepresentation.c" +#line 6665 "MediaDataRepresentation.c" } #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = monitor; @@ -6656,7 +6671,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _tmp24__target = monitor_target; #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_ != NULL) { -#line 6658 "MediaDataRepresentation.c" +#line 6673 "MediaDataRepresentation.c" ProgressMonitor _tmp25_ = NULL; void* _tmp25__target = NULL; gint _tmp26_ = 0; @@ -6671,7 +6686,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _tmp27_ = total_count; #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ ((guint64) _tmp26_, (guint64) _tmp27_, TRUE, _tmp25__target); -#line 6673 "MediaDataRepresentation.c" +#line 6688 "MediaDataRepresentation.c" } #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = i; @@ -6681,11 +6696,11 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _g_object_unref0 (file); #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 6683 "MediaDataRepresentation.c" +#line 6698 "MediaDataRepresentation.c" } #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 6687 "MediaDataRepresentation.c" +#line 6702 "MediaDataRepresentation.c" } } @@ -6695,21 +6710,21 @@ TransactionController* media_source_collection_get_transaction_controller (Media g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 342 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_transaction_controller (self); -#line 6697 "MediaDataRepresentation.c" +#line 6712 "MediaDataRepresentation.c" } static void media_source_collection_real_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { #line 355 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6704 "MediaDataRepresentation.c" +#line 6719 "MediaDataRepresentation.c" } static void media_source_collection_real_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { #line 362 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6711 "MediaDataRepresentation.c" +#line 6726 "MediaDataRepresentation.c" } @@ -6720,7 +6735,7 @@ static void media_source_collection_real_master_file_replaced (MediaSourceCollec g_return_if_fail (G_IS_FILE (old_file)); #line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 6722 "MediaDataRepresentation.c" +#line 6737 "MediaDataRepresentation.c" } @@ -6739,19 +6754,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu data1 = closure->data; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = param_values->data[0].v_pointer; -#line 6741 "MediaDataRepresentation.c" +#line 6756 "MediaDataRepresentation.c" } else { #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data1 = param_values->data[0].v_pointer; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = closure->data; -#line 6747 "MediaDataRepresentation.c" +#line 6762 "MediaDataRepresentation.c" } #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2); -#line 6753 "MediaDataRepresentation.c" +#line 6768 "MediaDataRepresentation.c" } @@ -6760,7 +6775,7 @@ static void media_source_collection_real_trashcan_contents_altered (MediaSourceC g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 368 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 6762 "MediaDataRepresentation.c" +#line 6777 "MediaDataRepresentation.c" } @@ -6773,7 +6788,7 @@ static void media_source_collection_real_offline_contents_altered (MediaSourceCo g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 375 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 6775 "MediaDataRepresentation.c" +#line 6790 "MediaDataRepresentation.c" } @@ -6789,37 +6804,37 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceCollectionPrivate)); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->create_trashcan = media_source_collection_real_create_trashcan; + ((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) media_source_collection_real_create_trashcan; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->create_offline_bin = media_source_collection_real_create_offline_bin; + ((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) media_source_collection_real_create_offline_bin; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->create_media_monitor = media_source_collection_real_create_media_monitor; + ((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*)(MediaSourceCollection*, Workers*, GCancellable*)) media_source_collection_real_create_media_monitor; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->get_typename = media_source_collection_real_get_typename; + ((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*)(MediaSourceCollection*)) media_source_collection_real_get_typename; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->is_file_recognized = media_source_collection_real_is_file_recognized; + ((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*)(MediaSourceCollection*, GFile*)) media_source_collection_real_is_file_recognized; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = media_source_collection_real_fetch_by_numeric_id; + ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*)(MediaSourceCollection*, gint64)) media_source_collection_real_fetch_by_numeric_id; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->notify_import_roll_altered = media_source_collection_real_notify_import_roll_altered; + ((MediaSourceCollectionClass *) klass)->notify_import_roll_altered = (void (*)(MediaSourceCollection*)) media_source_collection_real_notify_import_roll_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->notify_flagged_contents_altered = media_source_collection_real_notify_flagged_contents_altered; + ((MediaSourceCollectionClass *) klass)->notify_flagged_contents_altered = (void (*)(MediaSourceCollection*)) media_source_collection_real_notify_flagged_contents_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->notify_media_import_starting = media_source_collection_real_notify_media_import_starting; + ((MediaSourceCollectionClass *) klass)->notify_media_import_starting = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_notify_media_import_starting; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->notify_media_import_completed = media_source_collection_real_notify_media_import_completed; + ((MediaSourceCollectionClass *) klass)->notify_media_import_completed = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_notify_media_import_completed; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataCollectionClass *) klass)->items_altered = media_source_collection_real_items_altered; + ((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) media_source_collection_real_items_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataCollectionClass *) klass)->notify_contents_altered = media_source_collection_real_notify_contents_altered; + ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) media_source_collection_real_notify_contents_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = media_source_collection_real_fetch_by_source_id; + ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*)(MediaSourceCollection*, const gchar*)) media_source_collection_real_fetch_by_source_id; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->get_event_source_ids = media_source_collection_real_get_event_source_ids; + ((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*)(MediaSourceCollection*, EventID*)) media_source_collection_real_get_event_source_ids; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->import_many = media_source_collection_real_import_many; + ((MediaSourceCollectionClass *) klass)->import_many = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_import_many; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = media_source_collection_real_postprocess_imported_media; + ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_postprocess_imported_media; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->media_import_starting = media_source_collection_real_media_import_starting; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6848,7 +6863,7 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla g_signal_new ("offline_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, offline_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_new ("flagged_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, flagged_contents_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 6850 "MediaDataRepresentation.c" +#line 6865 "MediaDataRepresentation.c" } @@ -6864,22 +6879,22 @@ static void media_source_collection_instance_init (MediaSourceCollection * self) #line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->offline_bin = NULL; #line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->by_master_file = _tmp0_; #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_tree_multi_map_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, import_id_free, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _import_id_compare_func_gcompare_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_tree_multi_map_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, (GDestroyNotify) import_id_free, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _import_id_compare_func_gcompare_data_func, NULL, NULL, NULL, NULL, NULL); #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->import_rolls = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = gee_tree_set_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, import_id_free, _import_id_compare_func_gcompare_data_func, NULL, NULL); + _tmp2_ = gee_tree_set_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, (GDestroyNotify) import_id_free, _import_id_compare_func_gcompare_data_func, NULL, NULL); #line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->sorted_import_ids = _tmp2_; #line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->flagged = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet); -#line 6881 "MediaDataRepresentation.c" +#line 6896 "MediaDataRepresentation.c" } @@ -6901,7 +6916,7 @@ static void media_source_collection_finalize (DataCollection* obj) { _g_object_unref0 (self->priv->flagged); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_COLLECTION_CLASS (media_source_collection_parent_class)->finalize (obj); -#line 6903 "MediaDataRepresentation.c" +#line 6918 "MediaDataRepresentation.c" } @@ -6920,7 +6935,7 @@ GType media_source_collection_get_type (void) { static void _media_collection_registry_on_init_done_application_init_done (Application* _sender, gpointer self) { #line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_on_init_done ((MediaCollectionRegistry*) self); -#line 6922 "MediaDataRepresentation.c" +#line 6937 "MediaDataRepresentation.c" } @@ -6940,14 +6955,14 @@ static MediaCollectionRegistry* media_collection_registry_construct (GType objec _application_unref0 (_tmp1_); #line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 6942 "MediaDataRepresentation.c" +#line 6957 "MediaDataRepresentation.c" } static MediaCollectionRegistry* media_collection_registry_new (void) { #line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_collection_registry_construct (TYPE_MEDIA_COLLECTION_REGISTRY); -#line 6949 "MediaDataRepresentation.c" +#line 6964 "MediaDataRepresentation.c" } @@ -6986,14 +7001,14 @@ static void media_collection_registry_on_init_done (MediaCollectionRegistry* sel _library_monitor_pool_unref0 (_tmp6_); #line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (library_monitor); -#line 6988 "MediaDataRepresentation.c" +#line 7003 "MediaDataRepresentation.c" } static void _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, gpointer self) { #line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_on_import_directory_changed (); -#line 6995 "MediaDataRepresentation.c" +#line 7010 "MediaDataRepresentation.c" } @@ -7015,7 +7030,7 @@ void media_collection_registry_init (void) { g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "import-directory-changed", (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL); #line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp2_); -#line 7017 "MediaDataRepresentation.c" +#line 7032 "MediaDataRepresentation.c" } @@ -7033,7 +7048,7 @@ void media_collection_registry_terminate (void) { g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL); #line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 7035 "MediaDataRepresentation.c" +#line 7050 "MediaDataRepresentation.c" } @@ -7074,7 +7089,7 @@ static void media_collection_registry_on_import_directory_changed (void) { _tmp6_ = current; #line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp6_ != NULL) { -#line 7076 "MediaDataRepresentation.c" +#line 7091 "MediaDataRepresentation.c" LibraryMonitor* _tmp7_ = NULL; GFile* _tmp8_ = NULL; GFile* _tmp9_ = NULL; @@ -7094,11 +7109,11 @@ static void media_collection_registry_on_import_directory_changed (void) { _tmp5_ = _tmp11_; #line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp9_); -#line 7096 "MediaDataRepresentation.c" +#line 7111 "MediaDataRepresentation.c" } else { #line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = FALSE; -#line 7100 "MediaDataRepresentation.c" +#line 7115 "MediaDataRepresentation.c" } #line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp5_) { @@ -7108,7 +7123,7 @@ static void media_collection_registry_on_import_directory_changed (void) { _g_object_unref0 (import_dir); #line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 7110 "MediaDataRepresentation.c" +#line 7125 "MediaDataRepresentation.c" } #line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = import_dir; @@ -7134,14 +7149,14 @@ static void media_collection_registry_on_import_directory_changed (void) { _g_object_unref0 (current); #line 774 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (import_dir); -#line 7136 "MediaDataRepresentation.c" +#line 7151 "MediaDataRepresentation.c" } static gpointer _media_collection_registry_ref0 (gpointer self) { #line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? media_collection_registry_ref (self) : NULL; -#line 7143 "MediaDataRepresentation.c" +#line 7158 "MediaDataRepresentation.c" } @@ -7157,7 +7172,7 @@ MediaCollectionRegistry* media_collection_registry_get_instance (void) { result = _tmp1_; #line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7159 "MediaDataRepresentation.c" +#line 7174 "MediaDataRepresentation.c" } @@ -7173,7 +7188,7 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc _tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME); #line 793 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_) { -#line 7175 "MediaDataRepresentation.c" +#line 7190 "MediaDataRepresentation.c" gchar* _tmp2_ = NULL; #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = g_strdup (PHOTO_TYPENAME); @@ -7181,7 +7196,7 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc result = _tmp2_; #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7183 "MediaDataRepresentation.c" +#line 7198 "MediaDataRepresentation.c" } else { gchar** components = NULL; const gchar* _tmp3_ = NULL; @@ -7225,7 +7240,7 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); #line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7227 "MediaDataRepresentation.c" +#line 7242 "MediaDataRepresentation.c" } } @@ -7262,7 +7277,7 @@ void media_collection_registry_register_collection (MediaCollectionRegistry* sel gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, _tmp6_); #line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp5_); -#line 7264 "MediaDataRepresentation.c" +#line 7279 "MediaDataRepresentation.c" } @@ -7285,7 +7300,7 @@ MediaSourceCollection* media_collection_registry_get_collection (MediaCollection result = (MediaSourceCollection*) _tmp2_; #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7287 "MediaDataRepresentation.c" +#line 7302 "MediaDataRepresentation.c" } @@ -7306,14 +7321,14 @@ GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7308 "MediaDataRepresentation.c" +#line 7323 "MediaDataRepresentation.c" } void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { #line 820 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7315 "MediaDataRepresentation.c" +#line 7330 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -7334,7 +7349,7 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { _sources_it = _tmp3_; #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7336 "MediaDataRepresentation.c" +#line 7351 "MediaDataRepresentation.c" GeeIterator* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; MediaSourceCollection* sources = NULL; @@ -7349,7 +7364,7 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { if (!_tmp5_) { #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7351 "MediaDataRepresentation.c" +#line 7366 "MediaDataRepresentation.c" } #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; @@ -7363,11 +7378,11 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7365 "MediaDataRepresentation.c" +#line 7380 "MediaDataRepresentation.c" } #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7369 "MediaDataRepresentation.c" +#line 7384 "MediaDataRepresentation.c" } } @@ -7375,7 +7390,7 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { #line 825 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7377 "MediaDataRepresentation.c" +#line 7392 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -7396,7 +7411,7 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { _sources_it = _tmp3_; #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7398 "MediaDataRepresentation.c" +#line 7413 "MediaDataRepresentation.c" GeeIterator* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; MediaSourceCollection* sources = NULL; @@ -7411,7 +7426,7 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { if (!_tmp5_) { #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7413 "MediaDataRepresentation.c" +#line 7428 "MediaDataRepresentation.c" } #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; @@ -7425,11 +7440,11 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7427 "MediaDataRepresentation.c" +#line 7442 "MediaDataRepresentation.c" } #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7431 "MediaDataRepresentation.c" +#line 7446 "MediaDataRepresentation.c" } } @@ -7437,7 +7452,7 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self) { #line 830 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7439 "MediaDataRepresentation.c" +#line 7454 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -7458,7 +7473,7 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry _sources_it = _tmp3_; #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7460 "MediaDataRepresentation.c" +#line 7475 "MediaDataRepresentation.c" GeeIterator* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; MediaSourceCollection* sources = NULL; @@ -7475,7 +7490,7 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry if (!_tmp5_) { #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7477 "MediaDataRepresentation.c" +#line 7492 "MediaDataRepresentation.c" } #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; @@ -7493,11 +7508,11 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry transaction_controller_begin (_tmp10_); #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7495 "MediaDataRepresentation.c" +#line 7510 "MediaDataRepresentation.c" } #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7499 "MediaDataRepresentation.c" +#line 7514 "MediaDataRepresentation.c" } } @@ -7505,7 +7520,7 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self) { #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7507 "MediaDataRepresentation.c" +#line 7522 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -7526,7 +7541,7 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr _sources_it = _tmp3_; #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7528 "MediaDataRepresentation.c" +#line 7543 "MediaDataRepresentation.c" GeeIterator* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; MediaSourceCollection* sources = NULL; @@ -7543,7 +7558,7 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr if (!_tmp5_) { #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7545 "MediaDataRepresentation.c" +#line 7560 "MediaDataRepresentation.c" } #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; @@ -7561,11 +7576,11 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr transaction_controller_commit (_tmp10_); #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7563 "MediaDataRepresentation.c" +#line 7578 "MediaDataRepresentation.c" } #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7567 "MediaDataRepresentation.c" +#line 7582 "MediaDataRepresentation.c" } } @@ -7602,7 +7617,7 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel _tmp4_ = collection; #line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp4_ == NULL) { -#line 7604 "MediaDataRepresentation.c" +#line 7619 "MediaDataRepresentation.c" const gchar* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -7620,7 +7635,7 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel _g_free0 (typename); #line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7621 "MediaDataRepresentation.c" +#line 7636 "MediaDataRepresentation.c" } #line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = collection; @@ -7636,14 +7651,14 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel _g_free0 (typename); #line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7637 "MediaDataRepresentation.c" +#line 7652 "MediaDataRepresentation.c" } static gpointer _import_id_dup0 (gpointer self) { #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? import_id_dup (self) : NULL; -#line 7644 "MediaDataRepresentation.c" +#line 7659 "MediaDataRepresentation.c" } @@ -7656,7 +7671,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); #line 853 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_id_init (&last_import_id, IMPORT_ID_INVALID); -#line 7657 "MediaDataRepresentation.c" +#line 7672 "MediaDataRepresentation.c" { GeeIterator* _current_collection_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -7677,7 +7692,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* _current_collection_it = _tmp3_; #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7678 "MediaDataRepresentation.c" +#line 7693 "MediaDataRepresentation.c" GeeIterator* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; MediaSourceCollection* current_collection = NULL; @@ -7699,7 +7714,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* if (!_tmp5_) { #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7700 "MediaDataRepresentation.c" +#line 7715 "MediaDataRepresentation.c" } #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _current_collection_it; @@ -7723,7 +7738,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* _data_collection_unref0 (current_collection); #line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 7724 "MediaDataRepresentation.c" +#line 7739 "MediaDataRepresentation.c" } #line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = current_import_id; @@ -7735,23 +7750,23 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* _tmp14_ = _tmp13_.id; #line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp12_ > _tmp14_) { -#line 7736 "MediaDataRepresentation.c" +#line 7751 "MediaDataRepresentation.c" ImportID* _tmp15_ = NULL; #line 862 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = current_import_id; #line 862 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" last_import_id = *_tmp15_; -#line 7742 "MediaDataRepresentation.c" +#line 7757 "MediaDataRepresentation.c" } #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (current_import_id); #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 7748 "MediaDataRepresentation.c" +#line 7763 "MediaDataRepresentation.c" } #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_collection_it); -#line 7752 "MediaDataRepresentation.c" +#line 7767 "MediaDataRepresentation.c" } #line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = last_import_id; @@ -7763,7 +7778,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* result = NULL; #line 868 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7764 "MediaDataRepresentation.c" +#line 7779 "MediaDataRepresentation.c" } else { ImportID* _tmp18_ = NULL; #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -7772,7 +7787,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* result = _tmp18_; #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7773 "MediaDataRepresentation.c" +#line 7788 "MediaDataRepresentation.c" } } @@ -7786,10 +7801,10 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle #line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (event_id != NULL, NULL); #line 874 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 874 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _result_ = _tmp0_; -#line 7790 "MediaDataRepresentation.c" +#line 7805 "MediaDataRepresentation.c" { GeeIterator* _current_collection_it = NULL; GeeCollection* _tmp1_ = NULL; @@ -7810,7 +7825,7 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle _current_collection_it = _tmp4_; #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7811 "MediaDataRepresentation.c" +#line 7826 "MediaDataRepresentation.c" GeeIterator* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; MediaSourceCollection* current_collection = NULL; @@ -7829,7 +7844,7 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle if (!_tmp6_) { #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7830 "MediaDataRepresentation.c" +#line 7845 "MediaDataRepresentation.c" } #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _current_collection_it; @@ -7853,17 +7868,17 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle _g_object_unref0 (_tmp13_); #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 7854 "MediaDataRepresentation.c" +#line 7869 "MediaDataRepresentation.c" } #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_collection_it); -#line 7858 "MediaDataRepresentation.c" +#line 7873 "MediaDataRepresentation.c" } #line 880 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_COLLECTION, GeeCollection); #line 880 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7864 "MediaDataRepresentation.c" +#line 7879 "MediaDataRepresentation.c" } @@ -7873,7 +7888,7 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); #line 883 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 7874 "MediaDataRepresentation.c" +#line 7889 "MediaDataRepresentation.c" { GeeIterator* _collection_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -7894,7 +7909,7 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC _collection_it = _tmp3_; #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7895 "MediaDataRepresentation.c" +#line 7910 "MediaDataRepresentation.c" GeeIterator* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; MediaSourceCollection* collection = NULL; @@ -7911,7 +7926,7 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC if (!_tmp5_) { #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7912 "MediaDataRepresentation.c" +#line 7927 "MediaDataRepresentation.c" } #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _collection_it; @@ -7933,21 +7948,21 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC _g_object_unref0 (_collection_it); #line 886 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7934 "MediaDataRepresentation.c" +#line 7949 "MediaDataRepresentation.c" } #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); -#line 7938 "MediaDataRepresentation.c" +#line 7953 "MediaDataRepresentation.c" } #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_collection_it); -#line 7942 "MediaDataRepresentation.c" +#line 7957 "MediaDataRepresentation.c" } #line 889 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; #line 889 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7948 "MediaDataRepresentation.c" +#line 7963 "MediaDataRepresentation.c" } @@ -7970,7 +7985,7 @@ gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* result = FALSE; #line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7971 "MediaDataRepresentation.c" +#line 7986 "MediaDataRepresentation.c" } #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = source_id; @@ -7980,7 +7995,7 @@ gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* if (_tmp4_) { #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = TRUE; -#line 7981 "MediaDataRepresentation.c" +#line 7996 "MediaDataRepresentation.c" } else { const gchar* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -7990,20 +8005,20 @@ gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* _tmp6_ = g_str_has_prefix (_tmp5_, VIDEO_TYPENAME "-"); #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp6_; -#line 7991 "MediaDataRepresentation.c" +#line 8006 "MediaDataRepresentation.c" } #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp2_; #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7997 "MediaDataRepresentation.c" +#line 8012 "MediaDataRepresentation.c" } static void value_media_collection_registry_init (GValue* value) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8004 "MediaDataRepresentation.c" +#line 8019 "MediaDataRepresentation.c" } @@ -8012,7 +8027,7 @@ static void value_media_collection_registry_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (value->data[0].v_pointer); -#line 8013 "MediaDataRepresentation.c" +#line 8028 "MediaDataRepresentation.c" } } @@ -8022,11 +8037,11 @@ static void value_media_collection_registry_copy_value (const GValue* src_value, if (src_value->data[0].v_pointer) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = media_collection_registry_ref (src_value->data[0].v_pointer); -#line 8023 "MediaDataRepresentation.c" +#line 8038 "MediaDataRepresentation.c" } else { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = NULL; -#line 8027 "MediaDataRepresentation.c" +#line 8042 "MediaDataRepresentation.c" } } @@ -8034,37 +8049,37 @@ static void value_media_collection_registry_copy_value (const GValue* src_value, static gpointer value_media_collection_registry_peek_pointer (const GValue* value) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 8035 "MediaDataRepresentation.c" +#line 8050 "MediaDataRepresentation.c" } static gchar* value_media_collection_registry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (collect_values[0].v_pointer) { -#line 8042 "MediaDataRepresentation.c" +#line 8057 "MediaDataRepresentation.c" MediaCollectionRegistry* object; object = collect_values[0].v_pointer; #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (object->parent_instance.g_class == NULL) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8049 "MediaDataRepresentation.c" +#line 8064 "MediaDataRepresentation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8053 "MediaDataRepresentation.c" +#line 8068 "MediaDataRepresentation.c" } #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = media_collection_registry_ref (object); -#line 8057 "MediaDataRepresentation.c" +#line 8072 "MediaDataRepresentation.c" } else { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8061 "MediaDataRepresentation.c" +#line 8076 "MediaDataRepresentation.c" } #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 8065 "MediaDataRepresentation.c" +#line 8080 "MediaDataRepresentation.c" } @@ -8075,25 +8090,25 @@ static gchar* value_media_collection_registry_lcopy_value (const GValue* value, if (!object_p) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8076 "MediaDataRepresentation.c" +#line 8091 "MediaDataRepresentation.c" } #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!value->data[0].v_pointer) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = NULL; -#line 8082 "MediaDataRepresentation.c" +#line 8097 "MediaDataRepresentation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = value->data[0].v_pointer; -#line 8086 "MediaDataRepresentation.c" +#line 8101 "MediaDataRepresentation.c" } else { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = media_collection_registry_ref (value->data[0].v_pointer); -#line 8090 "MediaDataRepresentation.c" +#line 8105 "MediaDataRepresentation.c" } #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 8094 "MediaDataRepresentation.c" +#line 8109 "MediaDataRepresentation.c" } @@ -8107,7 +8122,7 @@ GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar G_PARAM_SPEC (spec)->value_type = object_type; #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return G_PARAM_SPEC (spec); -#line 8108 "MediaDataRepresentation.c" +#line 8123 "MediaDataRepresentation.c" } @@ -8116,7 +8131,7 @@ gpointer value_get_media_collection_registry (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY), NULL); #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 8117 "MediaDataRepresentation.c" +#line 8132 "MediaDataRepresentation.c" } @@ -8136,17 +8151,17 @@ void value_set_media_collection_registry (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_ref (value->data[0].v_pointer); -#line 8137 "MediaDataRepresentation.c" +#line 8152 "MediaDataRepresentation.c" } else { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8141 "MediaDataRepresentation.c" +#line 8156 "MediaDataRepresentation.c" } #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (old); -#line 8147 "MediaDataRepresentation.c" +#line 8162 "MediaDataRepresentation.c" } } @@ -8165,17 +8180,17 @@ void value_take_media_collection_registry (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 8166 "MediaDataRepresentation.c" +#line 8181 "MediaDataRepresentation.c" } else { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8170 "MediaDataRepresentation.c" +#line 8185 "MediaDataRepresentation.c" } #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (old); -#line 8176 "MediaDataRepresentation.c" +#line 8191 "MediaDataRepresentation.c" } } @@ -8187,7 +8202,7 @@ static void media_collection_registry_class_init (MediaCollectionRegistryClass * ((MediaCollectionRegistryClass *) klass)->finalize = media_collection_registry_finalize; #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaCollectionRegistryPrivate)); -#line 8188 "MediaDataRepresentation.c" +#line 8203 "MediaDataRepresentation.c" } @@ -8197,16 +8212,16 @@ static void media_collection_registry_instance_init (MediaCollectionRegistry * s #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_COLLECTION_REGISTRY_GET_PRIVATE (self); #line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL); #line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->all = _tmp0_; #line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->by_typename = _tmp1_; #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->ref_count = 1; -#line 8207 "MediaDataRepresentation.c" +#line 8222 "MediaDataRepresentation.c" } @@ -8233,7 +8248,7 @@ static void media_collection_registry_finalize (MediaCollectionRegistry* obj) { _g_object_unref0 (self->priv->all); #line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->by_typename); -#line 8234 "MediaDataRepresentation.c" +#line 8249 "MediaDataRepresentation.c" } @@ -8258,7 +8273,7 @@ gpointer media_collection_registry_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return instance; -#line 8259 "MediaDataRepresentation.c" +#line 8274 "MediaDataRepresentation.c" } @@ -8271,7 +8286,7 @@ void media_collection_registry_unref (gpointer instance) { MEDIA_COLLECTION_REGISTRY_GET_CLASS (self)->finalize (self); #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8272 "MediaDataRepresentation.c" +#line 8287 "MediaDataRepresentation.c" } } |