From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/MediaDataRepresentation.c | 5002 +++++++++++++++++++++-------------------- 1 file changed, 2511 insertions(+), 2491 deletions(-) (limited to 'src/MediaDataRepresentation.c') diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c index 9a6edc0..a48a8dd 100644 --- a/src/MediaDataRepresentation.c +++ b/src/MediaDataRepresentation.c @@ -1360,6 +1360,7 @@ static void _media_collection_registry_on_import_directory_changed_configuration void media_collection_registry_terminate (void); LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self); GFile* directory_monitor_get_root (DirectoryMonitor* self); +void library_files_select_copy_function (void); MediaCollectionRegistry* media_collection_registry_get_instance (void); gchar* media_collection_registry_get_typename_from_source_id (const gchar* source_id); #define PHOTO_TYPENAME "thumb" @@ -1422,14 +1423,14 @@ BackingFileState* backing_file_state_construct (GType object_type, const gchar* self->md5 = _tmp5_; #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1426 "MediaDataRepresentation.c" +#line 1427 "MediaDataRepresentation.c" } BackingFileState* backing_file_state_new (const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5) { #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return backing_file_state_construct (TYPE_BACKING_FILE_STATE, filepath, filesize, modification_time, md5); -#line 1433 "MediaDataRepresentation.c" +#line 1434 "MediaDataRepresentation.c" } @@ -1480,14 +1481,14 @@ BackingFileState* backing_file_state_construct_from_photo_row (GType object_type self->md5 = _tmp8_; #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1484 "MediaDataRepresentation.c" +#line 1485 "MediaDataRepresentation.c" } BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5) { #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return backing_file_state_construct_from_photo_row (TYPE_BACKING_FILE_STATE, photo_row, md5); -#line 1491 "MediaDataRepresentation.c" +#line 1492 "MediaDataRepresentation.c" } @@ -1505,14 +1506,14 @@ GFile* backing_file_state_get_file (BackingFileState* self) { result = _tmp1_; #line 28 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1509 "MediaDataRepresentation.c" +#line 1510 "MediaDataRepresentation.c" } static void value_backing_file_state_init (GValue* value) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1516 "MediaDataRepresentation.c" +#line 1517 "MediaDataRepresentation.c" } @@ -1521,7 +1522,7 @@ static void value_backing_file_state_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (value->data[0].v_pointer); -#line 1525 "MediaDataRepresentation.c" +#line 1526 "MediaDataRepresentation.c" } } @@ -1531,11 +1532,11 @@ static void value_backing_file_state_copy_value (const GValue* src_value, GValue if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = backing_file_state_ref (src_value->data[0].v_pointer); -#line 1535 "MediaDataRepresentation.c" +#line 1536 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = NULL; -#line 1539 "MediaDataRepresentation.c" +#line 1540 "MediaDataRepresentation.c" } } @@ -1543,37 +1544,37 @@ static void value_backing_file_state_copy_value (const GValue* src_value, GValue static gpointer value_backing_file_state_peek_pointer (const GValue* value) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 1547 "MediaDataRepresentation.c" +#line 1548 "MediaDataRepresentation.c" } static gchar* value_backing_file_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (collect_values[0].v_pointer) { -#line 1554 "MediaDataRepresentation.c" +#line 1555 "MediaDataRepresentation.c" BackingFileState * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1561 "MediaDataRepresentation.c" +#line 1562 "MediaDataRepresentation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/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 1565 "MediaDataRepresentation.c" +#line 1566 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = backing_file_state_ref (object); -#line 1569 "MediaDataRepresentation.c" +#line 1570 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1573 "MediaDataRepresentation.c" +#line 1574 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 1577 "MediaDataRepresentation.c" +#line 1578 "MediaDataRepresentation.c" } @@ -1584,25 +1585,25 @@ static gchar* value_backing_file_state_lcopy_value (const GValue* value, guint n if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1588 "MediaDataRepresentation.c" +#line 1589 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = NULL; -#line 1594 "MediaDataRepresentation.c" +#line 1595 "MediaDataRepresentation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = value->data[0].v_pointer; -#line 1598 "MediaDataRepresentation.c" +#line 1599 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = backing_file_state_ref (value->data[0].v_pointer); -#line 1602 "MediaDataRepresentation.c" +#line 1603 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 1606 "MediaDataRepresentation.c" +#line 1607 "MediaDataRepresentation.c" } @@ -1616,7 +1617,7 @@ GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return G_PARAM_SPEC (spec); -#line 1620 "MediaDataRepresentation.c" +#line 1621 "MediaDataRepresentation.c" } @@ -1625,7 +1626,7 @@ gpointer value_get_backing_file_state (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE), NULL); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 1629 "MediaDataRepresentation.c" +#line 1630 "MediaDataRepresentation.c" } @@ -1645,17 +1646,17 @@ void value_set_backing_file_state (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_ref (value->data[0].v_pointer); -#line 1649 "MediaDataRepresentation.c" +#line 1650 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1653 "MediaDataRepresentation.c" +#line 1654 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (old); -#line 1659 "MediaDataRepresentation.c" +#line 1660 "MediaDataRepresentation.c" } } @@ -1674,17 +1675,17 @@ void value_take_backing_file_state (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 1678 "MediaDataRepresentation.c" +#line 1679 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1682 "MediaDataRepresentation.c" +#line 1683 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (old); -#line 1688 "MediaDataRepresentation.c" +#line 1689 "MediaDataRepresentation.c" } } @@ -1694,14 +1695,14 @@ static void backing_file_state_class_init (BackingFileStateClass * klass) { backing_file_state_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((BackingFileStateClass *) klass)->finalize = backing_file_state_finalize; -#line 1698 "MediaDataRepresentation.c" +#line 1699 "MediaDataRepresentation.c" } static void backing_file_state_instance_init (BackingFileState * self) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->ref_count = 1; -#line 1705 "MediaDataRepresentation.c" +#line 1706 "MediaDataRepresentation.c" } @@ -1715,7 +1716,7 @@ static void backing_file_state_finalize (BackingFileState * obj) { _g_free0 (self->filepath); #line 11 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (self->md5); -#line 1719 "MediaDataRepresentation.c" +#line 1720 "MediaDataRepresentation.c" } @@ -1740,7 +1741,7 @@ gpointer backing_file_state_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return instance; -#line 1744 "MediaDataRepresentation.c" +#line 1745 "MediaDataRepresentation.c" } @@ -1753,7 +1754,7 @@ void backing_file_state_unref (gpointer instance) { BACKING_FILE_STATE_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1757 "MediaDataRepresentation.c" +#line 1758 "MediaDataRepresentation.c" } } @@ -1767,7 +1768,7 @@ MediaSource* media_source_construct (GType object_type, gint64 object_id) { self = (MediaSource*) thumbnail_source_construct (object_type, _tmp0_); #line 39 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1771 "MediaDataRepresentation.c" +#line 1772 "MediaDataRepresentation.c" } @@ -1783,7 +1784,7 @@ inline guint64 media_source_internal_add_flags (guint64 flags, guint64 selector) result = _tmp0_ | _tmp1_; #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1787 "MediaDataRepresentation.c" +#line 1788 "MediaDataRepresentation.c" } @@ -1799,7 +1800,7 @@ inline guint64 media_source_internal_remove_flags (guint64 flags, guint64 select result = _tmp0_ & (~_tmp1_); #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1803 "MediaDataRepresentation.c" +#line 1804 "MediaDataRepresentation.c" } @@ -1815,7 +1816,7 @@ inline gboolean media_source_internal_is_flag_set (guint64 flags, guint64 select result = (_tmp0_ & _tmp1_) != ((guint64) 0); #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1819 "MediaDataRepresentation.c" +#line 1820 "MediaDataRepresentation.c" } @@ -1832,7 +1833,7 @@ static void media_source_real_notify_master_replaced (MediaSource* self, GFile* _tmp1_ = new_file; #line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit (self, media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 1836 "MediaDataRepresentation.c" +#line 1837 "MediaDataRepresentation.c" } @@ -1841,14 +1842,14 @@ void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GF g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->notify_master_replaced (self, old_file, new_file); -#line 1845 "MediaDataRepresentation.c" +#line 1846 "MediaDataRepresentation.c" } static gpointer _alteration_ref0 (gpointer self) { #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? alteration_ref (self) : NULL; -#line 1852 "MediaDataRepresentation.c" +#line 1853 "MediaDataRepresentation.c" } @@ -1858,9 +1859,10 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte Alteration* _tmp0_; Alteration* _tmp1_; gboolean _tmp2_ = FALSE; - Alteration* _tmp3_; - gboolean _tmp4_; - Alteration* _tmp11_; + gboolean _tmp3_ = FALSE; + Alteration* _tmp4_; + gboolean _tmp5_; + Alteration* _tmp14_; #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1872,57 +1874,73 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" local = _tmp1_; #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp3_ = local; + _tmp4_ = local; #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp4_ = alteration_has_detail (_tmp3_, "metadata", "name"); + _tmp5_ = alteration_has_detail (_tmp4_, "metadata", "name"); #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp4_) { + if (_tmp5_) { #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = TRUE; -#line 1883 "MediaDataRepresentation.c" + _tmp3_ = TRUE; +#line 1885 "MediaDataRepresentation.c" } else { - Alteration* _tmp5_; - gboolean _tmp6_; -#line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp5_ = local; + Alteration* _tmp6_; + gboolean _tmp7_; +#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp6_ = local; +#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp7_ = alteration_has_detail (_tmp6_, "metadata", "comment"); +#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp3_ = _tmp7_; +#line 1895 "MediaDataRepresentation.c" + } #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = alteration_has_detail (_tmp5_, "backing", "master"); + if (_tmp3_) { #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp2_ = _tmp6_; -#line 1893 "MediaDataRepresentation.c" + _tmp2_ = TRUE; +#line 1901 "MediaDataRepresentation.c" + } else { + Alteration* _tmp8_; + gboolean _tmp9_; +#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp8_ = local; +#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp9_ = alteration_has_detail (_tmp8_, "backing", "master"); +#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp2_ = _tmp9_; +#line 1911 "MediaDataRepresentation.c" } #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp2_) { -#line 1897 "MediaDataRepresentation.c" - Alteration* _tmp7_; - Alteration* _tmp8_; - Alteration* _tmp9_; +#line 1915 "MediaDataRepresentation.c" Alteration* _tmp10_; -#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + Alteration* _tmp11_; + Alteration* _tmp12_; + Alteration* _tmp13_; +#line 65 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_update_indexable_keywords (self); -#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp7_ = local; -#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp8_ = alteration_new ("indexable", "keywords"); -#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp9_ = _tmp8_; -#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp10_ = alteration_compress (_tmp7_, _tmp9_); -#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp10_ = local; +#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp11_ = alteration_new ("indexable", "keywords"); +#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp12_ = _tmp11_; +#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp13_ = alteration_compress (_tmp10_, _tmp12_); +#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (local); -#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - local = _tmp10_; -#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _alteration_unref0 (_tmp9_); -#line 1918 "MediaDataRepresentation.c" +#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + local = _tmp13_; +#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _alteration_unref0 (_tmp12_); +#line 1936 "MediaDataRepresentation.c" } -#line 67 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp11_ = local; -#line 67 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - DATA_OBJECT_CLASS (media_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp11_); +#line 69 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp14_ = local; +#line 69 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + DATA_OBJECT_CLASS (media_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp14_); #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (local); -#line 1926 "MediaDataRepresentation.c" +#line 1944 "MediaDataRepresentation.c" } @@ -1931,37 +1949,37 @@ static void media_source_real_notify_membership_changed (DataObject* base, DataC gboolean _tmp0_ = FALSE; DataCollection* _tmp1_; DataCollection* _tmp3_; -#line 72 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 74 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); -#line 72 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 74 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection)); -#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = collection; -#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_ != NULL) { -#line 1943 "MediaDataRepresentation.c" +#line 1961 "MediaDataRepresentation.c" const gchar* _tmp2_; -#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = self->priv->indexable_keywords; -#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = _tmp2_ == NULL; -#line 1949 "MediaDataRepresentation.c" +#line 1967 "MediaDataRepresentation.c" } else { -#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = FALSE; -#line 1953 "MediaDataRepresentation.c" +#line 1971 "MediaDataRepresentation.c" } -#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_) { -#line 76 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 78 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_update_indexable_keywords (self); -#line 1959 "MediaDataRepresentation.c" +#line 1977 "MediaDataRepresentation.c" } -#line 79 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 81 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = collection; -#line 79 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 81 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_OBJECT_CLASS (media_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp3_); -#line 1965 "MediaDataRepresentation.c" +#line 1983 "MediaDataRepresentation.c" } @@ -1977,49 +1995,49 @@ static void media_source_update_indexable_keywords (MediaSource* self) { gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; -#line 82 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = g_new0 (gchar*, 3 + 1); -#line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" indexables = _tmp0_; -#line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" indexables_length1 = 3; -#line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _indexables_size_ = indexables_length1; -#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = media_source_get_title (self); -#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (indexables[0]); -#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" indexables[0] = _tmp1_; -#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = indexables[0]; -#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 87 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = media_source_get_basename (self); -#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 87 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (indexables[1]); -#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 87 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" indexables[1] = _tmp3_; -#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 87 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = indexables[1]; -#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = media_source_get_comment (self); -#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (indexables[2]); -#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" indexables[2] = _tmp5_; -#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp6_ = indexables[2]; #line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp6_ = indexables[2]; +#line 90 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = indexable_prepare_indexable_strings (indexables, indexables_length1); -#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 90 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (self->priv->indexable_keywords); -#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 90 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->indexable_keywords = _tmp7_; -#line 82 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" indexables = (_vala_array_free (indexables, indexables_length1, (GDestroyNotify) g_free), NULL); -#line 2023 "MediaDataRepresentation.c" +#line 2041 "MediaDataRepresentation.c" } @@ -2027,41 +2045,41 @@ static const gchar* media_source_real_get_indexable_keywords (Indexable* base) { MediaSource * self; const gchar* result = NULL; const gchar* _tmp0_; -#line 91 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 93 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); -#line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 94 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->indexable_keywords; -#line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 94 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp0_; -#line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 94 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2039 "MediaDataRepresentation.c" +#line 2057 "MediaDataRepresentation.c" } static gboolean media_source_real_set_event_id (MediaSource* self, EventID* id) { gboolean _tmp0_ = FALSE; -#line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 97 "/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" +#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2049 "MediaDataRepresentation.c" +#line 2067 "MediaDataRepresentation.c" } gboolean media_source_set_event_id (MediaSource* self, EventID* id) { -#line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); -#line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->set_event_id (self, id); -#line 2058 "MediaDataRepresentation.c" +#line 2076 "MediaDataRepresentation.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? g_object_ref (self) : NULL; -#line 2065 "MediaDataRepresentation.c" +#line 2083 "MediaDataRepresentation.c" } @@ -2076,36 +2094,36 @@ gboolean media_source_delete_original_file (MediaSource* self) { gboolean _tmp13_; gboolean _tmp14_; GError * _inner_error_ = NULL; -#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); -#line 98 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 100 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ret = FALSE; -#line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_get_master_file (self); -#line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" file = _tmp0_; -#line 2088 "MediaDataRepresentation.c" +#line 2106 "MediaDataRepresentation.c" { gboolean _tmp1_ = FALSE; GFile* _tmp2_; gboolean _tmp3_; -#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = file; -#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = g_file_trash (_tmp2_, NULL, &_inner_error_); -#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp3_; -#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2101 "MediaDataRepresentation.c" - goto __catch562_g_error; +#line 2119 "MediaDataRepresentation.c" + goto __catch571_g_error; } -#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ret = _tmp1_; -#line 2106 "MediaDataRepresentation.c" +#line 2124 "MediaDataRepresentation.c" } - goto __finally562; - __catch562_g_error: + goto __finally571; + __catch571_g_error: { GError* err = NULL; GFile* _tmp4_; @@ -2113,71 +2131,71 @@ gboolean media_source_delete_original_file (MediaSource* self) { gchar* _tmp6_; GError* _tmp7_; const gchar* _tmp8_; -#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; -#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; -#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = file; -#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = g_file_get_path (_tmp4_); -#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _tmp5_; -#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = err; -#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _tmp7_->message; -#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_message ("MediaDataRepresentation.vala:106: Unable to move original photo %s to " \ +#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_message ("MediaDataRepresentation.vala:108: Unable to move original photo %s to " \ "trash: %s", _tmp6_, _tmp8_); -#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp6_); -#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 2137 "MediaDataRepresentation.c" +#line 2155 "MediaDataRepresentation.c" } - __finally562: -#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + __finally571: +#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2142 "MediaDataRepresentation.c" +#line 2160 "MediaDataRepresentation.c" gboolean _tmp9_ = FALSE; -#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); -#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); -#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp9_; -#line 2152 "MediaDataRepresentation.c" +#line 2170 "MediaDataRepresentation.c" } -#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = file; -#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = app_dirs_get_import_dir (); -#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = _tmp11_; -#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = g_file_has_prefix (_tmp10_, _tmp12_); -#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = _tmp13_; -#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp12_); -#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp14_) { -#line 2168 "MediaDataRepresentation.c" +#line 2186 "MediaDataRepresentation.c" GFile* parent = NULL; GFile* _tmp15_; GFile* _tmp16_; -#line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = file; -#line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = _g_object_ref0 (_tmp15_); -#line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" parent = _tmp16_; -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 2180 "MediaDataRepresentation.c" +#line 2198 "MediaDataRepresentation.c" GFile* _tmp17_; GFile* _tmp18_; GFile* _tmp19_; @@ -2187,88 +2205,88 @@ gboolean media_source_delete_original_file (MediaSource* self) { GFile* _tmp23_; gboolean _tmp24_ = FALSE; GFile* _tmp25_; -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = parent; -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = app_dirs_get_import_dir (); -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = _tmp18_; -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = g_file_equal (_tmp17_, _tmp19_); -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = !(!_tmp20_); -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp19_); -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp21_) { -#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2206 "MediaDataRepresentation.c" +#line 2224 "MediaDataRepresentation.c" } -#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = parent; -#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = g_file_get_parent (_tmp22_); -#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); -#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" parent = _tmp23_; -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = parent; -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp25_ == NULL) { -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = TRUE; -#line 2222 "MediaDataRepresentation.c" +#line 2240 "MediaDataRepresentation.c" } else { GFile* _tmp26_; GFile* _tmp27_; GFile* _tmp28_; gboolean _tmp29_; -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = parent; -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = app_dirs_get_import_dir (); -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = _tmp27_; -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = g_file_equal (_tmp26_, _tmp28_); -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = _tmp29_; -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp28_); -#line 2240 "MediaDataRepresentation.c" +#line 2258 "MediaDataRepresentation.c" } -#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_) { -#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2246 "MediaDataRepresentation.c" +#line 2264 "MediaDataRepresentation.c" } { gboolean _tmp30_ = FALSE; GFile* _tmp31_; gboolean _tmp32_; -#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = parent; -#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp32_ = query_is_directory_empty (_tmp31_, &_inner_error_); -#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp30_ = _tmp32_; -#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2260 "MediaDataRepresentation.c" - goto __catch563_g_error; +#line 2278 "MediaDataRepresentation.c" + goto __catch572_g_error; } -#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp30_) { -#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2267 "MediaDataRepresentation.c" +#line 2285 "MediaDataRepresentation.c" } } - goto __finally563; - __catch563_g_error: + goto __finally572; + __catch572_g_error: { GError* err = NULL; GFile* _tmp33_; @@ -2276,75 +2294,75 @@ gboolean media_source_delete_original_file (MediaSource* self) { gchar* _tmp35_; GError* _tmp36_; const gchar* _tmp37_; -#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; -#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; -#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = parent; -#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34_ = g_file_get_path (_tmp33_); -#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp35_ = _tmp34_; -#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp36_ = err; -#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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", _tmp35_, _tmp37_); -#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_free0 (_tmp35_); #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_error_free0 (err); + g_warning ("MediaDataRepresentation.vala:124: Unable to query file info for %s: %s", _tmp35_, _tmp37_); #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_free0 (_tmp35_); +#line 126 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_error_free0 (err); +#line 126 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2301 "MediaDataRepresentation.c" +#line 2319 "MediaDataRepresentation.c" } - __finally563: -#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + __finally572: +#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2306 "MediaDataRepresentation.c" +#line 2324 "MediaDataRepresentation.c" gboolean _tmp38_ = FALSE; -#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); -#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); -#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); -#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp38_; -#line 2318 "MediaDataRepresentation.c" +#line 2336 "MediaDataRepresentation.c" } { GFile* _tmp39_; GFile* _tmp40_; gchar* _tmp41_; gchar* _tmp42_; -#line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = parent; -#line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_file_delete (_tmp39_, NULL, &_inner_error_); -#line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2331 "MediaDataRepresentation.c" - goto __catch564_g_error; +#line 2349 "MediaDataRepresentation.c" + goto __catch573_g_error; } -#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp40_ = parent; -#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp41_ = g_file_get_path (_tmp40_); -#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp42_ = _tmp41_; -#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_debug ("MediaDataRepresentation.vala:129: Deleted empty directory %s", _tmp42_); -#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_debug ("MediaDataRepresentation.vala:131: Deleted empty directory %s", _tmp42_); +#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp42_); -#line 2344 "MediaDataRepresentation.c" +#line 2362 "MediaDataRepresentation.c" } - goto __finally564; - __catch564_g_error: + goto __finally573; + __catch573_g_error: { GError* err = NULL; GFile* _tmp43_; @@ -2352,58 +2370,58 @@ gboolean media_source_delete_original_file (MediaSource* self) { gchar* _tmp45_; GError* _tmp46_; const gchar* _tmp47_; -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; -#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp43_ = parent; -#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = g_file_get_path (_tmp43_); -#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp45_ = _tmp44_; -#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp46_ = err; -#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp47_ = _tmp46_->message; -#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_message ("MediaDataRepresentation.vala:132: Unable to delete empty directory %s:" \ +#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_message ("MediaDataRepresentation.vala:134: Unable to delete empty directory %s:" \ " %s", _tmp45_, _tmp47_); -#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp45_); -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 2375 "MediaDataRepresentation.c" +#line 2393 "MediaDataRepresentation.c" } - __finally564: -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + __finally573: +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2380 "MediaDataRepresentation.c" +#line 2398 "MediaDataRepresentation.c" gboolean _tmp48_ = FALSE; -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); -#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp48_; -#line 2392 "MediaDataRepresentation.c" +#line 2410 "MediaDataRepresentation.c" } } -#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); -#line 2397 "MediaDataRepresentation.c" +#line 2415 "MediaDataRepresentation.c" } -#line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 140 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = ret; -#line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 140 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); -#line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 140 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2405 "MediaDataRepresentation.c" +#line 2423 "MediaDataRepresentation.c" } @@ -2415,47 +2433,47 @@ static gchar* media_source_real_get_name (DataObject* base) { gchar* _tmp1_ = NULL; const gchar* _tmp2_; gboolean _tmp3_; -#line 141 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 143 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); -#line 142 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_get_title (self); -#line 142 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - title = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + title = _tmp0_; +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = title; -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = is_string_empty (_tmp2_); -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp3_) { -#line 2429 "MediaDataRepresentation.c" +#line 2447 "MediaDataRepresentation.c" gchar* _tmp4_; -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = media_source_get_basename (self); -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp1_); -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp4_; -#line 2437 "MediaDataRepresentation.c" +#line 2455 "MediaDataRepresentation.c" } else { const gchar* _tmp5_; gchar* _tmp6_; -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = title; -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = g_strdup (_tmp5_); -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp1_); -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp6_; -#line 2449 "MediaDataRepresentation.c" +#line 2467 "MediaDataRepresentation.c" } -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (title); -#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2457 "MediaDataRepresentation.c" +#line 2475 "MediaDataRepresentation.c" } @@ -2465,214 +2483,214 @@ static gchar* media_source_real_get_basename (MediaSource* self) { GFile* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; -#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_get_file (self); -#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = g_file_get_basename (_tmp1_); -#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp3_; -#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2481 "MediaDataRepresentation.c" +#line 2499 "MediaDataRepresentation.c" } gchar* media_source_get_basename (MediaSource* self) { -#line 147 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 149 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 147 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 149 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_basename (self); -#line 2490 "MediaDataRepresentation.c" +#line 2508 "MediaDataRepresentation.c" } static GFile* media_source_real_get_file (MediaSource* self) { -#line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2499 "MediaDataRepresentation.c" +#line 2517 "MediaDataRepresentation.c" } GFile* media_source_get_file (MediaSource* self) { -#line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_file (self); -#line 2508 "MediaDataRepresentation.c" +#line 2526 "MediaDataRepresentation.c" } static GFile* media_source_real_get_master_file (MediaSource* self) { -#line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2517 "MediaDataRepresentation.c" +#line 2535 "MediaDataRepresentation.c" } GFile* media_source_get_master_file (MediaSource* self) { -#line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_file (self); -#line 2526 "MediaDataRepresentation.c" +#line 2544 "MediaDataRepresentation.c" } static guint64 media_source_real_get_master_filesize (MediaSource* self) { guint64 _tmp0_ = 0ULL; -#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 155 "/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" +#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2536 "MediaDataRepresentation.c" +#line 2554 "MediaDataRepresentation.c" } guint64 media_source_get_master_filesize (MediaSource* self) { -#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL); -#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_filesize (self); -#line 2545 "MediaDataRepresentation.c" +#line 2563 "MediaDataRepresentation.c" } static guint64 media_source_real_get_filesize (MediaSource* self) { guint64 _tmp0_ = 0ULL; -#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 156 "/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" +#line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2555 "MediaDataRepresentation.c" +#line 2573 "MediaDataRepresentation.c" } guint64 media_source_get_filesize (MediaSource* self) { -#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL); -#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_filesize (self); -#line 2564 "MediaDataRepresentation.c" +#line 2582 "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" +#line 157 "/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" +#line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2574 "MediaDataRepresentation.c" +#line 2592 "MediaDataRepresentation.c" } time_t media_source_get_timestamp (MediaSource* self) { -#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); -#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_timestamp (self); -#line 2583 "MediaDataRepresentation.c" +#line 2601 "MediaDataRepresentation.c" } static BackingFileState** media_source_real_get_backing_files_state (MediaSource* self, int* result_length1) { -#line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2592 "MediaDataRepresentation.c" +#line 2610 "MediaDataRepresentation.c" } BackingFileState** media_source_get_backing_files_state (MediaSource* self, int* result_length1) { -#line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_backing_files_state (self, result_length1); -#line 2601 "MediaDataRepresentation.c" +#line 2619 "MediaDataRepresentation.c" } static gchar* media_source_real_get_title (MediaSource* self) { -#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2610 "MediaDataRepresentation.c" +#line 2628 "MediaDataRepresentation.c" } gchar* media_source_get_title (MediaSource* self) { -#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_title (self); -#line 2619 "MediaDataRepresentation.c" +#line 2637 "MediaDataRepresentation.c" } static gchar* media_source_real_get_comment (MediaSource* self) { -#line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2628 "MediaDataRepresentation.c" +#line 2646 "MediaDataRepresentation.c" } gchar* media_source_get_comment (MediaSource* self) { -#line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_comment (self); -#line 2637 "MediaDataRepresentation.c" +#line 2655 "MediaDataRepresentation.c" } static void media_source_real_set_title (MediaSource* self, const gchar* title) { -#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2646 "MediaDataRepresentation.c" +#line 2664 "MediaDataRepresentation.c" } void media_source_set_title (MediaSource* self, const gchar* title) { -#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->set_title (self, title); -#line 2655 "MediaDataRepresentation.c" +#line 2673 "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" +#line 165 "/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" +#line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2665 "MediaDataRepresentation.c" +#line 2683 "MediaDataRepresentation.c" } gboolean media_source_set_comment (MediaSource* self, const gchar* comment) { -#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); -#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->set_comment (self, comment); -#line 2674 "MediaDataRepresentation.c" +#line 2692 "MediaDataRepresentation.c" } @@ -2680,15 +2698,15 @@ gchar* media_source_prep_title (const gchar* title) { gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; -#line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = title; -#line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = prepare_input_text (_tmp0_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL), DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; -#line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2690 "MediaDataRepresentation.c" +#line 2708 "MediaDataRepresentation.c" } @@ -2696,269 +2714,269 @@ gchar* media_source_prep_comment (const gchar* comment) { gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; -#line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = comment; -#line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = prepare_input_text (_tmp0_, (PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)) & (~PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL), -1); -#line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; -#line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2706 "MediaDataRepresentation.c" +#line 2724 "MediaDataRepresentation.c" } static Rating media_source_real_get_rating (MediaSource* self) { -#line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return 0; -#line 2715 "MediaDataRepresentation.c" +#line 2733 "MediaDataRepresentation.c" } Rating media_source_get_rating (MediaSource* self) { -#line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); -#line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_rating (self); -#line 2724 "MediaDataRepresentation.c" +#line 2742 "MediaDataRepresentation.c" } static void media_source_real_set_rating (MediaSource* self, Rating rating) { -#line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2733 "MediaDataRepresentation.c" +#line 2751 "MediaDataRepresentation.c" } void media_source_set_rating (MediaSource* self, Rating rating) { -#line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->set_rating (self, rating); -#line 2742 "MediaDataRepresentation.c" +#line 2760 "MediaDataRepresentation.c" } static void media_source_real_increase_rating (MediaSource* self) { -#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2751 "MediaDataRepresentation.c" +#line 2769 "MediaDataRepresentation.c" } void media_source_increase_rating (MediaSource* self) { -#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->increase_rating (self); -#line 2760 "MediaDataRepresentation.c" +#line 2778 "MediaDataRepresentation.c" } static void media_source_real_decrease_rating (MediaSource* self) { -#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2769 "MediaDataRepresentation.c" +#line 2787 "MediaDataRepresentation.c" } void media_source_decrease_rating (MediaSource* self) { -#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->decrease_rating (self); -#line 2778 "MediaDataRepresentation.c" +#line 2796 "MediaDataRepresentation.c" } static void media_source_real_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result) { -#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2787 "MediaDataRepresentation.c" +#line 2805 "MediaDataRepresentation.c" } void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result) { -#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_dimensions (self, disallowed_steps, result); -#line 2796 "MediaDataRepresentation.c" +#line 2814 "MediaDataRepresentation.c" } static GdkPixbuf* media_source_real_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error) { -#line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2805 "MediaDataRepresentation.c" +#line 2823 "MediaDataRepresentation.c" } GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error) { -#line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_preview_pixbuf (self, scaling, error); -#line 2814 "MediaDataRepresentation.c" +#line 2832 "MediaDataRepresentation.c" } static gboolean media_source_real_is_trashed (MediaSource* self) { gboolean _tmp0_ = FALSE; -#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 192 "/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" +#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2824 "MediaDataRepresentation.c" +#line 2842 "MediaDataRepresentation.c" } gboolean media_source_is_trashed (MediaSource* self) { -#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); -#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->is_trashed (self); -#line 2833 "MediaDataRepresentation.c" +#line 2851 "MediaDataRepresentation.c" } static void media_source_real_trash (MediaSource* self) { -#line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2842 "MediaDataRepresentation.c" +#line 2860 "MediaDataRepresentation.c" } void media_source_trash (MediaSource* self) { -#line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->trash (self); -#line 2851 "MediaDataRepresentation.c" +#line 2869 "MediaDataRepresentation.c" } static void media_source_real_untrash (MediaSource* self) { -#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2860 "MediaDataRepresentation.c" +#line 2878 "MediaDataRepresentation.c" } void media_source_untrash (MediaSource* self) { -#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->untrash (self); -#line 2869 "MediaDataRepresentation.c" +#line 2887 "MediaDataRepresentation.c" } static gboolean media_source_real_is_offline (MediaSource* self) { gboolean _tmp0_ = FALSE; -#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 196 "/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" +#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2879 "MediaDataRepresentation.c" +#line 2897 "MediaDataRepresentation.c" } gboolean media_source_is_offline (MediaSource* self) { -#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); -#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->is_offline (self); -#line 2888 "MediaDataRepresentation.c" +#line 2906 "MediaDataRepresentation.c" } static void media_source_real_mark_offline (MediaSource* self) { -#line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2897 "MediaDataRepresentation.c" +#line 2915 "MediaDataRepresentation.c" } void media_source_mark_offline (MediaSource* self) { -#line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->mark_offline (self); -#line 2906 "MediaDataRepresentation.c" +#line 2924 "MediaDataRepresentation.c" } static void media_source_real_mark_online (MediaSource* self) { -#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2915 "MediaDataRepresentation.c" +#line 2933 "MediaDataRepresentation.c" } void media_source_mark_online (MediaSource* self) { -#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->mark_online (self); -#line 2924 "MediaDataRepresentation.c" +#line 2942 "MediaDataRepresentation.c" } static gchar* media_source_real_get_master_md5 (MediaSource* self) { -#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2933 "MediaDataRepresentation.c" +#line 2951 "MediaDataRepresentation.c" } gchar* media_source_get_master_md5 (MediaSource* self) { -#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_md5 (self); -#line 2942 "MediaDataRepresentation.c" +#line 2960 "MediaDataRepresentation.c" } static void media_source_real_get_event_id (MediaSource* self, EventID* result) { -#line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2951 "MediaDataRepresentation.c" +#line 2969 "MediaDataRepresentation.c" } void media_source_get_event_id (MediaSource* self, EventID* result) { -#line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_event_id (self, result); -#line 2960 "MediaDataRepresentation.c" +#line 2978 "MediaDataRepresentation.c" } @@ -2973,58 +2991,58 @@ Event* media_source_get_event (MediaSource* self) { Event* _tmp7_; Event* _tmp8_; Event* _tmp9_; -#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); -#line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 207 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->event; -#line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 207 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 2981 "MediaDataRepresentation.c" +#line 2999 "MediaDataRepresentation.c" Event* _tmp1_; Event* _tmp2_; -#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = self->priv->event; -#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp2_; -#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2992 "MediaDataRepresentation.c" +#line 3010 "MediaDataRepresentation.c" } -#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_get_event_id (self, &_tmp3_); -#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp3_; -#line 209 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 211 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = event_id_is_valid (&event_id); -#line 209 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 211 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp4_) { -#line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; -#line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3006 "MediaDataRepresentation.c" +#line 3024 "MediaDataRepresentation.c" } -#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = event_global; -#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = event_id; -#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = event_source_collection_fetch (_tmp5_, &_tmp6_); -#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->event); -#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->priv->event = _tmp7_; #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + self->priv->event = _tmp7_; +#line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = self->priv->event; -#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = _g_object_ref0 (_tmp8_); -#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp9_; -#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3026 "MediaDataRepresentation.c" +#line 3044 "MediaDataRepresentation.c" } @@ -3041,111 +3059,111 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { EventID _tmp8_; gboolean _tmp9_; gboolean _tmp10_; -#line 217 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); -#line 217 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail ((new_event == NULL) || IS_EVENT (new_event), FALSE); -#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = new_event; -#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_ != NULL) { -#line 3051 "MediaDataRepresentation.c" +#line 3069 "MediaDataRepresentation.c" Event* _tmp2_; EventID _tmp3_ = {0}; -#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = new_event; -#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_get_event_id (_tmp2_, &_tmp3_); -#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = _tmp3_; -#line 3060 "MediaDataRepresentation.c" +#line 3078 "MediaDataRepresentation.c" } else { -#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id_init (&_tmp0_, EVENT_ID_INVALID); -#line 3064 "MediaDataRepresentation.c" +#line 3082 "MediaDataRepresentation.c" } -#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp0_; -#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_get_event_id (self, &_tmp4_); -#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp4_.id; -#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = event_id; -#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _tmp6_.id; -#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp5_ == _tmp7_) { -#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = TRUE; -#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3082 "MediaDataRepresentation.c" +#line 3100 "MediaDataRepresentation.c" } -#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = event_id; -#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_set_event_id (self, &_tmp8_); -#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" committed = _tmp9_; -#line 223 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = committed; -#line 223 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp10_) { -#line 3094 "MediaDataRepresentation.c" +#line 3112 "MediaDataRepresentation.c" Event* _tmp11_; Event* _tmp13_; Event* _tmp15_; Event* _tmp16_; Alteration* _tmp17_; Alteration* _tmp18_; -#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 226 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = self->priv->event; -#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 226 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp11_ != NULL) { -#line 3105 "MediaDataRepresentation.c" +#line 3123 "MediaDataRepresentation.c" Event* _tmp12_; -#line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = self->priv->event; -#line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_detach (_tmp12_, self); -#line 3111 "MediaDataRepresentation.c" +#line 3129 "MediaDataRepresentation.c" } -#line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 229 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = new_event; -#line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 229 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp13_ != NULL) { -#line 3117 "MediaDataRepresentation.c" +#line 3135 "MediaDataRepresentation.c" Event* _tmp14_; -#line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = new_event; -#line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_attach (_tmp14_, self); -#line 3123 "MediaDataRepresentation.c" +#line 3141 "MediaDataRepresentation.c" } -#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = new_event; -#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = _g_object_ref0 (_tmp15_); -#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->event); -#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self->priv->event = _tmp16_; #line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + self->priv->event = _tmp16_; +#line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = alteration_new ("metadata", "event"); -#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = _tmp17_; -#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); -#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (_tmp18_); -#line 3141 "MediaDataRepresentation.c" +#line 3159 "MediaDataRepresentation.c" } -#line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 237 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = committed; -#line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 237 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3147 "MediaDataRepresentation.c" +#line 3165 "MediaDataRepresentation.c" } @@ -3158,51 +3176,51 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, Alteration* alteration = NULL; Alteration* _tmp24_; TransactionController* _tmp33_; -#line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media_sources)); -#line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((event == NULL) || IS_EVENT (event)); -#line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); +#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = event; -#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_ != NULL) { -#line 3170 "MediaDataRepresentation.c" +#line 3188 "MediaDataRepresentation.c" Event* _tmp2_; EventID _tmp3_ = {0}; -#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = event; -#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_get_event_id (_tmp2_, &_tmp3_); -#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = _tmp3_; -#line 3179 "MediaDataRepresentation.c" +#line 3197 "MediaDataRepresentation.c" } else { -#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id_init (&_tmp0_, EVENT_ID_INVALID); -#line 3183 "MediaDataRepresentation.c" +#line 3201 "MediaDataRepresentation.c" } -#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - event_id = _tmp0_; #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + event_id = _tmp0_; +#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = controller; -#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" transaction_controller_begin (_tmp4_); -#line 3191 "MediaDataRepresentation.c" +#line 3209 "MediaDataRepresentation.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp5_; GeeIterator* _tmp6_; -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = media_sources; -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _media_it = _tmp6_; -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3204 "MediaDataRepresentation.c" +#line 3222 "MediaDataRepresentation.c" GeeIterator* _tmp7_; gboolean _tmp8_; MediaSource* media = NULL; @@ -3217,102 +3235,102 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, MediaSource* _tmp18_; Event* _tmp19_; Event* _tmp20_; -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _media_it; -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = gee_iterator_next (_tmp7_); -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp8_) { -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3227 "MediaDataRepresentation.c" +#line 3245 "MediaDataRepresentation.c" } -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = _media_it; -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = gee_iterator_get (_tmp9_); -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media = (MediaSource*) _tmp10_; -#line 245 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = media; -#line 245 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = media_source_get_event (_tmp11_); -#line 245 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" old_event = _tmp12_; -#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 248 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = old_event; -#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 248 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp13_ != NULL) { -#line 3245 "MediaDataRepresentation.c" +#line 3263 "MediaDataRepresentation.c" Event* _tmp14_; MediaSource* _tmp15_; -#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = old_event; -#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = media; -#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_detach (_tmp14_, _tmp15_); -#line 3254 "MediaDataRepresentation.c" +#line 3272 "MediaDataRepresentation.c" } -#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = media; -#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = event_id; -#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_set_event_id (_tmp16_, &_tmp17_); -#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = media; -#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = event; -#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = _g_object_ref0 (_tmp19_); -#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp18_->priv->event); -#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_->priv->event = _tmp20_; -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (old_event); -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 3276 "MediaDataRepresentation.c" +#line 3294 "MediaDataRepresentation.c" } -#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_media_it); -#line 3280 "MediaDataRepresentation.c" +#line 3298 "MediaDataRepresentation.c" } -#line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 255 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = event; -#line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 255 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp21_ != NULL) { -#line 3286 "MediaDataRepresentation.c" +#line 3304 "MediaDataRepresentation.c" Event* _tmp22_; GeeCollection* _tmp23_; -#line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = event; -#line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = media_sources; -#line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_attach_many (_tmp22_, _tmp23_); -#line 3295 "MediaDataRepresentation.c" +#line 3313 "MediaDataRepresentation.c" } -#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = alteration_new ("metadata", "event"); -#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" alteration = _tmp24_; -#line 3301 "MediaDataRepresentation.c" +#line 3319 "MediaDataRepresentation.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp25_; GeeIterator* _tmp26_; -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = media_sources; -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _media_it = _tmp26_; -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3314 "MediaDataRepresentation.c" +#line 3332 "MediaDataRepresentation.c" GeeIterator* _tmp27_; gboolean _tmp28_; MediaSource* media = NULL; @@ -3320,80 +3338,80 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, gpointer _tmp30_; MediaSource* _tmp31_; Alteration* _tmp32_; -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = _media_it; -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = gee_iterator_next (_tmp27_); -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp28_) { -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3330 "MediaDataRepresentation.c" +#line 3348 "MediaDataRepresentation.c" } -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = _media_it; -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp30_ = gee_iterator_get (_tmp29_); -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media = (MediaSource*) _tmp30_; -#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = media; -#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp32_ = alteration; -#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject), _tmp32_); -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 3346 "MediaDataRepresentation.c" +#line 3364 "MediaDataRepresentation.c" } -#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_media_it); -#line 3350 "MediaDataRepresentation.c" +#line 3368 "MediaDataRepresentation.c" } -#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 262 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = controller; -#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 262 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" transaction_controller_commit (_tmp33_); -#line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (alteration); -#line 3358 "MediaDataRepresentation.c" +#line 3376 "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" +#line 265 "/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" +#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 3368 "MediaDataRepresentation.c" +#line 3386 "MediaDataRepresentation.c" } time_t media_source_get_exposure_time (MediaSource* self) { -#line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); -#line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_exposure_time (self); -#line 3377 "MediaDataRepresentation.c" +#line 3395 "MediaDataRepresentation.c" } static void media_source_real_get_import_id (MediaSource* self, ImportID* result) { -#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 3386 "MediaDataRepresentation.c" +#line 3404 "MediaDataRepresentation.c" } void media_source_get_import_id (MediaSource* self, ImportID* result) { -#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); -#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_import_id (self, result); -#line 3395 "MediaDataRepresentation.c" +#line 3413 "MediaDataRepresentation.c" } @@ -3402,7 +3420,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 3404 "MediaDataRepresentation.c" +#line 3422 "MediaDataRepresentation.c" } @@ -3421,19 +3439,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 3423 "MediaDataRepresentation.c" +#line 3441 "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 3429 "MediaDataRepresentation.c" +#line 3447 "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 3435 "MediaDataRepresentation.c" +#line 3453 "MediaDataRepresentation.c" } @@ -3512,7 +3530,7 @@ static void media_source_class_init (MediaSourceClass * klass) { G_OBJECT_CLASS (klass)->finalize = media_source_finalize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL] = 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 3514 "MediaDataRepresentation.c" +#line 3532 "MediaDataRepresentation.c" } @@ -3521,7 +3539,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 3523 "MediaDataRepresentation.c" +#line 3541 "MediaDataRepresentation.c" } @@ -3532,7 +3550,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 3534 "MediaDataRepresentation.c" +#line 3552 "MediaDataRepresentation.c" } @@ -3546,7 +3564,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 3548 "MediaDataRepresentation.c" +#line 3566 "MediaDataRepresentation.c" } @@ -3567,18 +3585,18 @@ GType media_source_get_type (void) { static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { guint result; result = file_hash ((GFile*) v); -#line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3571 "MediaDataRepresentation.c" +#line 3589 "MediaDataRepresentation.c" } static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { gboolean result; result = file_equal ((GFile*) a, (GFile*) b); -#line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3580 "MediaDataRepresentation.c" +#line 3598 "MediaDataRepresentation.c" } @@ -3589,30 +3607,30 @@ MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, void* _tmp1__target; GetSourceDatabaseKey _tmp2_; void* _tmp2__target; -#line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); #line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); +#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = sources; -#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = check_to_keep; -#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1__target = check_to_keep_target; -#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = get_key; -#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2__target = get_key_target; -#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 3607 "MediaDataRepresentation.c" +#line 3625 "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" +#line 274 "/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 3614 "MediaDataRepresentation.c" +#line 3632 "MediaDataRepresentation.c" } @@ -3621,31 +3639,31 @@ MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingT GeeHashMap* _tmp0_; GFile* _tmp1_; gpointer _tmp2_; -#line 277 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 279 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL); -#line 277 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 279 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->master_file_map; -#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = file; -#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = (MediaSource*) _tmp2_; -#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3637 "MediaDataRepresentation.c" +#line 3655 "MediaDataRepresentation.c" } MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, const gchar* md5) { MediaSource* result = NULL; -#line 281 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL); -#line 281 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (md5 != NULL, NULL); -#line 3647 "MediaDataRepresentation.c" +#line 3665 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeHashMap* _tmp0_; @@ -3654,25 +3672,25 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel GeeCollection* _tmp3_; GeeIterator* _tmp4_; GeeIterator* _tmp5_; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->master_file_map; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp4_; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp3_); -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_it = _tmp5_; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3674 "MediaDataRepresentation.c" +#line 3692 "MediaDataRepresentation.c" GeeIterator* _tmp6_; gboolean _tmp7_; MediaSource* source = NULL; @@ -3683,64 +3701,64 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel gchar* _tmp12_; const gchar* _tmp13_; gboolean _tmp14_; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _source_it; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp7_) { -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3693 "MediaDataRepresentation.c" +#line 3711 "MediaDataRepresentation.c" } -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _source_it; -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" source = (MediaSource*) _tmp9_; -#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = source; -#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = media_source_get_master_md5 (_tmp10_); -#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = _tmp11_; -#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = md5; -#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = g_strcmp0 (_tmp12_, _tmp13_) == 0; -#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp12_); -#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp14_) { -#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = source; -#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3721 "MediaDataRepresentation.c" +#line 3739 "MediaDataRepresentation.c" } -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3725 "MediaDataRepresentation.c" +#line 3743 "MediaDataRepresentation.c" } -#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3729 "MediaDataRepresentation.c" +#line 3747 "MediaDataRepresentation.c" } -#line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 290 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; -#line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 290 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3735 "MediaDataRepresentation.c" +#line 3753 "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" +#line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_holding_tank_on_master_source_replaced ((MediaSourceHoldingTank*) self, _sender, old_file, new_file); -#line 3742 "MediaDataRepresentation.c" +#line 3760 "MediaDataRepresentation.c" } @@ -3750,30 +3768,30 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin GeeCollection* _tmp15_; GeeCollection* _tmp33_; GeeCollection* _tmp34_; -#line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); -#line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); +#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = added; -#line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 3762 "MediaDataRepresentation.c" +#line 3780 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_; GeeIterator* _tmp2_; -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = added; -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_it = _tmp2_; -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3775 "MediaDataRepresentation.c" +#line 3793 "MediaDataRepresentation.c" GeeIterator* _tmp3_; gboolean _tmp4_; DataSource* source = NULL; @@ -3788,75 +3806,75 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin GFile* _tmp12_; MediaSource* _tmp13_; MediaSource* _tmp14_; -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _source_it; -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp4_) { -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3798 "MediaDataRepresentation.c" +#line 3816 "MediaDataRepresentation.c" } -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _source_it; -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" source = (DataSource*) _tmp6_; -#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = source; -#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source = _tmp8_; -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = self->priv->master_file_map; -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = media_source; -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = media_source_get_master_file (_tmp10_); -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = _tmp11_; -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = media_source; -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp13_); -#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp12_); -#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = media_source; -#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_connect (_tmp14_, "master-replaced", (GCallback) _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced, self); -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media_source); -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3834 "MediaDataRepresentation.c" +#line 3852 "MediaDataRepresentation.c" } -#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3838 "MediaDataRepresentation.c" +#line 3856 "MediaDataRepresentation.c" } } -#line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = removed; -#line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp15_ != NULL) { -#line 3845 "MediaDataRepresentation.c" +#line 3863 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp16_; GeeIterator* _tmp17_; -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = removed; -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_it = _tmp17_; -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3858 "MediaDataRepresentation.c" +#line 3876 "MediaDataRepresentation.c" GeeIterator* _tmp18_; gboolean _tmp19_; DataSource* source = NULL; @@ -3875,72 +3893,72 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin gboolean _tmp30_; MediaSource* _tmp31_; guint _tmp32_; -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = _source_it; -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = gee_iterator_next (_tmp18_); -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp19_) { -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3885 "MediaDataRepresentation.c" +#line 3903 "MediaDataRepresentation.c" } -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = _source_it; -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = gee_iterator_get (_tmp20_); -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" source = (DataSource*) _tmp21_; -#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = source; -#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source = _tmp23_; -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = self->priv->master_file_map; -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = media_source; -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = media_source_get_master_file (_tmp25_); -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = _tmp26_; -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, NULL); -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = _tmp28_; -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp27_); -#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" is_removed = _tmp29_; -#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 307 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp30_ = is_removed; -#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 307 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (_tmp30_, "is_removed"); -#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = media_source; -#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp32_, NULL, FALSE); -#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced, self); -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media_source); -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3929 "MediaDataRepresentation.c" +#line 3947 "MediaDataRepresentation.c" } -#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3933 "MediaDataRepresentation.c" +#line 3951 "MediaDataRepresentation.c" } } -#line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 312 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = added; -#line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 312 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34_ = removed; -#line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 312 "/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 3942 "MediaDataRepresentation.c" +#line 3960 "MediaDataRepresentation.c" } @@ -3952,70 +3970,70 @@ static void media_source_holding_tank_on_master_source_replaced (MediaSourceHold GeeHashMap* _tmp3_; GFile* _tmp4_; MediaSource* _tmp5_; -#line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self)); -#line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (media_source)); -#line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (old_file)); -#line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 314 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->master_file_map; -#line 314 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = old_file; -#line 314 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); -#line 314 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" removed = _tmp2_; -#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (removed, "removed"); #line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _vala_assert (removed, "removed"); +#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = self->priv->master_file_map; -#line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = new_file; -#line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = media_source; -#line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 319 "/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 3980 "MediaDataRepresentation.c" +#line 3998 "MediaDataRepresentation.c" } static void media_source_holding_tank_class_init (MediaSourceHoldingTankClass * klass) { -#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_holding_tank_parent_class = g_type_class_peek_parent (klass); -#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((SourceHoldingTankClass *) klass)->finalize = media_source_holding_tank_finalize; -#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceHoldingTankPrivate)); -#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered; -#line 3993 "MediaDataRepresentation.c" +#line 4011 "MediaDataRepresentation.c" } static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * self) { GeeHashMap* _tmp0_; -#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 270 "/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" +#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->master_file_map = _tmp0_; -#line 4005 "MediaDataRepresentation.c" +#line 4023 "MediaDataRepresentation.c" } static void media_source_holding_tank_finalize (SourceHoldingTank * obj) { MediaSourceHoldingTank * self; -#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); -#line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->master_file_map); -#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->finalize (obj); -#line 4017 "MediaDataRepresentation.c" +#line 4035 "MediaDataRepresentation.c" } @@ -4032,9 +4050,9 @@ GType media_source_holding_tank_get_type (void) { static gpointer _data_collection_ref0 (gpointer self) { -#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? data_collection_ref (self) : NULL; -#line 4036 "MediaDataRepresentation.c" +#line 4054 "MediaDataRepresentation.c" } @@ -4042,43 +4060,43 @@ MediaSourceTransactionController* media_source_transaction_controller_construct MediaSourceTransactionController* self = NULL; MediaSourceCollection* _tmp0_; MediaSourceCollection* _tmp1_; -#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); -#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = (MediaSourceTransactionController*) transaction_controller_construct (object_type); -#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = sources; -#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _data_collection_ref0 (_tmp0_); -#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (self->priv->sources); -#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->sources = _tmp1_; -#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 4058 "MediaDataRepresentation.c" +#line 4076 "MediaDataRepresentation.c" } MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources) { -#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_source_transaction_controller_construct (TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, sources); -#line 4065 "MediaDataRepresentation.c" +#line 4083 "MediaDataRepresentation.c" } static void media_source_transaction_controller_real_begin_impl (TransactionController* base, GError** error) { MediaSourceTransactionController * self; MediaSourceCollection* _tmp0_; -#line 330 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController); -#line 331 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 333 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" database_table_begin_transaction (); -#line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 334 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->sources; -#line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 334 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 4080 "MediaDataRepresentation.c" +#line 4098 "MediaDataRepresentation.c" } @@ -4086,56 +4104,56 @@ static void media_source_transaction_controller_real_commit_impl (TransactionCon MediaSourceTransactionController * self; MediaSourceCollection* _tmp0_; GError * _inner_error_ = NULL; -#line 335 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController); -#line 336 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 338 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->sources; -#line 336 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 338 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" database_table_commit_transaction (&_inner_error_); -#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_propagate_error (error, _inner_error_); -#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 4102 "MediaDataRepresentation.c" +#line 4120 "MediaDataRepresentation.c" } } static void media_source_transaction_controller_class_init (MediaSourceTransactionControllerClass * klass) { -#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_transaction_controller_parent_class = g_type_class_peek_parent (klass); -#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((TransactionControllerClass *) klass)->finalize = media_source_transaction_controller_finalize; -#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceTransactionControllerPrivate)); -#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_begin_impl; -#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_commit_impl; -#line 4118 "MediaDataRepresentation.c" +#line 4136 "MediaDataRepresentation.c" } static void media_source_transaction_controller_instance_init (MediaSourceTransactionController * self) { -#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE (self); -#line 4125 "MediaDataRepresentation.c" +#line 4143 "MediaDataRepresentation.c" } static void media_source_transaction_controller_finalize (TransactionController * obj) { MediaSourceTransactionController * self; -#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController); -#line 324 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (self->priv->sources); -#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" TRANSACTION_CONTROLLER_CLASS (media_source_transaction_controller_parent_class)->finalize (obj); -#line 4137 "MediaDataRepresentation.c" +#line 4155 "MediaDataRepresentation.c" } @@ -4154,9 +4172,9 @@ GType media_source_transaction_controller_get_type (void) { static gint _import_id_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { gint result; result = import_id_compare_func ((ImportID*) a, (ImportID*) b); -#line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4158 "MediaDataRepresentation.c" +#line 4176 "MediaDataRepresentation.c" } @@ -4167,55 +4185,55 @@ MediaSourceCollection* media_source_collection_construct (GType object_type, con void* _tmp1__target; MediaSourceHoldingTank* _tmp2_; MediaSourceHoldingTank* _tmp3_; -#line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 384 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (name != NULL, NULL); -#line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = name; -#line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = source_key_func; -#line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1__target = source_key_func_target; -#line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - self = (MediaSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target); #line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + self = (MediaSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target); +#line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = media_source_collection_create_trashcan (self); -#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (self->priv->trashcan); -#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->trashcan = _tmp2_; -#line 386 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = media_source_collection_create_offline_bin (self); -#line 386 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (self->priv->offline_bin); -#line 386 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->offline_bin = _tmp3_; -#line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 384 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 4193 "MediaDataRepresentation.c" +#line 4211 "MediaDataRepresentation.c" } void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos) { -#line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((photos == NULL) || GEE_IS_COLLECTION (photos)); -#line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((videos == NULL) || GEE_IS_COLLECTION (videos)); -#line 4204 "MediaDataRepresentation.c" +#line 4222 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp0_; GeeIterator* _tmp1_; -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_it = _tmp1_; -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4217 "MediaDataRepresentation.c" +#line 4235 "MediaDataRepresentation.c" GeeIterator* _tmp2_; gboolean _tmp3_; MediaSource* source = NULL; @@ -4223,126 +4241,126 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* gpointer _tmp5_; gboolean _tmp6_ = FALSE; GeeCollection* _tmp7_; -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _source_it; -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = gee_iterator_next (_tmp2_); -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp3_) { -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4233 "MediaDataRepresentation.c" +#line 4251 "MediaDataRepresentation.c" } -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _source_it; -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_get (_tmp4_); -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" source = (MediaSource*) _tmp5_; -#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = photos; -#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp7_ != NULL) { -#line 4245 "MediaDataRepresentation.c" +#line 4263 "MediaDataRepresentation.c" MediaSource* _tmp8_; -#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = source; -#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_LIBRARY_PHOTO); -#line 4251 "MediaDataRepresentation.c" +#line 4269 "MediaDataRepresentation.c" } else { -#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = FALSE; -#line 4255 "MediaDataRepresentation.c" +#line 4273 "MediaDataRepresentation.c" } -#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp6_) { -#line 4259 "MediaDataRepresentation.c" +#line 4277 "MediaDataRepresentation.c" GeeCollection* _tmp9_; MediaSource* _tmp10_; -#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = photos; -#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = source; -#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_collection_add (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4268 "MediaDataRepresentation.c" +#line 4286 "MediaDataRepresentation.c" } else { gboolean _tmp11_ = FALSE; GeeCollection* _tmp12_; -#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = videos; -#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp12_ != NULL) { -#line 4276 "MediaDataRepresentation.c" +#line 4294 "MediaDataRepresentation.c" MediaSource* _tmp13_; -#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = source; -#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO); -#line 4282 "MediaDataRepresentation.c" +#line 4300 "MediaDataRepresentation.c" } else { -#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = FALSE; -#line 4286 "MediaDataRepresentation.c" +#line 4304 "MediaDataRepresentation.c" } -#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp11_) { -#line 4290 "MediaDataRepresentation.c" +#line 4308 "MediaDataRepresentation.c" GeeCollection* _tmp14_; MediaSource* _tmp15_; -#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = videos; -#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = source; -#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_collection_add (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIDEO, Video)); -#line 4299 "MediaDataRepresentation.c" +#line 4317 "MediaDataRepresentation.c" } else { gboolean _tmp16_ = FALSE; GeeCollection* _tmp17_; -#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = photos; -#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_ != NULL) { -#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = TRUE; -#line 4309 "MediaDataRepresentation.c" +#line 4327 "MediaDataRepresentation.c" } else { GeeCollection* _tmp18_; -#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = videos; -#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = _tmp18_ != NULL; -#line 4316 "MediaDataRepresentation.c" +#line 4334 "MediaDataRepresentation.c" } -#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp16_) { -#line 4320 "MediaDataRepresentation.c" +#line 4338 "MediaDataRepresentation.c" MediaSource* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; -#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = source; -#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); -#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = _tmp20_; -#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_warning ("MediaDataRepresentation.vala:397: Unrecognized media: %s", _tmp21_); -#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_warning ("MediaDataRepresentation.vala:399: Unrecognized media: %s", _tmp21_); +#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp21_); -#line 4334 "MediaDataRepresentation.c" +#line 4352 "MediaDataRepresentation.c" } } } -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 4340 "MediaDataRepresentation.c" +#line 4358 "MediaDataRepresentation.c" } -#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 4344 "MediaDataRepresentation.c" +#line 4362 "MediaDataRepresentation.c" } } @@ -4359,286 +4377,286 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun gint _tmp4_; gint _tmp5_; gint _tmp6_; -#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" + g_return_if_fail (GEE_IS_COLLECTION (media)); +#line 405 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 405 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" photos = _tmp0_; -#line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" + videos = _tmp1_; +#line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = media; -#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" + 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 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _tmp3_; -#line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_photo_count = _tmp4_; -#line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _tmp5_; -#line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_video_count = _tmp6_; -#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (videos); -#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (photos); -#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (photo_count) { -#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *photo_count = _vala_photo_count; -#line 4395 "MediaDataRepresentation.c" +#line 4413 "MediaDataRepresentation.c" } -#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (video_count) { -#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *video_count = _vala_video_count; -#line 4401 "MediaDataRepresentation.c" +#line 4419 "MediaDataRepresentation.c" } } gboolean media_source_collection_has_photo (GeeCollection* media) { gboolean result = FALSE; -#line 412 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 414 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE); -#line 4410 "MediaDataRepresentation.c" +#line 4428 "MediaDataRepresentation.c" { GeeIterator* _current_media_it = NULL; GeeCollection* _tmp0_; GeeIterator* _tmp1_; -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _current_media_it = _tmp1_; -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4423 "MediaDataRepresentation.c" +#line 4441 "MediaDataRepresentation.c" GeeIterator* _tmp2_; gboolean _tmp3_; MediaSource* current_media = NULL; GeeIterator* _tmp4_; gpointer _tmp5_; MediaSource* _tmp6_; -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _current_media_it; -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = gee_iterator_next (_tmp2_); -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp3_) { -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4438 "MediaDataRepresentation.c" +#line 4456 "MediaDataRepresentation.c" } -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_media_it; -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_get (_tmp4_); -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current_media = (MediaSource*) _tmp5_; -#line 414 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 416 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = current_media; -#line 414 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 416 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO)) { -#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = TRUE; -#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4458 "MediaDataRepresentation.c" +#line 4476 "MediaDataRepresentation.c" } -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 4462 "MediaDataRepresentation.c" +#line 4480 "MediaDataRepresentation.c" } -#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 4466 "MediaDataRepresentation.c" +#line 4484 "MediaDataRepresentation.c" } -#line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 421 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; -#line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 421 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4472 "MediaDataRepresentation.c" +#line 4490 "MediaDataRepresentation.c" } gboolean media_source_collection_has_video (GeeCollection* media) { gboolean result = FALSE; -#line 422 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 424 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE); -#line 4480 "MediaDataRepresentation.c" +#line 4498 "MediaDataRepresentation.c" { GeeIterator* _current_media_it = NULL; GeeCollection* _tmp0_; GeeIterator* _tmp1_; -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _current_media_it = _tmp1_; -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4493 "MediaDataRepresentation.c" +#line 4511 "MediaDataRepresentation.c" GeeIterator* _tmp2_; gboolean _tmp3_; MediaSource* current_media = NULL; GeeIterator* _tmp4_; gpointer _tmp5_; MediaSource* _tmp6_; -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _current_media_it; -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = gee_iterator_next (_tmp2_); -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp3_) { -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4508 "MediaDataRepresentation.c" +#line 4526 "MediaDataRepresentation.c" } -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_media_it; -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_get (_tmp4_); -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current_media = (MediaSource*) _tmp5_; -#line 424 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 426 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = current_media; -#line 424 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 426 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_VIDEO)) { -#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = TRUE; -#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4528 "MediaDataRepresentation.c" +#line 4546 "MediaDataRepresentation.c" } -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 4532 "MediaDataRepresentation.c" +#line 4550 "MediaDataRepresentation.c" } -#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 4536 "MediaDataRepresentation.c" +#line 4554 "MediaDataRepresentation.c" } -#line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 431 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; -#line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 431 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4542 "MediaDataRepresentation.c" -} - - -static MediaSourceHoldingTank* media_source_collection_real_create_trashcan (MediaSourceCollection* self) { -#line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - 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 4551 "MediaDataRepresentation.c" -} - - -MediaSourceHoldingTank* media_source_collection_create_trashcan (MediaSourceCollection* self) { -#line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - 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 4560 "MediaDataRepresentation.c" } -static MediaSourceHoldingTank* media_source_collection_real_create_offline_bin (MediaSourceCollection* self) { +static MediaSourceHoldingTank* media_source_collection_real_create_trashcan (MediaSourceCollection* self) { #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_offline_bin'", g_type_name (G_TYPE_FROM_INSTANCE (self))); + g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_trashcan'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; #line 4569 "MediaDataRepresentation.c" } -MediaSourceHoldingTank* media_source_collection_create_offline_bin (MediaSourceCollection* self) { +MediaSourceHoldingTank* media_source_collection_create_trashcan (MediaSourceCollection* self) { #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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); + return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_trashcan (self); #line 4578 "MediaDataRepresentation.c" } -static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable) { +static MediaSourceHoldingTank* media_source_collection_real_create_offline_bin (MediaSourceCollection* self) { #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_media_monitor'", g_type_name (G_TYPE_FROM_INSTANCE (self))); + g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_offline_bin'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; #line 4587 "MediaDataRepresentation.c" } -MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable) { +MediaSourceHoldingTank* media_source_collection_create_offline_bin (MediaSourceCollection* self) { #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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); + return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_offline_bin (self); #line 4596 "MediaDataRepresentation.c" } -static gchar* media_source_collection_real_get_typename (MediaSourceCollection* self) { +static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable) { #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); + g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_media_monitor'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; #line 4605 "MediaDataRepresentation.c" } -gchar* media_source_collection_get_typename (MediaSourceCollection* self) { +MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable) { #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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); + return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_media_monitor (self, workers, cancellable); #line 4614 "MediaDataRepresentation.c" } +static gchar* media_source_collection_real_get_typename (MediaSourceCollection* self) { +#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); +#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + return NULL; +#line 4623 "MediaDataRepresentation.c" +} + + +gchar* media_source_collection_get_typename (MediaSourceCollection* self) { +#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); +#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_typename (self); +#line 4632 "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" +#line 442 "/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" +#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 4624 "MediaDataRepresentation.c" +#line 4642 "MediaDataRepresentation.c" } gboolean media_source_collection_is_file_recognized (MediaSourceCollection* self, GFile* file) { -#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), FALSE); -#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->is_file_recognized (self, file); -#line 4633 "MediaDataRepresentation.c" +#line 4651 "MediaDataRepresentation.c" } static gpointer _source_holding_tank_ref0 (gpointer self) { -#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? source_holding_tank_ref (self) : NULL; -#line 4640 "MediaDataRepresentation.c" +#line 4658 "MediaDataRepresentation.c" } @@ -4646,17 +4664,17 @@ MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollect MediaSourceHoldingTank* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; -#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 444 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->trashcan; -#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _source_holding_tank_ref0 (_tmp0_); -#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; -#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4658 "MediaDataRepresentation.c" +#line 4676 "MediaDataRepresentation.c" } @@ -4664,109 +4682,109 @@ MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceColl MediaSourceHoldingTank* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; -#line 446 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 448 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->offline_bin; -#line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _source_holding_tank_ref0 (_tmp0_); -#line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; -#line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4676 "MediaDataRepresentation.c" +#line 4694 "MediaDataRepresentation.c" } static MediaSource* media_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id) { -#line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4685 "MediaDataRepresentation.c" +#line 4703 "MediaDataRepresentation.c" } MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id) { -#line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_numeric_id (self, numeric_id); -#line 4694 "MediaDataRepresentation.c" +#line 4712 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_import_roll_altered (MediaSourceCollection* self) { -#line 456 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 458 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL], 0); -#line 4701 "MediaDataRepresentation.c" +#line 4719 "MediaDataRepresentation.c" } void media_source_collection_notify_import_roll_altered (MediaSourceCollection* self) { -#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 457 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 457 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_import_roll_altered (self); -#line 4710 "MediaDataRepresentation.c" +#line 4728 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_flagged_contents_altered (MediaSourceCollection* self) { -#line 460 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 462 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL], 0); -#line 4717 "MediaDataRepresentation.c" +#line 4735 "MediaDataRepresentation.c" } void media_source_collection_notify_flagged_contents_altered (MediaSourceCollection* self) { -#line 459 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 461 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 459 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 461 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_flagged_contents_altered (self); -#line 4726 "MediaDataRepresentation.c" +#line 4744 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { GeeCollection* _tmp0_; -#line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 466 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; -#line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 466 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL], 0, _tmp0_); -#line 4738 "MediaDataRepresentation.c" +#line 4756 "MediaDataRepresentation.c" } void media_source_collection_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { -#line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_starting (self, media); -#line 4747 "MediaDataRepresentation.c" +#line 4765 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { GeeCollection* _tmp0_; -#line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 470 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; -#line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 470 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL], 0, _tmp0_); -#line 4759 "MediaDataRepresentation.c" +#line 4777 "MediaDataRepresentation.c" } void media_source_collection_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { -#line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_completed (self, media); -#line 4768 "MediaDataRepresentation.c" +#line 4786 "MediaDataRepresentation.c" } @@ -4779,17 +4797,17 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge GeeArrayList* _tmp58_; gboolean _tmp62_; GeeMap* _tmp63_; -#line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); -#line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 472 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 474 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_trashcan = NULL; -#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_offline = NULL; -#line 474 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = FALSE; -#line 4791 "MediaDataRepresentation.c" +#line 4809 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; GeeMap* _tmp0_; @@ -4798,25 +4816,25 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge GeeSet* _tmp3_; GeeIterator* _tmp4_; GeeIterator* _tmp5_; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = items; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_map_get_keys (_tmp0_); -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp4_; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp3_); -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _object_it = _tmp5_; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4818 "MediaDataRepresentation.c" +#line 4836 "MediaDataRepresentation.c" GeeIterator* _tmp6_; gboolean _tmp7_; DataObject* object = NULL; @@ -4841,327 +4859,327 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge MediaSource* _tmp39_; Flaggable* _tmp40_; Flaggable* _tmp41_; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _object_it; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp7_) { -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4851 "MediaDataRepresentation.c" +#line 4869 "MediaDataRepresentation.c" } -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _object_it; -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" object = (DataObject*) _tmp9_; -#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = items; -#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = object; -#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = gee_map_get (_tmp10_, _tmp11_); -#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" alteration = (Alteration*) _tmp12_; -#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = object; -#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - source = _tmp14_; #line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + source = _tmp14_; +#line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = alteration; -#line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = alteration_has_subject (_tmp15_, "metadata"); -#line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp16_) { -#line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (alteration); -#line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 4887 "MediaDataRepresentation.c" +#line 4905 "MediaDataRepresentation.c" } -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = source; -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = media_source_is_trashed (_tmp18_); -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp19_) { -#line 4895 "MediaDataRepresentation.c" +#line 4913 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp20_; MediaSourceHoldingTank* _tmp21_; MediaSource* _tmp22_; gboolean _tmp23_; -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = media_source_collection_get_trashcan (self); -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = _tmp20_; -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = source; -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = source_holding_tank_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource)); -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = !_tmp23_; -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp21_); -#line 4912 "MediaDataRepresentation.c" +#line 4930 "MediaDataRepresentation.c" } else { -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = FALSE; -#line 4916 "MediaDataRepresentation.c" +#line 4934 "MediaDataRepresentation.c" } -#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_) { -#line 4920 "MediaDataRepresentation.c" +#line 4938 "MediaDataRepresentation.c" GeeArrayList* _tmp24_; GeeArrayList* _tmp26_; MediaSource* _tmp27_; -#line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 485 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = to_trashcan; -#line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 485 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_ == NULL) { -#line 4928 "MediaDataRepresentation.c" +#line 4946 "MediaDataRepresentation.c" GeeArrayList* _tmp25_; -#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_trashcan); -#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_trashcan = _tmp25_; -#line 4936 "MediaDataRepresentation.c" +#line 4954 "MediaDataRepresentation.c" } -#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = to_trashcan; -#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = source; -#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); -#line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (alteration); -#line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 4952 "MediaDataRepresentation.c" +#line 4970 "MediaDataRepresentation.c" } -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = source; -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp30_ = media_source_is_offline (_tmp29_); -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp30_) { -#line 4960 "MediaDataRepresentation.c" +#line 4978 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp31_; MediaSourceHoldingTank* _tmp32_; MediaSource* _tmp33_; gboolean _tmp34_; -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = media_source_collection_get_offline_bin (self); -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp32_ = _tmp31_; -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = source; -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34_ = source_holding_tank_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_SOURCE, DataSource)); -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = !_tmp34_; -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp32_); -#line 4977 "MediaDataRepresentation.c" +#line 4995 "MediaDataRepresentation.c" } else { -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = FALSE; -#line 4981 "MediaDataRepresentation.c" +#line 4999 "MediaDataRepresentation.c" } -#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp28_) { -#line 4985 "MediaDataRepresentation.c" +#line 5003 "MediaDataRepresentation.c" GeeArrayList* _tmp35_; GeeArrayList* _tmp37_; MediaSource* _tmp38_; -#line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 495 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp35_ = to_offline; -#line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 495 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp35_ == NULL) { -#line 4993 "MediaDataRepresentation.c" +#line 5011 "MediaDataRepresentation.c" GeeArrayList* _tmp36_; -#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_offline); -#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_offline = _tmp36_; -#line 5001 "MediaDataRepresentation.c" +#line 5019 "MediaDataRepresentation.c" } -#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = to_offline; -#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp38_ = source; -#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_); -#line 5009 "MediaDataRepresentation.c" +#line 5027 "MediaDataRepresentation.c" } -#line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = source; -#line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp39_) : NULL); -#line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flaggable = _tmp40_; -#line 500 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp41_ = flaggable; -#line 500 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp41_ != NULL) { -#line 5021 "MediaDataRepresentation.c" +#line 5039 "MediaDataRepresentation.c" Flaggable* _tmp42_; gboolean _tmp43_; -#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp42_ = flaggable; -#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp43_ = flaggable_is_flagged (_tmp42_); -#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp43_) { -#line 5030 "MediaDataRepresentation.c" +#line 5048 "MediaDataRepresentation.c" gboolean _tmp44_ = FALSE; GeeSet* _tmp45_; MediaSource* _tmp46_; gboolean _tmp47_; -#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp45_ = self->priv->flagged; -#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp46_ = source; -#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp47_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection), _tmp46_); -#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp47_) { -#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = TRUE; -#line 5045 "MediaDataRepresentation.c" +#line 5063 "MediaDataRepresentation.c" } else { gboolean _tmp48_; -#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp48_ = flagged_altered; -#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = _tmp48_; -#line 5052 "MediaDataRepresentation.c" +#line 5070 "MediaDataRepresentation.c" } -#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp44_; -#line 5056 "MediaDataRepresentation.c" +#line 5074 "MediaDataRepresentation.c" } else { gboolean _tmp49_ = FALSE; GeeSet* _tmp50_; MediaSource* _tmp51_; gboolean _tmp52_; -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp50_ = self->priv->flagged; -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp51_ = source; -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp52_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_); -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp52_) { -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp49_ = TRUE; -#line 5072 "MediaDataRepresentation.c" +#line 5090 "MediaDataRepresentation.c" } else { gboolean _tmp53_; -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp53_ = flagged_altered; -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp49_ = _tmp53_; -#line 5079 "MediaDataRepresentation.c" +#line 5097 "MediaDataRepresentation.c" } -#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp49_; -#line 5083 "MediaDataRepresentation.c" +#line 5101 "MediaDataRepresentation.c" } } -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (flaggable); -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (alteration); -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5094 "MediaDataRepresentation.c" +#line 5112 "MediaDataRepresentation.c" } -#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5098 "MediaDataRepresentation.c" +#line 5116 "MediaDataRepresentation.c" } -#line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 510 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp54_ = to_trashcan; -#line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 510 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp54_ != NULL) { -#line 5104 "MediaDataRepresentation.c" +#line 5122 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp55_; MediaSourceHoldingTank* _tmp56_; GeeArrayList* _tmp57_; -#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp55_ = media_source_collection_get_trashcan (self); -#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp56_ = _tmp55_; -#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp57_ = to_trashcan; -#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp56_); -#line 5118 "MediaDataRepresentation.c" +#line 5136 "MediaDataRepresentation.c" } -#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 513 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp58_ = to_offline; -#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 513 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp58_ != NULL) { -#line 5124 "MediaDataRepresentation.c" +#line 5142 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp59_; MediaSourceHoldingTank* _tmp60_; GeeArrayList* _tmp61_; -#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp59_ = media_source_collection_get_offline_bin (self); -#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp60_ = _tmp59_; -#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp61_ = to_offline; -#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp60_); -#line 5138 "MediaDataRepresentation.c" +#line 5156 "MediaDataRepresentation.c" } -#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 516 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp62_ = flagged_altered; -#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 516 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp62_) { -#line 515 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_flagged_contents_altered (self); -#line 5146 "MediaDataRepresentation.c" +#line 5164 "MediaDataRepresentation.c" } -#line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 519 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp63_ = items; -#line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 519 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_COLLECTION_CLASS (media_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp63_); -#line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_offline); -#line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_trashcan); -#line 5156 "MediaDataRepresentation.c" +#line 5174 "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" +#line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_on_master_replaced ((MediaSourceCollection*) self, _sender, old_file, new_file); -#line 5163 "MediaDataRepresentation.c" +#line 5181 "MediaDataRepresentation.c" } @@ -5175,34 +5193,34 @@ static void media_source_collection_real_notify_contents_altered (DataCollection gboolean _tmp75_; GeeIterable* _tmp76_; GeeIterable* _tmp77_; -#line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 522 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); -#line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 522 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added)); -#line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 522 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); +#line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = FALSE; -#line 523 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = FALSE; -#line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = added; -#line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 5191 "MediaDataRepresentation.c" +#line 5209 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp1_; GeeIterator* _tmp2_; -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = added; -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _object_it = _tmp2_; -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 5204 "MediaDataRepresentation.c" +#line 5222 "MediaDataRepresentation.c" GeeIterator* _tmp3_; gboolean _tmp4_; DataObject* object = NULL; @@ -5225,186 +5243,186 @@ static void media_source_collection_real_notify_contents_altered (DataCollection MediaSource* _tmp23_; Flaggable* _tmp24_; Flaggable* _tmp25_; -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _object_it; -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp4_) { -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 5235 "MediaDataRepresentation.c" +#line 5253 "MediaDataRepresentation.c" } -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _object_it; -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" object = (DataObject*) _tmp6_; -#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = object; -#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media = _tmp8_; #line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + media = _tmp8_; +#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = self->priv->by_master_file; -#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = media; -#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = media_source_get_master_file (_tmp10_); -#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = _tmp11_; -#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = media; -#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp13_); -#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp12_); -#line 529 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = media; -#line 529 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_connect (_tmp14_, "master-replaced", (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self); #line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_signal_connect (_tmp14_, "master-replaced", (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self); +#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = media; -#line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_get_import_id (_tmp15_, &_tmp16_); -#line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_id = _tmp16_; -#line 532 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = import_id_is_valid (&import_id); -#line 532 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_) { -#line 5277 "MediaDataRepresentation.c" +#line 5295 "MediaDataRepresentation.c" GeeTreeSet* _tmp18_; ImportID _tmp19_; GeeMultiMap* _tmp20_; ImportID _tmp21_; MediaSource* _tmp22_; -#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = self->priv->sorted_import_ids; -#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = import_id; -#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp19_); -#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = self->priv->import_rolls; -#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = import_id; -#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = media; -#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_multi_map_set (_tmp20_, &_tmp21_, _tmp22_); #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + gee_multi_map_set (_tmp20_, &_tmp21_, _tmp22_); +#line 538 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = TRUE; -#line 5299 "MediaDataRepresentation.c" +#line 5317 "MediaDataRepresentation.c" } -#line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = media; -#line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp23_) : NULL); -#line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flaggable = _tmp24_; -#line 540 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = flaggable; -#line 540 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp25_ != NULL) { -#line 5311 "MediaDataRepresentation.c" +#line 5329 "MediaDataRepresentation.c" Flaggable* _tmp26_; gboolean _tmp27_; -#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = flaggable; -#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = flaggable_is_flagged (_tmp26_); -#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp27_) { -#line 5320 "MediaDataRepresentation.c" +#line 5338 "MediaDataRepresentation.c" gboolean _tmp28_ = FALSE; GeeSet* _tmp29_; MediaSource* _tmp30_; gboolean _tmp31_; -#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = self->priv->flagged; -#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp30_ = media; -#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_); -#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp31_) { -#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = TRUE; -#line 5335 "MediaDataRepresentation.c" +#line 5353 "MediaDataRepresentation.c" } else { gboolean _tmp32_; -#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp32_ = flagged_altered; -#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = _tmp32_; -#line 5342 "MediaDataRepresentation.c" +#line 5360 "MediaDataRepresentation.c" } -#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp28_; -#line 5346 "MediaDataRepresentation.c" +#line 5364 "MediaDataRepresentation.c" } else { gboolean _tmp33_ = FALSE; GeeSet* _tmp34_; MediaSource* _tmp35_; gboolean _tmp36_; -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34_ = self->priv->flagged; -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp35_ = media; -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp36_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp35_); -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp36_) { -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = TRUE; -#line 5362 "MediaDataRepresentation.c" +#line 5380 "MediaDataRepresentation.c" } else { gboolean _tmp37_; -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = flagged_altered; -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = _tmp37_; -#line 5369 "MediaDataRepresentation.c" +#line 5387 "MediaDataRepresentation.c" } -#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp33_; -#line 5373 "MediaDataRepresentation.c" +#line 5391 "MediaDataRepresentation.c" } } -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (flaggable); -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5382 "MediaDataRepresentation.c" +#line 5400 "MediaDataRepresentation.c" } -#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5386 "MediaDataRepresentation.c" +#line 5404 "MediaDataRepresentation.c" } } -#line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp38_ = removed; -#line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp38_ != NULL) { -#line 5393 "MediaDataRepresentation.c" +#line 5411 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp39_; GeeIterator* _tmp40_; -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = removed; -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp40_ = gee_iterable_iterator (_tmp39_); -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _object_it = _tmp40_; -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 5406 "MediaDataRepresentation.c" +#line 5424 "MediaDataRepresentation.c" GeeIterator* _tmp41_; gboolean _tmp42_; DataObject* object = NULL; @@ -5431,65 +5449,65 @@ static void media_source_collection_real_notify_contents_altered (DataCollection GeeSet* _tmp70_; MediaSource* _tmp71_; gboolean _tmp72_; -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp41_ = _object_it; -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp42_ = gee_iterator_next (_tmp41_); -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp42_) { -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 5441 "MediaDataRepresentation.c" +#line 5459 "MediaDataRepresentation.c" } -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp43_ = _object_it; -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = gee_iterator_get (_tmp43_); -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" object = (DataObject*) _tmp44_; -#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp45_ = object; -#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media = _tmp46_; #line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + media = _tmp46_; +#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp47_ = self->priv->by_master_file; -#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp48_ = media; -#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp49_ = media_source_get_master_file (_tmp48_); -#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp50_ = _tmp49_; -#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp51_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp50_, NULL); -#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp52_ = _tmp51_; -#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp50_); -#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" is_removed = _tmp52_; -#line 554 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 556 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp53_ = is_removed; -#line 554 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 556 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (_tmp53_, "is_removed"); -#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp54_ = media; -#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp55_, NULL, FALSE); -#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_handlers_disconnect_matched (_tmp54_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp55_, 0, NULL, (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self); #line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_signal_handlers_disconnect_matched (_tmp54_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp55_, 0, NULL, (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self); +#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp56_ = media; -#line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_get_import_id (_tmp56_, &_tmp57_); -#line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_id = _tmp57_; -#line 558 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp58_ = import_id_is_valid (&import_id); -#line 558 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp58_) { -#line 5491 "MediaDataRepresentation.c" +#line 5509 "MediaDataRepresentation.c" GeeMultiMap* _tmp59_; ImportID _tmp60_; MediaSource* _tmp61_; @@ -5498,98 +5516,98 @@ static void media_source_collection_real_notify_contents_altered (DataCollection GeeMultiMap* _tmp64_; ImportID _tmp65_; gboolean _tmp66_; -#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp59_ = self->priv->import_rolls; -#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp60_ = import_id; -#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp61_ = media; -#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp62_ = gee_multi_map_remove (_tmp59_, &_tmp60_, _tmp61_); -#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" is_removed = _tmp62_; -#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp63_ = is_removed; -#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (_tmp63_, "is_removed"); -#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp64_ = self->priv->import_rolls; -#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp65_ = import_id; -#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp66_ = gee_multi_map_contains (_tmp64_, &_tmp65_); -#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp66_) { -#line 5522 "MediaDataRepresentation.c" +#line 5540 "MediaDataRepresentation.c" GeeTreeSet* _tmp67_; ImportID _tmp68_; -#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp67_ = self->priv->sorted_import_ids; -#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp68_ = import_id; -#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp68_); -#line 5531 "MediaDataRepresentation.c" +#line 5549 "MediaDataRepresentation.c" } -#line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 566 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = TRUE; -#line 5535 "MediaDataRepresentation.c" +#line 5553 "MediaDataRepresentation.c" } -#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp70_ = self->priv->flagged; -#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp71_ = media; -#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp72_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp71_); -#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp72_) { -#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp69_ = TRUE; -#line 5547 "MediaDataRepresentation.c" +#line 5565 "MediaDataRepresentation.c" } else { gboolean _tmp73_; -#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp73_ = flagged_altered; -#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp69_ = _tmp73_; -#line 5554 "MediaDataRepresentation.c" +#line 5572 "MediaDataRepresentation.c" } -#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp69_; -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5562 "MediaDataRepresentation.c" +#line 5580 "MediaDataRepresentation.c" } -#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5566 "MediaDataRepresentation.c" +#line 5584 "MediaDataRepresentation.c" } } -#line 571 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 573 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp74_ = import_roll_changed; -#line 571 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 573 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp74_) { -#line 572 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_import_roll_altered (self); -#line 5575 "MediaDataRepresentation.c" +#line 5593 "MediaDataRepresentation.c" } -#line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 576 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp75_ = flagged_altered; -#line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 576 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp75_) { -#line 575 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_flagged_contents_altered (self); -#line 5583 "MediaDataRepresentation.c" +#line 5601 "MediaDataRepresentation.c" } -#line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 579 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp76_ = added; -#line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 579 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp77_ = removed; -#line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 579 "/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 5591 "MediaDataRepresentation.c" +#line 5609 "MediaDataRepresentation.c" } @@ -5604,41 +5622,41 @@ static void media_source_collection_on_master_replaced (MediaSourceCollection* s MediaSource* _tmp6_; GFile* _tmp7_; GFile* _tmp8_; -#line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (media)); -#line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (old_file)); -#line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 581 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->by_master_file; -#line 581 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = old_file; -#line 581 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); -#line 581 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" is_removed = _tmp2_; -#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (is_removed, "is_removed"); #line 584 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _vala_assert (is_removed, "is_removed"); +#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = self->priv->by_master_file; -#line 584 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = new_file; -#line 584 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = media; -#line 584 "/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 586 "/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 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = media; -#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = old_file; -#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = new_file; -#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL], 0, _tmp6_, _tmp7_, _tmp8_); -#line 5640 "MediaDataRepresentation.c" +#line 5658 "MediaDataRepresentation.c" } @@ -5647,21 +5665,21 @@ MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection GeeHashMap* _tmp0_; GFile* _tmp1_; gpointer _tmp2_; -#line 589 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 591 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 589 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 591 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->by_master_file; -#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = file; -#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = (MediaSource*) _tmp2_; -#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5663 "MediaDataRepresentation.c" +#line 5681 "MediaDataRepresentation.c" } @@ -5676,60 +5694,60 @@ static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSource const gchar* _tmp3_; gint64 _tmp4_; MediaSource* _tmp5_; -#line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (source_id != NULL, NULL); -#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = source_id; -#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_ = g_strsplit (_tmp0_, "-", 0); -#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components = _tmp2_; -#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components_length1 = _vala_array_length (_tmp1_); -#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _components_size_ = components_length1; -#line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (components_length1 == 2, "components.length == 2"); #line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _vala_assert (components_length1 == 2, "components.length == 2"); +#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = components[1]; -#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = parse_int64 (_tmp3_, 16); -#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = media_source_collection_fetch_by_numeric_id (self, _tmp4_); -#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp5_; -#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); -#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5704 "MediaDataRepresentation.c" +#line 5722 "MediaDataRepresentation.c" } MediaSource* media_source_collection_fetch_by_source_id (MediaSourceCollection* self, const gchar* source_id) { -#line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_source_id (self, source_id); -#line 5713 "MediaDataRepresentation.c" +#line 5731 "MediaDataRepresentation.c" } static GeeCollection* media_source_collection_real_get_event_source_ids (MediaSourceCollection* self, EventID* event_id) { -#line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 5722 "MediaDataRepresentation.c" +#line 5740 "MediaDataRepresentation.c" } GeeCollection* media_source_collection_get_event_source_ids (MediaSourceCollection* self, EventID* event_id) { -#line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_event_source_ids (self, event_id); -#line 5731 "MediaDataRepresentation.c" +#line 5749 "MediaDataRepresentation.c" } @@ -5739,23 +5757,23 @@ GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollect MediaSourceHoldingTank* _tmp1_; GeeCollection* _tmp2_; GeeCollection* _tmp3_; -#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 604 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_collection_get_trashcan (self); -#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = source_holding_tank_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); -#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp3_; -#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5757 "MediaDataRepresentation.c" +#line 5775 "MediaDataRepresentation.c" } @@ -5765,23 +5783,23 @@ GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceColl MediaSourceHoldingTank* _tmp1_; GeeCollection* _tmp2_; GeeCollection* _tmp3_; -#line 606 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 608 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_collection_get_offline_bin (self); -#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = source_holding_tank_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); -#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp3_; -#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5783 "MediaDataRepresentation.c" +#line 5801 "MediaDataRepresentation.c" } @@ -5790,19 +5808,19 @@ GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self) GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; -#line 610 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 612 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->flagged; -#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_set_get_read_only_view (_tmp0_); -#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5804 "MediaDataRepresentation.c" +#line 5822 "MediaDataRepresentation.c" } @@ -5810,17 +5828,17 @@ GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection GeeSortedSet* result = NULL; GeeTreeSet* _tmp0_; GeeSortedSet* _tmp1_; -#line 615 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 617 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->sorted_import_ids; -#line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SORTED_SET, GeeSortedSet)); -#line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; -#line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5822 "MediaDataRepresentation.c" +#line 5840 "MediaDataRepresentation.c" } @@ -5830,40 +5848,40 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel GeeTreeSet* _tmp1_; gint _tmp2_; gint _tmp3_; -#line 619 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 621 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = self->priv->sorted_import_ids; -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp3_ != 0) { -#line 5842 "MediaDataRepresentation.c" +#line 5860 "MediaDataRepresentation.c" GeeTreeSet* _tmp4_; gpointer _tmp5_; -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = self->priv->sorted_import_ids; -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_abstract_sorted_set_last (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_SORTED_SET, GeeAbstractSortedSet)); -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (_tmp0_); -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = (ImportID*) _tmp5_; -#line 5853 "MediaDataRepresentation.c" +#line 5871 "MediaDataRepresentation.c" } else { -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (_tmp0_); -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = NULL; -#line 5859 "MediaDataRepresentation.c" +#line 5877 "MediaDataRepresentation.c" } -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp0_; -#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5865 "MediaDataRepresentation.c" +#line 5883 "MediaDataRepresentation.c" } @@ -5872,21 +5890,21 @@ GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* s GeeMultiMap* _tmp0_; ImportID _tmp1_; GeeCollection* _tmp2_; -#line 623 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 625 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 623 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 625 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (import_id != NULL, NULL); -#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->import_rolls; -#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = *import_id; -#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_); -#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp2_; -#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5888 "MediaDataRepresentation.c" +#line 5906 "MediaDataRepresentation.c" } @@ -5894,21 +5912,21 @@ void media_source_collection_add_many_to_trash (MediaSourceCollection* self, Gee MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; GeeCollection* _tmp2_; -#line 627 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 629 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 627 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 629 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_collection_get_trashcan (self); -#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = sources; -#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 5910 "MediaDataRepresentation.c" +#line 5928 "MediaDataRepresentation.c" } @@ -5916,21 +5934,21 @@ void media_source_collection_add_many_to_offline (MediaSourceCollection* self, G MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; GeeCollection* _tmp2_; -#line 631 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 633 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 631 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 633 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_collection_get_offline_bin (self); -#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = sources; -#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 5932 "MediaDataRepresentation.c" +#line 5950 "MediaDataRepresentation.c" } @@ -5940,23 +5958,23 @@ gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) { MediaSourceHoldingTank* _tmp1_; gint _tmp2_; gint _tmp3_; -#line 635 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 637 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), 0); -#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_collection_get_trashcan (self); -#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = source_holding_tank_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); -#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp3_; -#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5958 "MediaDataRepresentation.c" +#line 5976 "MediaDataRepresentation.c" } @@ -5967,63 +5985,63 @@ static void media_source_collection_real_import_many (MediaSourceCollection* sel GeeCollection* _tmp3_; GeeCollection* _tmp4_; GeeCollection* _tmp5_; -#line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 643 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; -#line 643 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_collection_notify_media_import_starting (self, _tmp0_); #line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + media_source_collection_notify_media_import_starting (self, _tmp0_); +#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = media; -#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, NULL, NULL); -#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (_tmp3_); #line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_object_unref0 (_tmp3_); +#line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = media; -#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - media_source_collection_postprocess_imported_media (self, _tmp4_); #line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + media_source_collection_postprocess_imported_media (self, _tmp4_); +#line 651 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = media; -#line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 651 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_media_import_completed (self, _tmp5_); -#line 5991 "MediaDataRepresentation.c" +#line 6009 "MediaDataRepresentation.c" } void media_source_collection_import_many (MediaSourceCollection* self, GeeCollection* media) { -#line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->import_many (self, media); -#line 6000 "MediaDataRepresentation.c" +#line 6018 "MediaDataRepresentation.c" } static void media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) { -#line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6007 "MediaDataRepresentation.c" +#line 6025 "MediaDataRepresentation.c" } void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) { -#line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->postprocess_imported_media (self, media); -#line 6016 "MediaDataRepresentation.c" +#line 6034 "MediaDataRepresentation.c" } static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { gboolean result; result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total); -#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 6025 "MediaDataRepresentation.c" +#line 6043 "MediaDataRepresentation.c" } @@ -6068,66 +6086,66 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo gboolean _tmp72_ = FALSE; GeeHashSet* _tmp73_; GError * _inner_error_ = NULL; -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((sources == NULL) || GEE_IS_COLLECTION (sources)); -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_return_if_fail ((not_removed == NULL) || GEE_IS_LIST (not_removed)); #line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_if_fail ((not_removed == NULL) || GEE_IS_LIST (not_removed)); +#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = sources; -#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _vala_assert (_tmp0_ != NULL, "sources != null"); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _vala_assert (_tmp0_ != NULL, "sources != null"); +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = delete_backing; -#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp2_) { -#line 6084 "MediaDataRepresentation.c" +#line 6102 "MediaDataRepresentation.c" GeeHashSet* _tmp3_; -#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp3_; -#line 6092 "MediaDataRepresentation.c" +#line 6110 "MediaDataRepresentation.c" } else { -#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = NULL; -#line 6098 "MediaDataRepresentation.c" +#line 6116 "MediaDataRepresentation.c" } -#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _g_object_ref0 (_tmp1_); -#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_tombstone = _tmp4_; -#line 667 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" trashed = _tmp5_; -#line 668 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" offlined = _tmp6_; -#line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" not_trashed = _tmp7_; -#line 6116 "MediaDataRepresentation.c" +#line 6134 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp8_; GeeIterator* _tmp9_; -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_it = _tmp9_; -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 6129 "MediaDataRepresentation.c" +#line 6147 "MediaDataRepresentation.c" GeeIterator* _tmp10_; gboolean _tmp11_; MediaSource* source = NULL; @@ -6136,165 +6154,165 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo MediaSource* _tmp14_; gboolean _tmp15_; GeeHashSet* _tmp24_; -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = _source_it; -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = gee_iterator_next (_tmp10_); -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp11_) { -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 6146 "MediaDataRepresentation.c" +#line 6164 "MediaDataRepresentation.c" } -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = _source_it; -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = gee_iterator_get (_tmp12_); -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" source = (MediaSource*) _tmp13_; -#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = source; -#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = media_source_is_trashed (_tmp14_); -#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp15_) { -#line 6160 "MediaDataRepresentation.c" +#line 6178 "MediaDataRepresentation.c" GeeArrayList* _tmp16_; MediaSource* _tmp17_; -#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = trashed; -#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = source; -#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 6169 "MediaDataRepresentation.c" +#line 6187 "MediaDataRepresentation.c" } else { MediaSource* _tmp18_; gboolean _tmp19_; -#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = source; -#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = media_source_is_offline (_tmp18_); -#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp19_) { -#line 6179 "MediaDataRepresentation.c" +#line 6197 "MediaDataRepresentation.c" GeeArrayList* _tmp20_; MediaSource* _tmp21_; -#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = offlined; -#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = source; -#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 6188 "MediaDataRepresentation.c" +#line 6206 "MediaDataRepresentation.c" } else { GeeArrayList* _tmp22_; MediaSource* _tmp23_; -#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = not_trashed; -#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = source; -#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); -#line 6198 "MediaDataRepresentation.c" +#line 6216 "MediaDataRepresentation.c" } } -#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 680 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = to_tombstone; -#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 680 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_ != NULL) { -#line 6205 "MediaDataRepresentation.c" +#line 6223 "MediaDataRepresentation.c" GeeHashSet* _tmp25_; MediaSource* _tmp26_; -#line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = to_tombstone; -#line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = source; -#line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); -#line 6214 "MediaDataRepresentation.c" +#line 6232 "MediaDataRepresentation.c" } -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 6218 "MediaDataRepresentation.c" +#line 6236 "MediaDataRepresentation.c" } -#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 6222 "MediaDataRepresentation.c" +#line 6240 "MediaDataRepresentation.c" } -#line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = sources; -#line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = gee_collection_get_size (_tmp27_); -#line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = _tmp28_; -#line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" total_count = _tmp29_; -#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp30_ = total_count; -#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = trashed; -#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = _tmp32_; -#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34_ = offlined; -#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp36_ = _tmp35_; -#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = not_trashed; -#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = _tmp38_; -#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (_tmp30_ == ((_tmp33_ + _tmp36_) + _tmp39_), "total_count == (trashed.size + offlined.size + not_trashed.size)"); -#line 686 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" agg_monitor = NULL; -#line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp40_ = monitor; -#line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp40__target = monitor_target; -#line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp40_ != NULL) { -#line 6262 "MediaDataRepresentation.c" +#line 6280 "MediaDataRepresentation.c" gint _tmp41_; ProgressMonitor _tmp42_; void* _tmp42__target; AggregateProgressMonitor* _tmp43_; AggregateProgressMonitor* _tmp44_; -#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp41_ = total_count; -#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp42_ = monitor; -#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp42__target = monitor_target; -#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp43_ = aggregate_progress_monitor_new ((guint64) _tmp41_, _tmp42_, _tmp42__target); -#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _aggregate_progress_monitor_unref0 (agg_monitor); -#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" agg_monitor = _tmp43_; -#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = agg_monitor; -#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" monitor = _aggregate_progress_monitor_monitor_progress_monitor; -#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" monitor_target = _tmp44_; -#line 6286 "MediaDataRepresentation.c" +#line 6304 "MediaDataRepresentation.c" } -#line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp45_ = trashed; -#line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp47_ = _tmp46_; -#line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp47_ > 0) { -#line 6296 "MediaDataRepresentation.c" +#line 6314 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp48_; MediaSourceHoldingTank* _tmp49_; GeeArrayList* _tmp50_; @@ -6302,35 +6320,35 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo ProgressMonitor _tmp52_; void* _tmp52__target; GeeList* _tmp53_; -#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp48_ = media_source_collection_get_trashcan (self); -#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp49_ = _tmp48_; -#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp50_ = trashed; -#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp51_ = delete_backing; -#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp52_ = monitor; -#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp52__target = monitor_target; -#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp53_ = not_removed; -#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp49_); -#line 6322 "MediaDataRepresentation.c" +#line 6340 "MediaDataRepresentation.c" } -#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp54_ = offlined; -#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp56_ = _tmp55_; -#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp56_ > 0) { -#line 6332 "MediaDataRepresentation.c" +#line 6350 "MediaDataRepresentation.c" MediaSourceHoldingTank* _tmp57_; MediaSourceHoldingTank* _tmp58_; GeeArrayList* _tmp59_; @@ -6338,35 +6356,35 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo ProgressMonitor _tmp61_; void* _tmp61__target; GeeList* _tmp62_; -#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp57_ = media_source_collection_get_offline_bin (self); -#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp58_ = _tmp57_; -#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp59_ = offlined; -#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp60_ = delete_backing; -#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp61_ = monitor; -#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp61__target = monitor_target; -#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp62_ = not_removed; -#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp58_); -#line 6358 "MediaDataRepresentation.c" +#line 6376 "MediaDataRepresentation.c" } -#line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp63_ = not_trashed; -#line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp65_ = _tmp64_; -#line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp65_ > 0) { -#line 6368 "MediaDataRepresentation.c" +#line 6386 "MediaDataRepresentation.c" GeeArrayList* _tmp66_; Marker* _tmp67_; Marker* _tmp68_; @@ -6374,139 +6392,139 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo ProgressMonitor _tmp70_; void* _tmp70__target; GeeList* _tmp71_; -#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp66_ = not_trashed; -#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp67_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp68_ = _tmp67_; -#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp69_ = delete_backing; -#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp70_ = monitor; -#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp70__target = monitor_target; -#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp71_ = not_removed; -#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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" +#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp68_); -#line 6394 "MediaDataRepresentation.c" +#line 6412 "MediaDataRepresentation.c" } -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp73_ = to_tombstone; -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp73_ != NULL) { -#line 6400 "MediaDataRepresentation.c" +#line 6418 "MediaDataRepresentation.c" GeeHashSet* _tmp74_; gint _tmp75_; gint _tmp76_; -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp74_ = to_tombstone; -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp76_ = _tmp75_; -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp72_ = _tmp76_ > 0; -#line 6412 "MediaDataRepresentation.c" +#line 6430 "MediaDataRepresentation.c" } else { -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp72_ = FALSE; -#line 6416 "MediaDataRepresentation.c" +#line 6434 "MediaDataRepresentation.c" } -#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp72_) { -#line 6420 "MediaDataRepresentation.c" +#line 6438 "MediaDataRepresentation.c" { GeeHashSet* _tmp77_; -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp77_ = to_tombstone; -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" tombstone_entomb_many_sources (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection), TOMBSTONE_REASON_REMOVED_BY_USER, &_inner_error_); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6431 "MediaDataRepresentation.c" - goto __catch565_database_error; +#line 6449 "MediaDataRepresentation.c" + goto __catch574_database_error; } -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _aggregate_progress_monitor_unref0 (agg_monitor); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (not_trashed); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (offlined); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (trashed); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_tombstone); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); -#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6452 "MediaDataRepresentation.c" +#line 6470 "MediaDataRepresentation.c" } } - goto __finally565; - __catch565_database_error: + goto __finally574; + __catch574_database_error: { GError* err = NULL; GError* _tmp78_; -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; -#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 708 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp78_ = err; -#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 708 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" app_window_database_error (_tmp78_); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6470 "MediaDataRepresentation.c" +#line 6488 "MediaDataRepresentation.c" } - __finally565: -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + __finally574: +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _aggregate_progress_monitor_unref0 (agg_monitor); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (not_trashed); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (offlined); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (trashed); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_tombstone); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); -#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6493 "MediaDataRepresentation.c" +#line 6511 "MediaDataRepresentation.c" } } -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _aggregate_progress_monitor_unref0 (agg_monitor); -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (not_trashed); -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (offlined); -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (trashed); -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_tombstone); -#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 6508 "MediaDataRepresentation.c" +#line 6526 "MediaDataRepresentation.c" } @@ -6517,36 +6535,36 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, gint _tmp2_; gint i = 0; GError * _inner_error_ = NULL; -#line 713 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); -#line 713 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 713 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_return_if_fail ((not_deleted == NULL) || GEE_IS_LIST (not_deleted)); #line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_if_fail ((not_deleted == NULL) || GEE_IS_LIST (not_deleted)); +#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = sources; -#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_collection_get_size (_tmp0_); -#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" total_count = _tmp2_; -#line 716 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" i = 1; -#line 6535 "MediaDataRepresentation.c" +#line 6553 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp3_; GeeIterator* _tmp4_; -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = sources; -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_it = _tmp4_; -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 6548 "MediaDataRepresentation.c" +#line 6566 "MediaDataRepresentation.c" GeeIterator* _tmp5_; gboolean _tmp6_; MediaSource* source = NULL; @@ -6567,43 +6585,43 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, ProgressMonitor _tmp34_; void* _tmp34__target; gint _tmp38_; -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _source_it; -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = gee_iterator_next (_tmp5_); -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp6_) { -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 6577 "MediaDataRepresentation.c" +#line 6595 "MediaDataRepresentation.c" } -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _source_it; -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = gee_iterator_get (_tmp7_); -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" source = (MediaSource*) _tmp8_; -#line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = source; -#line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = media_source_get_file (_tmp9_); -#line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" file = _tmp10_; -#line 6591 "MediaDataRepresentation.c" +#line 6609 "MediaDataRepresentation.c" { GFile* _tmp11_; -#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = file; -#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_file_delete (_tmp11_, NULL, &_inner_error_); -#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6600 "MediaDataRepresentation.c" - goto __catch566_g_error; +#line 6618 "MediaDataRepresentation.c" + goto __catch575_g_error; } } - goto __finally566; - __catch566_g_error: + goto __finally575; + __catch575_g_error: { GError* err = NULL; GFile* _tmp12_; @@ -6611,236 +6629,236 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, gchar* _tmp14_; GError* _tmp15_; const gchar* _tmp16_; -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; -#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = file; -#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = g_file_get_path (_tmp12_); -#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = _tmp13_; -#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = err; -#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = _tmp15_->message; -#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_debug ("MediaDataRepresentation.vala:724: Exception deleting file %s: %s", _tmp14_, _tmp16_); -#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_debug ("MediaDataRepresentation.vala:726: Exception deleting file %s: %s", _tmp14_, _tmp16_); +#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp14_); -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6633 "MediaDataRepresentation.c" +#line 6651 "MediaDataRepresentation.c" } - __finally566: -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + __finally575: +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); -#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6650 "MediaDataRepresentation.c" +#line 6668 "MediaDataRepresentation.c" } -#line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = source; -#line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = media_source_get_master_file (_tmp17_); -#line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" masterfile = _tmp18_; -#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = masterfile; -#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp19_ != NULL) { -#line 6662 "MediaDataRepresentation.c" +#line 6680 "MediaDataRepresentation.c" { GFile* _tmp20_; -#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = masterfile; -#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_file_delete (_tmp20_, NULL, &_inner_error_); -#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6671 "MediaDataRepresentation.c" - goto __catch567_g_error; +#line 6689 "MediaDataRepresentation.c" + goto __catch576_g_error; } } - goto __finally567; - __catch567_g_error: + goto __finally576; + __catch576_g_error: { GError* err = NULL; GError* _tmp21_; -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _inner_error_ = NULL; -#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 734 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = err; -#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 734 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!g_error_matches (_tmp21_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { -#line 6688 "MediaDataRepresentation.c" +#line 6706 "MediaDataRepresentation.c" GFile* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; GError* _tmp25_; const gchar* _tmp26_; -#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = masterfile; -#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = g_file_get_path (_tmp22_); -#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = _tmp23_; -#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = err; -#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = _tmp25_->message; -#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_debug ("MediaDataRepresentation.vala:733: Exception deleting master file %s: %" \ +#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_debug ("MediaDataRepresentation.vala:735: Exception deleting master file %s: %" \ "s", _tmp24_, _tmp26_); -#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp24_); -#line 6708 "MediaDataRepresentation.c" +#line 6726 "MediaDataRepresentation.c" } -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6712 "MediaDataRepresentation.c" +#line 6730 "MediaDataRepresentation.c" } - __finally567: -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + __finally576: +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (masterfile); -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_clear_error (&_inner_error_); -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6731 "MediaDataRepresentation.c" +#line 6749 "MediaDataRepresentation.c" } } -#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = file; -#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = g_file_query_exists (_tmp27_, NULL); -#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" deleted = !_tmp28_; -#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp30_ = deleted; -#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp30_) { -#line 6744 "MediaDataRepresentation.c" +#line 6762 "MediaDataRepresentation.c" GeeList* _tmp31_; -#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = not_deleted; -#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = NULL != _tmp31_; -#line 6750 "MediaDataRepresentation.c" +#line 6768 "MediaDataRepresentation.c" } else { -#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = FALSE; -#line 6754 "MediaDataRepresentation.c" +#line 6772 "MediaDataRepresentation.c" } -#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp29_) { -#line 6758 "MediaDataRepresentation.c" +#line 6776 "MediaDataRepresentation.c" GeeList* _tmp32_; MediaSource* _tmp33_; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp32_ = not_deleted; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = source; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_); -#line 6767 "MediaDataRepresentation.c" +#line 6785 "MediaDataRepresentation.c" } -#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34_ = monitor; -#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34__target = monitor_target; -#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp34_ != NULL) { -#line 6775 "MediaDataRepresentation.c" +#line 6793 "MediaDataRepresentation.c" ProgressMonitor _tmp35_; void* _tmp35__target; gint _tmp36_; gint _tmp37_; -#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp35_ = monitor; -#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp35__target = monitor_target; -#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp36_ = i; -#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = total_count; -#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp35_ ((guint64) _tmp36_, (guint64) _tmp37_, TRUE, _tmp35__target); -#line 6790 "MediaDataRepresentation.c" +#line 6808 "MediaDataRepresentation.c" } -#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 748 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp38_ = i; -#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 748 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" i = _tmp38_ + 1; -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (masterfile); -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 6802 "MediaDataRepresentation.c" +#line 6820 "MediaDataRepresentation.c" } -#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 6806 "MediaDataRepresentation.c" +#line 6824 "MediaDataRepresentation.c" } } TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self) { -#line 342 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); -#line 342 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_transaction_controller (self); -#line 6816 "MediaDataRepresentation.c" +#line 6834 "MediaDataRepresentation.c" } static void media_source_collection_real_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { -#line 355 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 357 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6823 "MediaDataRepresentation.c" +#line 6841 "MediaDataRepresentation.c" } static void media_source_collection_real_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { -#line 362 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 364 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6830 "MediaDataRepresentation.c" +#line 6848 "MediaDataRepresentation.c" } static void media_source_collection_real_master_file_replaced (MediaSourceCollection* self, MediaSource* media, GFile* old_file, GFile* new_file) { -#line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (media)); -#line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (old_file)); -#line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 6841 "MediaDataRepresentation.c" +#line 6859 "MediaDataRepresentation.c" } @@ -6851,36 +6869,36 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (n_param_values == 4); -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data1 = closure->data; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = param_values->data[0].v_pointer; -#line 6860 "MediaDataRepresentation.c" +#line 6878 "MediaDataRepresentation.c" } else { -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data1 = param_values->data[0].v_pointer; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = closure->data; -#line 6866 "MediaDataRepresentation.c" +#line 6884 "MediaDataRepresentation.c" } -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/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" +#line 343 "/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 6872 "MediaDataRepresentation.c" +#line 6890 "MediaDataRepresentation.c" } static void media_source_collection_real_trashcan_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed) { -#line 368 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 370 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 368 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 370 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 6881 "MediaDataRepresentation.c" +#line 6899 "MediaDataRepresentation.c" } @@ -6889,11 +6907,11 @@ static void media_source_collection_real_import_roll_altered (MediaSourceCollect static void media_source_collection_real_offline_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed) { -#line 375 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 377 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 375 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 377 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 6894 "MediaDataRepresentation.c" +#line 6912 "MediaDataRepresentation.c" } @@ -6902,73 +6920,73 @@ static void media_source_collection_real_flagged_contents_altered (MediaSourceCo static void media_source_collection_class_init (MediaSourceCollectionClass * klass) { -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_parent_class = g_type_class_peek_parent (klass); -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((DataCollectionClass *) klass)->finalize = media_source_collection_finalize; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceCollectionPrivate)); -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) media_source_collection_real_create_trashcan; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) media_source_collection_real_create_offline_bin; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) media_source_collection_real_get_typename; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) media_source_collection_real_is_file_recognized; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) media_source_collection_real_items_altered; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->import_many = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_import_many; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_postprocess_imported_media; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->media_import_completed = media_source_collection_real_media_import_completed; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->master_file_replaced = media_source_collection_real_master_file_replaced; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->trashcan_contents_altered = media_source_collection_real_trashcan_contents_altered; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->import_roll_altered = media_source_collection_real_import_roll_altered; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->offline_contents_altered = media_source_collection_real_offline_contents_altered; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->flagged_contents_altered = media_source_collection_real_flagged_contents_altered; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL] = g_signal_new ("media-import-starting", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_starting), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL] = g_signal_new ("media-import-completed", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_completed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL] = g_signal_new ("master-file-replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, g_file_get_type (), g_file_get_type ()); -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_signals[MEDIA_SOURCE_COLLECTION_TRASHCAN_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, trashcan_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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL] = g_signal_new ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, import_roll_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_signals[MEDIA_SOURCE_COLLECTION_OFFLINE_CONTENTS_ALTERED_SIGNAL] = 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" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL] = 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 6969 "MediaDataRepresentation.c" +#line 6987 "MediaDataRepresentation.c" } @@ -6977,51 +6995,51 @@ static void media_source_collection_instance_init (MediaSourceCollection * self) GeeTreeMultiMap* _tmp1_; GeeTreeSet* _tmp2_; GeeHashSet* _tmp3_; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_COLLECTION_GET_PRIVATE (self); -#line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->trashcan = NULL; -#line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 347 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->offline_bin = NULL; -#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" + self->priv->by_master_file = _tmp0_; +#line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" + self->priv->import_rolls = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap); +#line 352 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 352 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->sorted_import_ids = _tmp2_; -#line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 353 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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" +#line 353 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->flagged = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet); -#line 7000 "MediaDataRepresentation.c" +#line 7018 "MediaDataRepresentation.c" } static void media_source_collection_finalize (DataCollection * obj) { MediaSourceCollection * self; -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); -#line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (self->priv->trashcan); -#line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 347 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (self->priv->offline_bin); -#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (self->priv->by_master_file); #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _g_object_unref0 (self->priv->import_rolls); + _g_object_unref0 (self->priv->by_master_file); #line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_object_unref0 (self->priv->import_rolls); +#line 352 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->sorted_import_ids); -#line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 353 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->flagged); -#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_COLLECTION_CLASS (media_source_collection_parent_class)->finalize (obj); -#line 7022 "MediaDataRepresentation.c" +#line 7040 "MediaDataRepresentation.c" } @@ -7038,9 +7056,9 @@ GType media_source_collection_get_type (void) { static void _media_collection_registry_on_init_done_application_init_done (Application* _sender, gpointer self) { -#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_on_init_done ((MediaCollectionRegistry*) self); -#line 7041 "MediaDataRepresentation.c" +#line 7059 "MediaDataRepresentation.c" } @@ -7048,26 +7066,26 @@ static MediaCollectionRegistry* media_collection_registry_construct (GType objec MediaCollectionRegistry* self = NULL; Application* _tmp0_; Application* _tmp1_; -#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = (MediaCollectionRegistry*) g_type_create_instance (object_type); -#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 763 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = application_get_instance (); -#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 763 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 763 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_connect (_tmp1_, "init-done", (GCallback) _media_collection_registry_on_init_done_application_init_done, self); -#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 763 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _application_unref0 (_tmp1_); -#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 7061 "MediaDataRepresentation.c" +#line 7079 "MediaDataRepresentation.c" } static MediaCollectionRegistry* media_collection_registry_new (void) { -#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_collection_registry_construct (TYPE_MEDIA_COLLECTION_REGISTRY); -#line 7068 "MediaDataRepresentation.c" +#line 7086 "MediaDataRepresentation.c" } @@ -7080,40 +7098,40 @@ static void media_collection_registry_on_init_done (MediaCollectionRegistry* sel LibraryMonitor* _tmp4_; LibraryMonitorPool* _tmp5_; LibraryMonitorPool* _tmp6_; -#line 768 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); #line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); +#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = app_dirs_get_import_dir (); -#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = commandline_options_no_runtime_monitoring; -#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = library_monitor_new (_tmp1_, TRUE, !_tmp2_); -#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _tmp3_; -#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" library_monitor = _tmp4_; -#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = library_monitor_pool_get_instance (); -#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _tmp5_; -#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" library_monitor_pool_replace (_tmp6_, library_monitor, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC); -#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _library_monitor_pool_unref0 (_tmp6_); -#line 768 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (library_monitor); -#line 7107 "MediaDataRepresentation.c" +#line 7125 "MediaDataRepresentation.c" } static void _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, gpointer self) { -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_on_import_directory_changed (); -#line 7114 "MediaDataRepresentation.c" +#line 7132 "MediaDataRepresentation.c" } @@ -7121,21 +7139,21 @@ void media_collection_registry_init (void) { MediaCollectionRegistry* _tmp0_; ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_new (); -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _media_collection_registry_unref0 (media_collection_registry_instance); -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_instance = _tmp0_; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = config_facade_get_instance (); -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp2_); -#line 7136 "MediaDataRepresentation.c" +#line 7154 "MediaDataRepresentation.c" } @@ -7143,17 +7161,17 @@ void media_collection_registry_terminate (void) { ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; guint _tmp2_; -#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = config_facade_get_instance (); -#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_parse_name ("import-directory-changed", TYPE_CONFIGURATION_FACADE, &_tmp2_, NULL, FALSE); -#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" 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 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 7154 "MediaDataRepresentation.c" +#line 7172 "MediaDataRepresentation.c" } @@ -7174,94 +7192,96 @@ static void media_collection_registry_on_import_directory_changed (void) { LibraryMonitorPool* _tmp15_; LibraryMonitorPool* _tmp16_; LibraryMonitor* _tmp17_; -#line 786 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = app_dirs_get_import_dir (); -#line 786 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - import_dir = _tmp0_; #line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + import_dir = _tmp0_; +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = library_monitor_pool_get_instance (); -#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = library_monitor_pool_get_monitor (_tmp2_); -#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _tmp3_; -#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _library_monitor_pool_unref0 (_tmp2_); -#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current = _tmp4_; -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = current; -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp6_ != NULL) { -#line 7195 "MediaDataRepresentation.c" +#line 7213 "MediaDataRepresentation.c" LibraryMonitor* _tmp7_; GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; gboolean _tmp11_; -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = current; -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = _tmp8_; -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = import_dir; -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = g_file_equal (_tmp9_, _tmp10_); -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp11_; -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp9_); -#line 7215 "MediaDataRepresentation.c" +#line 7233 "MediaDataRepresentation.c" } else { -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = FALSE; -#line 7219 "MediaDataRepresentation.c" +#line 7237 "MediaDataRepresentation.c" } -#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp5_) { -#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current); -#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (import_dir); -#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 7229 "MediaDataRepresentation.c" +#line 7247 "MediaDataRepresentation.c" } -#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = import_dir; -#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = commandline_options_no_runtime_monitoring; -#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = library_monitor_new (_tmp12_, TRUE, !_tmp13_); -#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - replacement = _tmp14_; #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + replacement = _tmp14_; +#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = library_monitor_pool_get_instance (); -#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = _tmp15_; -#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = replacement; -#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" library_monitor_pool_replace (_tmp16_, _tmp17_, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC); -#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _library_monitor_pool_unref0 (_tmp16_); -#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + library_files_select_copy_function (); +#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (replacement); -#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current); -#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (import_dir); -#line 7255 "MediaDataRepresentation.c" +#line 7275 "MediaDataRepresentation.c" } static gpointer _media_collection_registry_ref0 (gpointer self) { -#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? media_collection_registry_ref (self) : NULL; -#line 7262 "MediaDataRepresentation.c" +#line 7282 "MediaDataRepresentation.c" } @@ -7269,15 +7289,15 @@ MediaCollectionRegistry* media_collection_registry_get_instance (void) { MediaCollectionRegistry* result = NULL; MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; -#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_instance; -#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _media_collection_registry_ref0 (_tmp0_); -#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; -#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7278 "MediaDataRepresentation.c" +#line 7298 "MediaDataRepresentation.c" } @@ -7285,23 +7305,23 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc gchar* result = NULL; const gchar* _tmp0_; gboolean _tmp1_; -#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_return_val_if_fail (source_id != NULL, NULL); #line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_return_val_if_fail (source_id != NULL, NULL); +#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = source_id; -#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME); -#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_) { -#line 7294 "MediaDataRepresentation.c" +#line 7314 "MediaDataRepresentation.c" gchar* _tmp2_; -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = g_strdup (PHOTO_TYPENAME); -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp2_; -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7302 "MediaDataRepresentation.c" +#line 7322 "MediaDataRepresentation.c" } else { gchar** components = NULL; const gchar* _tmp3_; @@ -7315,37 +7335,37 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc gint _tmp7__length1; const gchar* _tmp8_; gchar* _tmp9_; -#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = source_id; -#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, "-", 0); -#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components = _tmp5_; -#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components_length1 = _vala_array_length (_tmp4_); -#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _components_size_ = components_length1; -#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = components; -#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6__length1 = components_length1; -#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (_tmp6__length1 == 2, "components.length == 2"); -#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = components; -#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7__length1 = components_length1; -#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _tmp7_[0]; -#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = g_strdup (_tmp8_); -#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp9_; -#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); -#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7346 "MediaDataRepresentation.c" +#line 7366 "MediaDataRepresentation.c" } } @@ -7358,31 +7378,31 @@ void media_collection_registry_register_collection (MediaCollectionRegistry* sel gchar* _tmp4_; gchar* _tmp5_; MediaSourceCollection* _tmp6_; -#line 814 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 814 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (collection)); -#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->all; -#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = collection; -#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = self->priv->by_typename; -#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = collection; -#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = media_source_collection_get_typename (_tmp3_); -#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp4_; -#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = collection; -#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, _tmp6_); -#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp5_); -#line 7383 "MediaDataRepresentation.c" +#line 7403 "MediaDataRepresentation.c" } @@ -7391,21 +7411,21 @@ MediaSourceCollection* media_collection_registry_get_collection (MediaCollection GeeHashMap* _tmp0_; const gchar* _tmp1_; gpointer _tmp2_; -#line 823 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 823 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (typename != NULL, NULL); -#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->by_typename; -#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = typename; -#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = (MediaSourceCollection*) _tmp2_; -#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7406 "MediaDataRepresentation.c" +#line 7426 "MediaDataRepresentation.c" } @@ -7414,171 +7434,171 @@ GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self) GeeArrayList* _tmp0_; GeeBidirList* _tmp1_; GeeBidirList* _tmp2_; -#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 830 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->all; -#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_abstract_bidir_list_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_BIDIR_LIST, GeeAbstractBidirList)); -#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7427 "MediaDataRepresentation.c" +#line 7447 "MediaDataRepresentation.c" } void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 834 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7434 "MediaDataRepresentation.c" +#line 7454 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeIterator* _tmp2_; GeeIterator* _tmp3_; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _sources_it = _tmp3_; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7455 "MediaDataRepresentation.c" +#line 7475 "MediaDataRepresentation.c" GeeIterator* _tmp4_; gboolean _tmp5_; MediaSourceCollection* sources = NULL; GeeIterator* _tmp6_; gpointer _tmp7_; MediaSourceCollection* _tmp8_; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7470 "MediaDataRepresentation.c" +#line 7490 "MediaDataRepresentation.c" } -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" sources = (MediaSourceCollection*) _tmp7_; -#line 833 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 833 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7484 "MediaDataRepresentation.c" +#line 7504 "MediaDataRepresentation.c" } -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7488 "MediaDataRepresentation.c" +#line 7508 "MediaDataRepresentation.c" } } void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 839 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7496 "MediaDataRepresentation.c" +#line 7516 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeIterator* _tmp2_; GeeIterator* _tmp3_; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _sources_it = _tmp3_; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7517 "MediaDataRepresentation.c" +#line 7537 "MediaDataRepresentation.c" GeeIterator* _tmp4_; gboolean _tmp5_; MediaSourceCollection* sources = NULL; GeeIterator* _tmp6_; gpointer _tmp7_; MediaSourceCollection* _tmp8_; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7532 "MediaDataRepresentation.c" +#line 7552 "MediaDataRepresentation.c" } -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" sources = (MediaSourceCollection*) _tmp7_; -#line 838 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 838 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7546 "MediaDataRepresentation.c" +#line 7566 "MediaDataRepresentation.c" } -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7550 "MediaDataRepresentation.c" +#line 7570 "MediaDataRepresentation.c" } } void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self) { -#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7558 "MediaDataRepresentation.c" +#line 7578 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeIterator* _tmp2_; GeeIterator* _tmp3_; -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _sources_it = _tmp3_; -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7579 "MediaDataRepresentation.c" +#line 7599 "MediaDataRepresentation.c" GeeIterator* _tmp4_; gboolean _tmp5_; MediaSourceCollection* sources = NULL; @@ -7587,66 +7607,66 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry MediaSourceCollection* _tmp8_; TransactionController* _tmp9_; TransactionController* _tmp10_; -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7596 "MediaDataRepresentation.c" +#line 7616 "MediaDataRepresentation.c" } -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" sources = (MediaSourceCollection*) _tmp7_; -#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_collection_get_transaction_controller (_tmp8_); -#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = _tmp9_; -#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" transaction_controller_begin (_tmp10_); -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7614 "MediaDataRepresentation.c" +#line 7634 "MediaDataRepresentation.c" } -#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7618 "MediaDataRepresentation.c" +#line 7638 "MediaDataRepresentation.c" } } void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self) { -#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7626 "MediaDataRepresentation.c" +#line 7646 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeIterator* _tmp2_; GeeIterator* _tmp3_; -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _sources_it = _tmp3_; -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7647 "MediaDataRepresentation.c" +#line 7667 "MediaDataRepresentation.c" GeeIterator* _tmp4_; gboolean _tmp5_; MediaSourceCollection* sources = NULL; @@ -7655,37 +7675,37 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr MediaSourceCollection* _tmp8_; TransactionController* _tmp9_; TransactionController* _tmp10_; -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7664 "MediaDataRepresentation.c" +#line 7684 "MediaDataRepresentation.c" } -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" sources = (MediaSourceCollection*) _tmp7_; -#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_collection_get_transaction_controller (_tmp8_); -#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = _tmp9_; -#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" transaction_controller_commit (_tmp10_); -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7682 "MediaDataRepresentation.c" +#line 7702 "MediaDataRepresentation.c" } -#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7686 "MediaDataRepresentation.c" +#line 7706 "MediaDataRepresentation.c" } } @@ -7702,68 +7722,68 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel MediaSourceCollection* _tmp7_; const gchar* _tmp8_; MediaSource* _tmp9_; -#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (source_id != NULL, NULL); -#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = source_id; -#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = media_collection_registry_get_typename_from_source_id (_tmp0_); -#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" typename = _tmp1_; -#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = typename; -#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = media_collection_registry_get_collection (self, _tmp2_); -#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" collection = _tmp3_; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = collection; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp4_ == NULL) { -#line 7723 "MediaDataRepresentation.c" +#line 7743 "MediaDataRepresentation.c" const gchar* _tmp5_; const gchar* _tmp6_; -#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = source_id; -#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = typename; -#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_critical ("MediaDataRepresentation.vala:856: source id '%s' has unrecognized medi" \ +#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_critical ("MediaDataRepresentation.vala:859: source id '%s' has unrecognized medi" \ "a type '%s'", _tmp5_, _tmp6_); -#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; -#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); -#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (typename); -#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7740 "MediaDataRepresentation.c" +#line 7760 "MediaDataRepresentation.c" } -#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = collection; -#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = source_id; -#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_collection_fetch_by_source_id (_tmp7_, _tmp8_); -#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp9_; -#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); -#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (typename); -#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7756 "MediaDataRepresentation.c" +#line 7776 "MediaDataRepresentation.c" } static gpointer _import_id_dup0 (gpointer self) { -#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? import_id_dup (self) : NULL; -#line 7763 "MediaDataRepresentation.c" +#line 7783 "MediaDataRepresentation.c" } @@ -7772,32 +7792,32 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* ImportID last_import_id = {0}; ImportID _tmp16_; gint64 _tmp17_; -#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 864 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_id_init (&last_import_id, IMPORT_ID_INVALID); -#line 7776 "MediaDataRepresentation.c" +#line 7796 "MediaDataRepresentation.c" { GeeIterator* _current_collection_it = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeIterator* _tmp2_; GeeIterator* _tmp3_; -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _current_collection_it = _tmp3_; -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7797 "MediaDataRepresentation.c" +#line 7817 "MediaDataRepresentation.c" GeeIterator* _tmp4_; gboolean _tmp5_; MediaSourceCollection* current_collection = NULL; @@ -7811,88 +7831,88 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* gint64 _tmp12_; ImportID _tmp13_; gint64 _tmp14_; -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_collection_it; -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7819 "MediaDataRepresentation.c" +#line 7839 "MediaDataRepresentation.c" } -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _current_collection_it; -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current_collection = (MediaSourceCollection*) _tmp7_; -#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = current_collection; -#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_collection_get_last_import_id (_tmp8_); -#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current_import_id = _tmp9_; -#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = current_import_id; -#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp10_ == NULL) { -#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (current_import_id); -#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 7843 "MediaDataRepresentation.c" +#line 7863 "MediaDataRepresentation.c" } -#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = current_import_id; -#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = (*_tmp11_).id; -#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = last_import_id; -#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = _tmp13_.id; -#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp12_ > _tmp14_) { -#line 7855 "MediaDataRepresentation.c" +#line 7875 "MediaDataRepresentation.c" ImportID* _tmp15_; -#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = current_import_id; -#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" last_import_id = *_tmp15_; -#line 7861 "MediaDataRepresentation.c" +#line 7881 "MediaDataRepresentation.c" } -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (current_import_id); -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 7867 "MediaDataRepresentation.c" +#line 7887 "MediaDataRepresentation.c" } -#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_collection_it); -#line 7871 "MediaDataRepresentation.c" +#line 7891 "MediaDataRepresentation.c" } -#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = last_import_id; -#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = _tmp16_.id; -#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_ == IMPORT_ID_INVALID) { -#line 879 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 882 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; -#line 879 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 882 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7883 "MediaDataRepresentation.c" +#line 7903 "MediaDataRepresentation.c" } else { ImportID* _tmp18_; -#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = _import_id_dup0 (&last_import_id); -#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp18_; -#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7892 "MediaDataRepresentation.c" +#line 7912 "MediaDataRepresentation.c" } } @@ -7901,36 +7921,36 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle GeeCollection* result = NULL; GeeArrayList* _result_ = NULL; GeeArrayList* _tmp0_; -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (event_id != NULL, NULL); -#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _result_ = _tmp0_; -#line 7909 "MediaDataRepresentation.c" +#line 7929 "MediaDataRepresentation.c" { GeeIterator* _current_collection_it = NULL; GeeCollection* _tmp1_; GeeCollection* _tmp2_; GeeIterator* _tmp3_; GeeIterator* _tmp4_; -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = media_collection_registry_get_all (self); -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _tmp3_; -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp2_); -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _current_collection_it = _tmp4_; -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7930 "MediaDataRepresentation.c" +#line 7950 "MediaDataRepresentation.c" GeeIterator* _tmp5_; gboolean _tmp6_; MediaSourceCollection* current_collection = NULL; @@ -7941,80 +7961,80 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle EventID _tmp11_; GeeCollection* _tmp12_; GeeCollection* _tmp13_; -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _current_collection_it; -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = gee_iterator_next (_tmp5_); -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp6_) { -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7949 "MediaDataRepresentation.c" +#line 7969 "MediaDataRepresentation.c" } -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _current_collection_it; -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = gee_iterator_get (_tmp7_); -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current_collection = (MediaSourceCollection*) _tmp8_; -#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = _result_; -#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = current_collection; -#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = *event_id; -#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = media_source_collection_get_event_source_ids (_tmp10_, &_tmp11_); -#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = _tmp12_; -#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_array_list_add_all (_tmp9_, _tmp13_); -#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp13_); -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 7973 "MediaDataRepresentation.c" +#line 7993 "MediaDataRepresentation.c" } -#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_collection_it); -#line 7977 "MediaDataRepresentation.c" +#line 7997 "MediaDataRepresentation.c" } -#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_COLLECTION, GeeCollection); -#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7983 "MediaDataRepresentation.c" +#line 8003 "MediaDataRepresentation.c" } MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file) { MediaSourceCollection* result = NULL; -#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 7993 "MediaDataRepresentation.c" +#line 8013 "MediaDataRepresentation.c" { GeeIterator* _collection_it = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeIterator* _tmp2_; GeeIterator* _tmp3_; -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _collection_it = _tmp3_; -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 8014 "MediaDataRepresentation.c" +#line 8034 "MediaDataRepresentation.c" GeeIterator* _tmp4_; gboolean _tmp5_; MediaSourceCollection* collection = NULL; @@ -8023,51 +8043,51 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC MediaSourceCollection* _tmp8_; GFile* _tmp9_; gboolean _tmp10_; -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _collection_it; -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 8031 "MediaDataRepresentation.c" +#line 8051 "MediaDataRepresentation.c" } -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _collection_it; -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" collection = (MediaSourceCollection*) _tmp7_; -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = collection; -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = file; -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = media_source_collection_is_file_recognized (_tmp8_, _tmp9_); -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp10_) { -#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = collection; -#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_collection_it); -#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8053 "MediaDataRepresentation.c" +#line 8073 "MediaDataRepresentation.c" } -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); -#line 8057 "MediaDataRepresentation.c" +#line 8077 "MediaDataRepresentation.c" } -#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_collection_it); -#line 8061 "MediaDataRepresentation.c" +#line 8081 "MediaDataRepresentation.c" } -#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; -#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8067 "MediaDataRepresentation.c" +#line 8087 "MediaDataRepresentation.c" } @@ -8078,255 +8098,255 @@ gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* gboolean _tmp2_ = FALSE; const gchar* _tmp3_; gboolean _tmp4_; -#line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 906 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), FALSE); -#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = source_id; -#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = is_string_empty (_tmp0_); -#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_) { -#line 905 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 908 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; -#line 905 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 908 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8090 "MediaDataRepresentation.c" +#line 8110 "MediaDataRepresentation.c" } -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = source_id; -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = g_str_has_prefix (_tmp3_, PHOTO_TYPENAME); -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp4_) { -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = TRUE; -#line 8100 "MediaDataRepresentation.c" +#line 8120 "MediaDataRepresentation.c" } else { const gchar* _tmp5_; gboolean _tmp6_; -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = source_id; -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = g_str_has_prefix (_tmp5_, VIDEO_TYPENAME "-"); -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp6_; -#line 8110 "MediaDataRepresentation.c" +#line 8130 "MediaDataRepresentation.c" } -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp2_; -#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8116 "MediaDataRepresentation.c" +#line 8136 "MediaDataRepresentation.c" } static void value_media_collection_registry_init (GValue* value) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8123 "MediaDataRepresentation.c" +#line 8143 "MediaDataRepresentation.c" } static void value_media_collection_registry_free_value (GValue* value) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (value->data[0].v_pointer) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (value->data[0].v_pointer); -#line 8132 "MediaDataRepresentation.c" +#line 8152 "MediaDataRepresentation.c" } } static void value_media_collection_registry_copy_value (const GValue* src_value, GValue* dest_value) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (src_value->data[0].v_pointer) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = media_collection_registry_ref (src_value->data[0].v_pointer); -#line 8142 "MediaDataRepresentation.c" +#line 8162 "MediaDataRepresentation.c" } else { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = NULL; -#line 8146 "MediaDataRepresentation.c" +#line 8166 "MediaDataRepresentation.c" } } static gpointer value_media_collection_registry_peek_pointer (const GValue* value) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 8154 "MediaDataRepresentation.c" +#line 8174 "MediaDataRepresentation.c" } static gchar* value_media_collection_registry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (collect_values[0].v_pointer) { -#line 8161 "MediaDataRepresentation.c" +#line 8181 "MediaDataRepresentation.c" MediaCollectionRegistry * object; object = collect_values[0].v_pointer; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (object->parent_instance.g_class == NULL) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8168 "MediaDataRepresentation.c" +#line 8188 "MediaDataRepresentation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/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 8172 "MediaDataRepresentation.c" +#line 8192 "MediaDataRepresentation.c" } -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = media_collection_registry_ref (object); -#line 8176 "MediaDataRepresentation.c" +#line 8196 "MediaDataRepresentation.c" } else { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8180 "MediaDataRepresentation.c" +#line 8200 "MediaDataRepresentation.c" } -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 8184 "MediaDataRepresentation.c" +#line 8204 "MediaDataRepresentation.c" } static gchar* value_media_collection_registry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { MediaCollectionRegistry ** object_p; object_p = collect_values[0].v_pointer; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!object_p) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8195 "MediaDataRepresentation.c" +#line 8215 "MediaDataRepresentation.c" } -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!value->data[0].v_pointer) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = NULL; -#line 8201 "MediaDataRepresentation.c" +#line 8221 "MediaDataRepresentation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = value->data[0].v_pointer; -#line 8205 "MediaDataRepresentation.c" +#line 8225 "MediaDataRepresentation.c" } else { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = media_collection_registry_ref (value->data[0].v_pointer); -#line 8209 "MediaDataRepresentation.c" +#line 8229 "MediaDataRepresentation.c" } -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 8213 "MediaDataRepresentation.c" +#line 8233 "MediaDataRepresentation.c" } GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { ParamSpecMediaCollectionRegistry* spec; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_MEDIA_COLLECTION_REGISTRY), NULL); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return G_PARAM_SPEC (spec); -#line 8227 "MediaDataRepresentation.c" +#line 8247 "MediaDataRepresentation.c" } gpointer value_get_media_collection_registry (const GValue* value) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY), NULL); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 8236 "MediaDataRepresentation.c" +#line 8256 "MediaDataRepresentation.c" } void value_set_media_collection_registry (GValue* value, gpointer v_object) { MediaCollectionRegistry * old; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY)); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" old = value->data[0].v_pointer; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (v_object) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MEDIA_COLLECTION_REGISTRY)); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_ref (value->data[0].v_pointer); -#line 8256 "MediaDataRepresentation.c" +#line 8276 "MediaDataRepresentation.c" } else { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8260 "MediaDataRepresentation.c" +#line 8280 "MediaDataRepresentation.c" } -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (old); -#line 8266 "MediaDataRepresentation.c" +#line 8286 "MediaDataRepresentation.c" } } void value_take_media_collection_registry (GValue* value, gpointer v_object) { MediaCollectionRegistry * old; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY)); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" old = value->data[0].v_pointer; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (v_object) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MEDIA_COLLECTION_REGISTRY)); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 8285 "MediaDataRepresentation.c" +#line 8305 "MediaDataRepresentation.c" } else { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8289 "MediaDataRepresentation.c" +#line 8309 "MediaDataRepresentation.c" } -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (old); -#line 8295 "MediaDataRepresentation.c" +#line 8315 "MediaDataRepresentation.c" } } static void media_collection_registry_class_init (MediaCollectionRegistryClass * klass) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_parent_class = g_type_class_peek_parent (klass); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaCollectionRegistryClass *) klass)->finalize = media_collection_registry_finalize; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaCollectionRegistryPrivate)); -#line 8307 "MediaDataRepresentation.c" +#line 8327 "MediaDataRepresentation.c" } static void media_collection_registry_instance_init (MediaCollectionRegistry * self) { GeeArrayList* _tmp0_; GeeHashMap* _tmp1_; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_COLLECTION_REGISTRY_GET_PRIVATE (self); -#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 758 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL); -#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 758 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->all = _tmp0_; -#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _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 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->by_typename = _tmp1_; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->ref_count = 1; -#line 8326 "MediaDataRepresentation.c" +#line 8346 "MediaDataRepresentation.c" } @@ -8335,25 +8355,25 @@ static void media_collection_registry_finalize (MediaCollectionRegistry * obj) { Application* _tmp0_; Application* _tmp1_; guint _tmp2_; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_handlers_destroy (self); -#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = application_get_instance (); -#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_parse_name ("init-done", TYPE_APPLICATION, &_tmp2_, NULL, FALSE); -#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_init_done_application_init_done, self); -#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _application_unref0 (_tmp1_); -#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 758 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->all); -#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->by_typename); -#line 8353 "MediaDataRepresentation.c" +#line 8373 "MediaDataRepresentation.c" } @@ -8374,24 +8394,24 @@ GType media_collection_registry_get_type (void) { gpointer media_collection_registry_ref (gpointer instance) { MediaCollectionRegistry * self; self = instance; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_atomic_int_inc (&self->ref_count); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return instance; -#line 8378 "MediaDataRepresentation.c" +#line 8398 "MediaDataRepresentation.c" } void media_collection_registry_unref (gpointer instance) { MediaCollectionRegistry * self; self = instance; -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_COLLECTION_REGISTRY_GET_CLASS (self)->finalize (self); -#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8391 "MediaDataRepresentation.c" +#line 8411 "MediaDataRepresentation.c" } } -- cgit v1.2.3