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/Thumbnail.c | 1263 +++++++++++++++++++++++++++---------------------------- 1 file changed, 627 insertions(+), 636 deletions(-) (limited to 'src/Thumbnail.c') diff --git a/src/Thumbnail.c b/src/Thumbnail.c index c884d23..f02ebd7 100644 --- a/src/Thumbnail.c +++ b/src/Thumbnail.c @@ -528,7 +528,6 @@ gint64 thumbnail_filename_descending_comparator (void* a, void* b); gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration); gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration); GFile* media_source_get_file (MediaSource* self); -gchar* g_utf8_collate_key_for_filename (const gchar* str, gssize len); gint64 thumbnail_rating_ascending_comparator (void* a, void* b); GType rating_get_type (void) G_GNUC_CONST; Rating media_source_get_rating (MediaSource* self); @@ -582,21 +581,21 @@ static void _vala_thumbnail_get_property (GObject * object, guint property_id, G static void _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked, gpointer self) { #line 76 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_tag_contents_altered ((Thumbnail*) self, container, added, relinked, removed, unlinked); -#line 586 "Thumbnail.c" +#line 585 "Thumbnail.c" } static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 77 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_tags_altered ((Thumbnail*) self, items); -#line 593 "Thumbnail.c" +#line 592 "Thumbnail.c" } static gpointer _g_object_ref0 (gpointer self) { #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" return self ? g_object_ref (self) : NULL; -#line 600 "Thumbnail.c" +#line 599 "Thumbnail.c" } @@ -681,14 +680,14 @@ Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scal if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_LIBRARY_PHOTO)) { #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp16_ = TRUE; -#line 685 "Thumbnail.c" +#line 684 "Thumbnail.c" } else { MediaSource* _tmp18_; #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp18_ = media; #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO); -#line 692 "Thumbnail.c" +#line 691 "Thumbnail.c" } #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" _vala_assert (_tmp16_, "(media is LibraryPhoto) || (media is Video)"); @@ -716,14 +715,14 @@ Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scal thumbnail_update_tags (self, TRUE); #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala" return self; -#line 720 "Thumbnail.c" +#line 719 "Thumbnail.c" } Thumbnail* thumbnail_new (MediaSource* media, gint scale) { #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala" return thumbnail_construct (TYPE_THUMBNAIL, media, scale); -#line 727 "Thumbnail.c" +#line 726 "Thumbnail.c" } @@ -750,7 +749,7 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) { if (_tmp4_ == NULL) { #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = TRUE; -#line 754 "Thumbnail.c" +#line 753 "Thumbnail.c" } else { GeeCollection* _tmp5_; gint _tmp6_; @@ -763,24 +762,24 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) { _tmp7_ = _tmp6_; #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp7_ == 0; -#line 767 "Thumbnail.c" +#line 766 "Thumbnail.c" } #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp3_) { #line 83 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_tags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 773 "Thumbnail.c" +#line 772 "Thumbnail.c" } else { GeeCollection* _tmp8_; #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = tags; #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_set_tags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp8_, PANGO_ALIGN_LEFT); -#line 780 "Thumbnail.c" +#line 779 "Thumbnail.c" } #line 80 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (tags); -#line 784 "Thumbnail.c" +#line 783 "Thumbnail.c" } @@ -808,13 +807,13 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* if (!_tmp0_) { #line 91 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 812 "Thumbnail.c" +#line 811 "Thumbnail.c" } #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = added; #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp2_ != NULL) { -#line 818 "Thumbnail.c" +#line 817 "Thumbnail.c" GeeCollection* _tmp3_; MediaSource* _tmp4_; gboolean _tmp5_; @@ -826,11 +825,11 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* _tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = _tmp5_; -#line 830 "Thumbnail.c" +#line 829 "Thumbnail.c" } else { #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = FALSE; -#line 834 "Thumbnail.c" +#line 833 "Thumbnail.c" } #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" tag_added = _tmp1_; @@ -838,7 +837,7 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* _tmp7_ = removed; #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp7_ != NULL) { -#line 842 "Thumbnail.c" +#line 841 "Thumbnail.c" GeeCollection* _tmp8_; MediaSource* _tmp9_; gboolean _tmp10_; @@ -850,11 +849,11 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* _tmp10_ = gee_collection_contains (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource)); #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = _tmp10_; -#line 854 "Thumbnail.c" +#line 853 "Thumbnail.c" } else { #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = FALSE; -#line 858 "Thumbnail.c" +#line 857 "Thumbnail.c" } #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" tag_removed = _tmp6_; @@ -864,20 +863,20 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* if (_tmp12_) { #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = TRUE; -#line 868 "Thumbnail.c" +#line 867 "Thumbnail.c" } else { gboolean _tmp13_; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp13_ = tag_removed; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = _tmp13_; -#line 875 "Thumbnail.c" +#line 874 "Thumbnail.c" } #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp11_) { #line 98 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_tags (self, FALSE); -#line 881 "Thumbnail.c" +#line 880 "Thumbnail.c" } } @@ -894,7 +893,7 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { if (!_tmp0_) { #line 103 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 898 "Thumbnail.c" +#line 897 "Thumbnail.c" } { GeeIterator* _object_it = NULL; @@ -922,7 +921,7 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { _object_it = _tmp6_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" while (TRUE) { -#line 926 "Thumbnail.c" +#line 925 "Thumbnail.c" GeeIterator* _tmp7_; gboolean _tmp8_; DataObject* object = NULL; @@ -942,7 +941,7 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { if (!_tmp8_) { #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 946 "Thumbnail.c" +#line 945 "Thumbnail.c" } #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = _object_it; @@ -972,17 +971,17 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { _g_object_unref0 (object); #line 111 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 976 "Thumbnail.c" +#line 975 "Thumbnail.c" } #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (tag); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (object); -#line 982 "Thumbnail.c" +#line 981 "Thumbnail.c" } #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_object_it); -#line 986 "Thumbnail.c" +#line 985 "Thumbnail.c" } } @@ -1009,29 +1008,25 @@ static void thumbnail_update_title (Thumbnail* self, gboolean init) { if (_tmp3_) { #line 119 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1013 "Thumbnail.c" +#line 1012 "Thumbnail.c" } else { gboolean _tmp4_; #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = init; #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (!_tmp4_) { -#line 1020 "Thumbnail.c" +#line 1019 "Thumbnail.c" const gchar* _tmp5_; #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = title; #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala" media_source_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT); -#line 1026 "Thumbnail.c" - } else { -#line 123 "/home/jens/Source/shotwell/src/Thumbnail.vala" - media_source_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), "", FALSE, PANGO_ALIGN_LEFT); -#line 1030 "Thumbnail.c" +#line 1025 "Thumbnail.c" } } #line 116 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (title); -#line 1035 "Thumbnail.c" +#line 1030 "Thumbnail.c" } @@ -1041,45 +1036,41 @@ static void thumbnail_update_comment (Thumbnail* self, gboolean init) { gchar* _tmp1_; const gchar* _tmp2_; gboolean _tmp3_; -#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 124 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); -#line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 125 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->media; -#line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 125 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = media_source_get_comment (_tmp0_); -#line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 125 "/home/jens/Source/shotwell/src/Thumbnail.vala" comment = _tmp1_; -#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = comment; -#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = is_string_empty (_tmp2_); -#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp3_) { -#line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1061 "Thumbnail.c" +#line 1056 "Thumbnail.c" } else { gboolean _tmp4_; -#line 130 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = init; -#line 130 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (!_tmp4_) { -#line 1068 "Thumbnail.c" +#line 1063 "Thumbnail.c" const gchar* _tmp5_; -#line 131 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = comment; -#line 131 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT); -#line 1074 "Thumbnail.c" - } else { -#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" - checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), "", FALSE, PANGO_ALIGN_LEFT); -#line 1078 "Thumbnail.c" +#line 1069 "Thumbnail.c" } } -#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 124 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (comment); -#line 1083 "Thumbnail.c" +#line 1074 "Thumbnail.c" } @@ -1090,65 +1081,65 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat gboolean _tmp4_ = FALSE; gboolean _tmp5_; Alteration* _tmp8_; -#line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 132 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); -#line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 132 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_ALTERATION (alteration)); -#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = self->priv->exposure; -#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp1_) { -#line 1102 "Thumbnail.c" +#line 1093 "Thumbnail.c" Alteration* _tmp2_; gboolean _tmp3_; -#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = alteration; -#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = alteration_has_detail (_tmp2_, "metadata", "name"); -#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = _tmp3_; -#line 1111 "Thumbnail.c" +#line 1102 "Thumbnail.c" } else { -#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = FALSE; -#line 1115 "Thumbnail.c" +#line 1106 "Thumbnail.c" } -#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_) { -#line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 134 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_title (self, FALSE); -#line 1121 "Thumbnail.c" +#line 1112 "Thumbnail.c" } -#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = self->priv->exposure; -#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp5_) { -#line 1127 "Thumbnail.c" +#line 1118 "Thumbnail.c" Alteration* _tmp6_; gboolean _tmp7_; -#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = alteration; -#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = alteration_has_detail (_tmp6_, "metadata", "comment"); -#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = _tmp7_; -#line 1136 "Thumbnail.c" +#line 1127 "Thumbnail.c" } else { -#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = FALSE; -#line 1140 "Thumbnail.c" +#line 1131 "Thumbnail.c" } -#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_) { -#line 140 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_comment (self, FALSE); -#line 1146 "Thumbnail.c" +#line 1137 "Thumbnail.c" } -#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = alteration; -#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala" DATA_OBJECT_CLASS (thumbnail_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_DATA_OBJECT, DataObject), _tmp8_); -#line 1152 "Thumbnail.c" +#line 1143 "Thumbnail.c" } @@ -1156,17 +1147,17 @@ MediaSource* thumbnail_get_media_source (Thumbnail* self) { MediaSource* result = NULL; MediaSource* _tmp0_; MediaSource* _tmp1_; -#line 145 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 141 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_THUMBNAIL (self), NULL); -#line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->media; -#line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp1_; -#line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1170 "Thumbnail.c" +#line 1161 "Thumbnail.c" } @@ -1178,23 +1169,23 @@ gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b) { void* _tmp3_; MediaSource* _tmp4_; gint64 _tmp5_; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = a; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = b; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp2_ - _tmp5_; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1198 "Thumbnail.c" +#line 1189 "Thumbnail.c" } @@ -1203,17 +1194,17 @@ gint64 thumbnail_photo_id_descending_comparator (void* a, void* b) { void* _tmp0_; void* _tmp1_; gint64 _tmp2_; -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = b; -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = a; -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = thumbnail_photo_id_ascending_comparator (_tmp0_, _tmp1_); -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp2_; -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1217 "Thumbnail.c" +#line 1208 "Thumbnail.c" } @@ -1231,60 +1222,60 @@ gint64 thumbnail_title_ascending_comparator (void* a, void* b) { gint64 _tmp8_; gint64 _tmp9_ = 0LL; gint64 _tmp10_; -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = g_strcmp0; -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = a; -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp1_, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)); -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp2_; -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = b; -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp4_, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)); -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = _tmp5_; -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = _tmp0_ (_tmp3_, _tmp6_); -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = (gint64) _tmp7_; -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (_tmp6_); -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (_tmp3_); -#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _result_ = _tmp8_; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp10_ = _result_; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp10_ != ((gint64) 0)) { -#line 1263 "Thumbnail.c" +#line 1254 "Thumbnail.c" gint64 _tmp11_; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = _result_; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = _tmp11_; -#line 1269 "Thumbnail.c" +#line 1260 "Thumbnail.c" } else { void* _tmp12_; void* _tmp13_; gint64 _tmp14_; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp12_ = a; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp13_ = b; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp14_ = thumbnail_photo_id_ascending_comparator (_tmp12_, _tmp13_); -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = _tmp14_; -#line 1282 "Thumbnail.c" +#line 1273 "Thumbnail.c" } -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp9_; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1288 "Thumbnail.c" +#line 1279 "Thumbnail.c" } @@ -1296,44 +1287,44 @@ gint64 thumbnail_title_descending_comparator (void* a, void* b) { gint64 _tmp2_; gint64 _tmp3_ = 0LL; gint64 _tmp4_; -#line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = b; -#line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = a; -#line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = thumbnail_title_ascending_comparator (_tmp0_, _tmp1_); -#line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" _result_ = _tmp2_; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = _result_; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_ != ((gint64) 0)) { -#line 1312 "Thumbnail.c" +#line 1303 "Thumbnail.c" gint64 _tmp5_; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _result_; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp5_; -#line 1318 "Thumbnail.c" +#line 1309 "Thumbnail.c" } else { void* _tmp6_; void* _tmp7_; gint64 _tmp8_; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = a; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = b; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp8_; -#line 1331 "Thumbnail.c" +#line 1322 "Thumbnail.c" } -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp3_; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1337 "Thumbnail.c" +#line 1328 "Thumbnail.c" } @@ -1341,19 +1332,19 @@ gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* a gboolean result = FALSE; Alteration* _tmp0_; gboolean _tmp1_; -#line 172 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 168 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); -#line 172 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 168 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = alteration; -#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "title"); -#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp1_; -#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1357 "Thumbnail.c" +#line 1348 "Thumbnail.c" } @@ -1372,58 +1363,58 @@ gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) { gint64 _tmp7_; gint64 _tmp8_ = 0LL; gint64 _tmp9_; -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = a; -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = media_source_get_exposure_time (_tmp1_); -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" time_a = (gint64) _tmp2_; -#line 178 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = b; -#line 178 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 178 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = media_source_get_exposure_time (_tmp4_); -#line 178 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" time_b = (gint64) _tmp5_; -#line 179 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = time_a; -#line 179 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = time_b; -#line 179 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" _result_ = _tmp6_ - _tmp7_; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = _result_; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp9_ != ((gint64) 0)) { -#line 1402 "Thumbnail.c" +#line 1393 "Thumbnail.c" gint64 _tmp10_; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp10_ = _result_; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = _tmp10_; -#line 1408 "Thumbnail.c" +#line 1399 "Thumbnail.c" } else { void* _tmp11_; void* _tmp12_; gint64 _tmp13_; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = a; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp12_ = b; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp13_ = thumbnail_filename_ascending_comparator (_tmp11_, _tmp12_); -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = _tmp13_; -#line 1421 "Thumbnail.c" +#line 1412 "Thumbnail.c" } -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp8_; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1427 "Thumbnail.c" +#line 1418 "Thumbnail.c" } @@ -1435,44 +1426,44 @@ gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) { gint64 _tmp2_; gint64 _tmp3_ = 0LL; gint64 _tmp4_; -#line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = b; -#line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = a; -#line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = thumbnail_exposure_time_ascending_comparator (_tmp0_, _tmp1_); -#line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" _result_ = _tmp2_; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = _result_; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_ != ((gint64) 0)) { -#line 1451 "Thumbnail.c" +#line 1442 "Thumbnail.c" gint64 _tmp5_; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _result_; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp5_; -#line 1457 "Thumbnail.c" +#line 1448 "Thumbnail.c" } else { void* _tmp6_; void* _tmp7_; gint64 _tmp8_; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = a; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = b; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = thumbnail_filename_descending_comparator (_tmp6_, _tmp7_); -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp8_; -#line 1470 "Thumbnail.c" +#line 1461 "Thumbnail.c" } -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp3_; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1476 "Thumbnail.c" +#line 1467 "Thumbnail.c" } @@ -1480,19 +1471,19 @@ gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alter gboolean result = FALSE; Alteration* _tmp0_; gboolean _tmp1_; -#line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 186 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); -#line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 186 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = alteration; -#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time"); -#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp1_; -#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1496 "Thumbnail.c" +#line 1487 "Thumbnail.c" } @@ -1500,19 +1491,19 @@ gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration gboolean result = FALSE; Alteration* _tmp0_; gboolean _tmp1_; -#line 194 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); -#line 194 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = alteration; -#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "filename"); -#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp1_; -#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1516 "Thumbnail.c" +#line 1507 "Thumbnail.c" } @@ -1548,108 +1539,108 @@ gint64 thumbnail_filename_ascending_comparator (void* a, void* b) { gint64 _tmp24_; gint64 _tmp25_ = 0LL; gint64 _tmp26_; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = a; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = media_source_get_file (_tmp1_); -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp2_; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = g_file_get_basename (_tmp3_); -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _tmp4_; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = g_utf8_strdown (_tmp5_, (gssize) -1); -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = _tmp6_; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (_tmp5_); -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp3_); -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" path_a = _tmp7_; -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = b; -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp8_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp10_ = media_source_get_file (_tmp9_); -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = _tmp10_; -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp12_ = g_file_get_basename (_tmp11_); -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp13_ = _tmp12_; -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp14_ = g_utf8_strdown (_tmp13_, (gssize) -1); -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp15_ = _tmp14_; -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (_tmp13_); -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp11_); -#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" path_b = _tmp15_; -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp16_ = g_strcmp0; -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp17_ = path_a; -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp18_ = g_utf8_collate_key_for_filename (_tmp17_, (gssize) -1); -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp19_ = _tmp18_; -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp20_ = path_b; -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp21_ = g_utf8_collate_key_for_filename (_tmp20_, (gssize) -1); -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp22_ = _tmp21_; -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp23_ = _tmp16_ (_tmp19_, _tmp22_); -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp24_ = (gint64) _tmp23_; -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (_tmp22_); -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (_tmp19_); -#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" _result_ = _tmp24_; -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp26_ = _result_; -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp26_ != ((gint64) 0)) { -#line 1624 "Thumbnail.c" +#line 1615 "Thumbnail.c" gint64 _tmp27_; -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp27_ = _result_; -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp25_ = _tmp27_; -#line 1630 "Thumbnail.c" +#line 1621 "Thumbnail.c" } else { void* _tmp28_; void* _tmp29_; gint64 _tmp30_; -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp28_ = a; -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp29_ = b; -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp30_ = thumbnail_photo_id_ascending_comparator (_tmp28_, _tmp29_); -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp25_ = _tmp30_; -#line 1643 "Thumbnail.c" +#line 1634 "Thumbnail.c" } -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp25_; -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (path_b); -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (path_a); -#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1653 "Thumbnail.c" +#line 1644 "Thumbnail.c" } @@ -1661,44 +1652,44 @@ gint64 thumbnail_filename_descending_comparator (void* a, void* b) { gint64 _tmp2_; gint64 _tmp3_ = 0LL; gint64 _tmp4_; -#line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = b; -#line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = a; -#line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = thumbnail_filename_ascending_comparator (_tmp0_, _tmp1_); -#line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" _result_ = _tmp2_; -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = _result_; -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_ != ((gint64) 0)) { -#line 1677 "Thumbnail.c" +#line 1668 "Thumbnail.c" gint64 _tmp5_; -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _result_; -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp5_; -#line 1683 "Thumbnail.c" +#line 1674 "Thumbnail.c" } else { void* _tmp6_; void* _tmp7_; gint64 _tmp8_; -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = a; -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = b; -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp8_; -#line 1696 "Thumbnail.c" +#line 1687 "Thumbnail.c" } -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp3_; -#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1702 "Thumbnail.c" +#line 1693 "Thumbnail.c" } @@ -1713,50 +1704,50 @@ gint64 thumbnail_rating_ascending_comparator (void* a, void* b) { Rating _tmp5_; gint64 _tmp6_ = 0LL; gint64 _tmp7_; -#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = a; -#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = media_source_get_rating (_tmp1_); -#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = b; -#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = media_source_get_rating (_tmp4_); -#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" _result_ = (gint64) (_tmp2_ - _tmp5_); -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = _result_; -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp7_ != ((gint64) 0)) { -#line 1735 "Thumbnail.c" +#line 1726 "Thumbnail.c" gint64 _tmp8_; -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = _result_; -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = _tmp8_; -#line 1741 "Thumbnail.c" +#line 1732 "Thumbnail.c" } else { void* _tmp9_; void* _tmp10_; gint64 _tmp11_; -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = a; -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp10_ = b; -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = thumbnail_photo_id_ascending_comparator (_tmp9_, _tmp10_); -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = _tmp11_; -#line 1754 "Thumbnail.c" +#line 1745 "Thumbnail.c" } -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp6_; -#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1760 "Thumbnail.c" +#line 1751 "Thumbnail.c" } @@ -1768,44 +1759,44 @@ gint64 thumbnail_rating_descending_comparator (void* a, void* b) { gint64 _tmp2_; gint64 _tmp3_ = 0LL; gint64 _tmp4_; -#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = b; -#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = a; -#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = thumbnail_rating_ascending_comparator (_tmp0_, _tmp1_); -#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" _result_ = _tmp2_; -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = _result_; -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_ != ((gint64) 0)) { -#line 1784 "Thumbnail.c" +#line 1775 "Thumbnail.c" gint64 _tmp5_; -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _result_; -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp5_; -#line 1790 "Thumbnail.c" +#line 1781 "Thumbnail.c" } else { void* _tmp6_; void* _tmp7_; gint64 _tmp8_; -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = a; -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = b; -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp8_; -#line 1803 "Thumbnail.c" +#line 1794 "Thumbnail.c" } -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp3_; -#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1809 "Thumbnail.c" +#line 1800 "Thumbnail.c" } @@ -1813,19 +1804,19 @@ gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* gboolean result = FALSE; Alteration* _tmp0_; gboolean _tmp1_; -#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); -#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = alteration; -#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "rating"); -#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp1_; -#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1829 "Thumbnail.c" +#line 1820 "Thumbnail.c" } @@ -1836,35 +1827,35 @@ static void thumbnail_real_thumbnail_altered (ThumbnailView* base) { gint _tmp2_; Dimensions _tmp3_ = {0}; gboolean _tmp4_; -#line 229 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 224 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); -#line 230 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->media; -#line 230 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala" media_source_get_dimensions (_tmp0_, PHOTO_EXCEPTION_NONE, &_tmp1_); -#line 230 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->original_dim = _tmp1_; -#line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = self->priv->scale; -#line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala" dimensions_get_scaled (&self->priv->original_dim, _tmp2_, TRUE, &_tmp3_); -#line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->dim = _tmp3_; -#line 233 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 228 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = self->priv->exposure; -#line 233 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 228 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_) { -#line 234 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 229 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); -#line 1860 "Thumbnail.c" +#line 1851 "Thumbnail.c" } else { -#line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_paint_empty (self); -#line 1864 "Thumbnail.c" +#line 1855 "Thumbnail.c" } -#line 238 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 233 "/home/jens/Source/shotwell/src/Thumbnail.vala" THUMBNAIL_VIEW_CLASS (thumbnail_parent_class)->thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_THUMBNAIL_VIEW, ThumbnailView)); -#line 1868 "Thumbnail.c" +#line 1859 "Thumbnail.c" } @@ -1876,58 +1867,58 @@ static void thumbnail_real_notify_collection_property_set (DataObject* base, con const gchar* _tmp5_; GValue* _tmp6_; GValue _tmp7_; -#line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); -#line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (name != NULL); -#line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (val != NULL); -#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = name; -#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = _tmp0_; -#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); -#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp3_ == g_quark_from_string (THUMBNAIL_PROP_SIZE)) { -#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (0) { -#line 1896 "Thumbnail.c" +#line 1887 "Thumbnail.c" default: { GValue _tmp4_; -#line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 239 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = *val; -#line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 239 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_resize (self, g_value_get_int (&_tmp4_)); -#line 245 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 240 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 1906 "Thumbnail.c" +#line 1897 "Thumbnail.c" } } } else if (_tmp3_ == g_quark_from_string (THUMBNAIL_PROP_SHOW_RATINGS)) { -#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (0) { -#line 1912 "Thumbnail.c" +#line 1903 "Thumbnail.c" default: { -#line 248 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 243 "/home/jens/Source/shotwell/src/Thumbnail.vala" data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView)); -#line 249 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 1919 "Thumbnail.c" +#line 1910 "Thumbnail.c" } } } -#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = name; -#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = old; -#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = *val; -#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" DATA_OBJECT_CLASS (thumbnail_parent_class)->notify_collection_property_set (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_DATA_OBJECT, DataObject), _tmp5_, _tmp6_, &_tmp7_); -#line 1931 "Thumbnail.c" +#line 1922 "Thumbnail.c" } @@ -1944,150 +1935,150 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) { gint _tmp9_; Dimensions _tmp10_ = {0}; gboolean _tmp11_; -#line 255 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 250 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); -#line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = new_scale; -#line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = thumbnail_get_MIN_SCALE (); -#line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = _tmp1_; -#line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" _vala_assert (_tmp0_ >= _tmp2_, "new_scale >= MIN_SCALE"); -#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = new_scale; -#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = thumbnail_get_MAX_SCALE (); -#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _tmp4_; -#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" _vala_assert (_tmp3_ <= _tmp5_, "new_scale <= MAX_SCALE"); -#line 259 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = self->priv->scale; -#line 259 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = new_scale; -#line 259 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp6_ == _tmp7_) { -#line 260 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 255 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 1974 "Thumbnail.c" +#line 1965 "Thumbnail.c" } -#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = new_scale; -#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->scale = _tmp8_; -#line 263 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = self->priv->scale; -#line 263 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" dimensions_get_scaled (&self->priv->original_dim, _tmp9_, TRUE, &_tmp10_); -#line 263 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->dim = _tmp10_; -#line 265 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 260 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cancel_async_fetch (self); -#line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = self->priv->exposure; -#line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp11_) { -#line 1992 "Thumbnail.c" +#line 1983 "Thumbnail.c" GdkPixbuf* resizable = NULL; GdkPixbuf* _tmp12_; GdkPixbuf* _tmp17_; -#line 272 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala" resizable = NULL; -#line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 268 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp12_ = self->priv->unscaled_pixbuf; -#line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 268 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp12_ != NULL) { -#line 2002 "Thumbnail.c" +#line 1993 "Thumbnail.c" GdkPixbuf* _tmp13_; GdkPixbuf* _tmp14_; -#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp13_ = self->priv->unscaled_pixbuf; -#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp14_ = _g_object_ref0 (_tmp13_); -#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); -#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" resizable = _tmp14_; -#line 2013 "Thumbnail.c" +#line 2004 "Thumbnail.c" } else { gboolean _tmp15_; -#line 275 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 270 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp15_ = checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 275 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 270 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp15_) { -#line 2020 "Thumbnail.c" +#line 2011 "Thumbnail.c" GdkPixbuf* _tmp16_; -#line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp16_ = checkerboard_item_get_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); -#line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" resizable = _tmp16_; -#line 2028 "Thumbnail.c" +#line 2019 "Thumbnail.c" } } -#line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp17_ = resizable; -#line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp17_ != NULL) { -#line 2035 "Thumbnail.c" +#line 2026 "Thumbnail.c" GdkPixbuf* _tmp18_; Dimensions _tmp19_; GdkPixbuf* _tmp20_; GdkPixbuf* _tmp21_; -#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp18_ = resizable; -#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp19_ = self->priv->dim; -#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp20_ = resize_pixbuf (_tmp18_, &_tmp19_, THUMBNAIL_LOW_QUALITY_INTERP); -#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp21_ = _tmp20_; -#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp21_); -#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp21_); -#line 2052 "Thumbnail.c" +#line 2043 "Thumbnail.c" } -#line 281 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); -#line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); -#line 2058 "Thumbnail.c" +#line 2049 "Thumbnail.c" } else { Dimensions _tmp22_; -#line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp22_ = self->priv->dim; -#line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp22_); -#line 2065 "Thumbnail.c" +#line 2056 "Thumbnail.c" } } static void thumbnail_paint_empty (Thumbnail* self) { Dimensions _tmp0_; -#line 287 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 282 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); -#line 288 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cancel_async_fetch (self); -#line 289 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 284 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->dim; -#line 289 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 284 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp0_); -#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 285 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->unscaled_pixbuf); -#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 285 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->unscaled_pixbuf = NULL; -#line 2084 "Thumbnail.c" +#line 2075 "Thumbnail.c" } static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) { -#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_low_quality_fetched ((Thumbnail*) self, pixbuf, unscaled, dim, interp, err); -#line 2091 "Thumbnail.c" +#line 2082 "Thumbnail.c" } @@ -2096,63 +2087,63 @@ static void thumbnail_schedule_low_quality_fetch (Thumbnail* self) { MediaSource* _tmp1_; Dimensions _tmp2_; GCancellable* _tmp3_; -#line 293 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 288 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); -#line 294 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 289 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cancel_async_fetch (self); -#line 295 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = g_cancellable_new (); -#line 295 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->cancellable); -#line 295 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->cancellable = _tmp0_; -#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = self->priv->media; -#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = self->priv->dim; -#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = self->priv->cancellable; -#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_SMALLEST, &_tmp2_, THUMBNAIL_LOW_QUALITY_INTERP, _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback, self, _tmp3_); -#line 2118 "Thumbnail.c" +#line 2109 "Thumbnail.c" } static gboolean _thumbnail_on_schedule_high_quality_gsource_func (gpointer self) { gboolean result; result = thumbnail_on_schedule_high_quality ((Thumbnail*) self); -#line 308 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2127 "Thumbnail.c" +#line 2118 "Thumbnail.c" } static void thumbnail_delayed_high_quality_fetch (Thumbnail* self) { gboolean _tmp0_; -#line 301 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 296 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); -#line 302 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->hq_scheduled; -#line 302 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_) { -#line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 298 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->hq_reschedule = TRUE; -#line 305 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 300 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 2143 "Thumbnail.c" +#line 2134 "Thumbnail.c" } -#line 308 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) THUMBNAIL_HQ_IMPROVEMENT_MSEC, _thumbnail_on_schedule_high_quality_gsource_func, g_object_ref (self), g_object_unref); -#line 309 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 304 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->hq_scheduled = TRUE; -#line 2149 "Thumbnail.c" +#line 2140 "Thumbnail.c" } static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) { -#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_high_quality_fetched ((Thumbnail*) self, pixbuf, unscaled, dim, interp, err); -#line 2156 "Thumbnail.c" +#line 2147 "Thumbnail.c" } @@ -2161,74 +2152,74 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { gboolean _tmp0_; GCancellable* _tmp1_; gboolean _tmp2_; -#line 312 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 307 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_THUMBNAIL (self), FALSE); -#line 313 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 308 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->hq_reschedule; -#line 313 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 308 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_) { -#line 314 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 309 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->hq_reschedule = FALSE; -#line 316 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 311 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = TRUE; -#line 316 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 311 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2177 "Thumbnail.c" +#line 2168 "Thumbnail.c" } -#line 319 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 314 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cancel_async_fetch (self); -#line 320 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 315 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = g_cancellable_new (); -#line 320 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 315 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->cancellable); -#line 320 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 315 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->cancellable = _tmp1_; -#line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 317 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = self->priv->exposure; -#line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 317 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp2_) { -#line 2191 "Thumbnail.c" +#line 2182 "Thumbnail.c" MediaSource* _tmp3_; gint _tmp4_; Dimensions _tmp5_; GCancellable* _tmp6_; -#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = self->priv->media; -#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = self->priv->scale; -#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = self->priv->dim; -#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = self->priv->cancellable; -#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp4_, &_tmp5_, THUMBNAIL_HIGH_QUALITY_INTERP, _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback, self, _tmp6_); -#line 2206 "Thumbnail.c" +#line 2197 "Thumbnail.c" } -#line 327 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->hq_scheduled = FALSE; -#line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 324 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = FALSE; -#line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 324 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2214 "Thumbnail.c" +#line 2205 "Thumbnail.c" } static void thumbnail_cancel_async_fetch (Thumbnail* self) { GCancellable* _tmp0_; -#line 332 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 327 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); -#line 334 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->cancellable; -#line 334 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_ != NULL) { -#line 2226 "Thumbnail.c" +#line 2217 "Thumbnail.c" GCancellable* _tmp1_; -#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 330 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = self->priv->cancellable; -#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 330 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_cancellable_cancel (_tmp1_); -#line 2232 "Thumbnail.c" +#line 2223 "Thumbnail.c" } } @@ -2237,73 +2228,73 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf GError* _tmp0_; GdkPixbuf* _tmp6_; GdkPixbuf* _tmp8_; -#line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); -#line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf)); -#line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail ((unscaled == NULL) || GDK_IS_PIXBUF (unscaled)); -#line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (dim != NULL); -#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = err; -#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_ != NULL) { -#line 2253 "Thumbnail.c" +#line 2244 "Thumbnail.c" gchar* _tmp1_; gchar* _tmp2_; gint _tmp3_; GError* _tmp4_; const gchar* _tmp5_; -#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = _tmp1_; -#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = self->priv->scale; -#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = err; -#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _tmp4_->message; -#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_critical ("Thumbnail.vala:341: Unable to fetch low-quality thumbnail for %s (scal" \ +#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" + g_critical ("Thumbnail.vala:336: Unable to fetch low-quality thumbnail for %s (scal" \ "e: %d): %s", _tmp2_, _tmp3_, _tmp5_); -#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (_tmp2_); -#line 2273 "Thumbnail.c" +#line 2264 "Thumbnail.c" } -#line 344 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 339 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = pixbuf; -#line 344 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 339 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp6_ != NULL) { -#line 2279 "Thumbnail.c" +#line 2270 "Thumbnail.c" GdkPixbuf* _tmp7_; -#line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = pixbuf; -#line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp7_); -#line 2285 "Thumbnail.c" +#line 2276 "Thumbnail.c" } -#line 347 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 342 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = unscaled; -#line 347 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 342 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp8_ != NULL) { -#line 2291 "Thumbnail.c" +#line 2282 "Thumbnail.c" GdkPixbuf* _tmp9_; GdkPixbuf* _tmp10_; -#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = unscaled; -#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp10_ = _g_object_ref0 (_tmp9_); -#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->unscaled_pixbuf); -#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->unscaled_pixbuf = _tmp10_; -#line 2302 "Thumbnail.c" +#line 2293 "Thumbnail.c" } -#line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); -#line 2306 "Thumbnail.c" +#line 2297 "Thumbnail.c" } @@ -2311,69 +2302,69 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu GError* _tmp0_; GdkPixbuf* _tmp6_; GdkPixbuf* _tmp8_; -#line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); -#line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf)); -#line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail ((unscaled == NULL) || GDK_IS_PIXBUF (unscaled)); -#line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (dim != NULL); -#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = err; -#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_ != NULL) { -#line 2326 "Thumbnail.c" +#line 2317 "Thumbnail.c" gchar* _tmp1_; gchar* _tmp2_; gint _tmp3_; GError* _tmp4_; const gchar* _tmp5_; -#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = _tmp1_; -#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = self->priv->scale; -#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = err; -#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _tmp4_->message; -#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_critical ("Thumbnail.vala:356: Unable to fetch high-quality thumbnail for %s (sca" \ +#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" + g_critical ("Thumbnail.vala:351: Unable to fetch high-quality thumbnail for %s (sca" \ "le: %d): %s", _tmp2_, _tmp3_, _tmp5_); -#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (_tmp2_); -#line 2346 "Thumbnail.c" +#line 2337 "Thumbnail.c" } -#line 359 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 354 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = pixbuf; -#line 359 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 354 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp6_ != NULL) { -#line 2352 "Thumbnail.c" +#line 2343 "Thumbnail.c" GdkPixbuf* _tmp7_; -#line 360 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = pixbuf; -#line 360 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp7_); -#line 2358 "Thumbnail.c" +#line 2349 "Thumbnail.c" } -#line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 357 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = unscaled; -#line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 357 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp8_ != NULL) { -#line 2364 "Thumbnail.c" +#line 2355 "Thumbnail.c" GdkPixbuf* _tmp9_; GdkPixbuf* _tmp10_; -#line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = unscaled; -#line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp10_ = _g_object_ref0 (_tmp9_); -#line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->unscaled_pixbuf); -#line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->unscaled_pixbuf = _tmp10_; -#line 2375 "Thumbnail.c" +#line 2366 "Thumbnail.c" } } @@ -2381,41 +2372,41 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu static void thumbnail_real_exposed (CheckerboardItem* base) { Thumbnail * self; gboolean _tmp0_; -#line 366 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 361 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); -#line 367 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->exposure = TRUE; -#line 369 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 364 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 369 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 364 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (!_tmp0_) { -#line 370 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 365 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_schedule_low_quality_fetch (self); -#line 2393 "Thumbnail.c" +#line 2384 "Thumbnail.c" } -#line 372 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 367 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_title (self, FALSE); -#line 373 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 368 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_comment (self, FALSE); -#line 374 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 369 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_tags (self, FALSE); -#line 376 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 371 "/home/jens/Source/shotwell/src/Thumbnail.vala" CHECKERBOARD_ITEM_CLASS (thumbnail_parent_class)->exposed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 2403 "Thumbnail.c" +#line 2394 "Thumbnail.c" } static void thumbnail_real_unexposed (CheckerboardItem* base) { Thumbnail * self; -#line 379 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 374 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); -#line 380 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 375 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->exposure = FALSE; -#line 382 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 377 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_paint_empty (self); -#line 384 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 379 "/home/jens/Source/shotwell/src/Thumbnail.vala" CHECKERBOARD_ITEM_CLASS (thumbnail_parent_class)->unexposed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 2417 "Thumbnail.c" +#line 2408 "Thumbnail.c" } @@ -2428,67 +2419,67 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, GdkPixbuf* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; Flaggable* _tmp4_; -#line 387 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 382 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); -#line 388 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 383 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->media; -#line 388 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 383 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp0_) : NULL); -#line 388 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 383 "/home/jens/Source/shotwell/src/Thumbnail.vala" flaggable = _tmp1_; -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = flaggable; -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_ != NULL) { -#line 2442 "Thumbnail.c" +#line 2433 "Thumbnail.c" Flaggable* _tmp5_; gboolean _tmp6_; -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = flaggable; -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = flaggable_is_flagged (_tmp5_); -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp6_; -#line 2451 "Thumbnail.c" +#line 2442 "Thumbnail.c" } else { -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = FALSE; -#line 2455 "Thumbnail.c" +#line 2446 "Thumbnail.c" } -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp3_) { -#line 2459 "Thumbnail.c" +#line 2450 "Thumbnail.c" GdkPixbuf* _tmp7_; -#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); -#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp2_); -#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = _tmp7_; -#line 2467 "Thumbnail.c" +#line 2458 "Thumbnail.c" } else { -#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp2_); -#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = NULL; -#line 2473 "Thumbnail.c" +#line 2464 "Thumbnail.c" } -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp2_; -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (flaggable); -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2481 "Thumbnail.c" +#line 2472 "Thumbnail.c" } static void _vala_GValue_free (GValue* self) { -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_value_unset (self); -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_free (self); -#line 2490 "Thumbnail.c" +#line 2481 "Thumbnail.c" } @@ -2505,73 +2496,73 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base GdkPixbuf* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; Rating _tmp7_; -#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 389 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); -#line 395 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->media; -#line 395 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = media_source_get_rating (_tmp0_); -#line 395 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" rating = _tmp1_; -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = g_new0 (GValue, 1); -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_value_init (_tmp2_, G_TYPE_BOOLEAN); -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_value_set_boolean (_tmp2_, FALSE); -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), THUMBNAIL_PROP_SHOW_RATINGS, _tmp2_, &_tmp3_); -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp4_ = g_value_get_boolean (&_tmp3_); -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" __vala_GValue_free0 (_tmp2_); -#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" show_ratings = _tmp4_; -#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp7_ = rating; -#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp7_ != RATING_UNRATED) { -#line 2533 "Thumbnail.c" +#line 2524 "Thumbnail.c" gboolean _tmp8_; -#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp8_ = show_ratings; -#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = _tmp8_; -#line 2539 "Thumbnail.c" +#line 2530 "Thumbnail.c" } else { -#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp6_ = FALSE; -#line 2543 "Thumbnail.c" +#line 2534 "Thumbnail.c" } -#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp6_) { -#line 2547 "Thumbnail.c" +#line 2538 "Thumbnail.c" Rating _tmp9_; gint _tmp10_; GdkPixbuf* _tmp11_; -#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp9_ = rating; -#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp10_ = scale; -#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = resources_get_rating_trinket (_tmp9_, _tmp10_); -#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp5_); -#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = _tmp11_; -#line 2561 "Thumbnail.c" +#line 2552 "Thumbnail.c" } else { -#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp5_); -#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = NULL; -#line 2567 "Thumbnail.c" +#line 2558 "Thumbnail.c" } -#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp5_; -#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala" +#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2573 "Thumbnail.c" +#line 2564 "Thumbnail.c" } @@ -2581,7 +2572,7 @@ gint thumbnail_get_MIN_SCALE (void) { result = 72; #line 18 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2583 "Thumbnail.c" +#line 2574 "Thumbnail.c" } @@ -2594,7 +2585,7 @@ gint thumbnail_get_MAX_SCALE (void) { result = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2596 "Thumbnail.c" +#line 2587 "Thumbnail.c" } @@ -2607,7 +2598,7 @@ gint thumbnail_get_DEFAULT_SCALE (void) { result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2609 "Thumbnail.c" +#line 2600 "Thumbnail.c" } @@ -2634,7 +2625,7 @@ static void thumbnail_class_init (ThumbnailClass * klass) { G_OBJECT_CLASS (klass)->get_property = _vala_thumbnail_get_property; #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" G_OBJECT_CLASS (klass)->finalize = thumbnail_finalize; -#line 2636 "Thumbnail.c" +#line 2627 "Thumbnail.c" } @@ -2651,7 +2642,7 @@ static void thumbnail_instance_init (Thumbnail * self) { self->priv->hq_reschedule = FALSE; #line 47 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->exposure = FALSE; -#line 2653 "Thumbnail.c" +#line 2644 "Thumbnail.c" } @@ -2668,13 +2659,13 @@ static void thumbnail_finalize (GObject * obj) { _tmp0_ = self->priv->cancellable; #line 73 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_ != NULL) { -#line 2670 "Thumbnail.c" +#line 2661 "Thumbnail.c" GCancellable* _tmp1_; #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = self->priv->cancellable; #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_cancellable_cancel (_tmp1_); -#line 2676 "Thumbnail.c" +#line 2667 "Thumbnail.c" } #line 76 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = tag_global; @@ -2696,7 +2687,7 @@ static void thumbnail_finalize (GObject * obj) { _g_object_unref0 (self->priv->cancellable); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" G_OBJECT_CLASS (thumbnail_parent_class)->finalize (obj); -#line 2698 "Thumbnail.c" +#line 2689 "Thumbnail.c" } @@ -2717,13 +2708,13 @@ static void _vala_thumbnail_get_property (GObject * object, guint property_id, G self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_THUMBNAIL, Thumbnail); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (property_id) { -#line 2719 "Thumbnail.c" +#line 2710 "Thumbnail.c" default: #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 2725 "Thumbnail.c" +#line 2716 "Thumbnail.c" } } -- cgit v1.2.3