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 From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/Thumbnail.c | 1972 +++++++++++++++++++++++++++---------------------------- 1 file changed, 953 insertions(+), 1019 deletions(-) (limited to 'src/Thumbnail.c') diff --git a/src/Thumbnail.c b/src/Thumbnail.c index f02ebd7..34942cc 100644 --- a/src/Thumbnail.c +++ b/src/Thumbnail.c @@ -1,4 +1,4 @@ -/* Thumbnail.c generated by valac 0.36.6, the Vala compiler +/* Thumbnail.c generated by valac 0.40.4, the Vala compiler * generated from Thumbnail.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -140,6 +141,11 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; +enum { + THUMBNAIL_0_PROPERTY, + THUMBNAIL_NUM_PROPERTIES +}; +static GParamSpec* thumbnail_properties[THUMBNAIL_NUM_PROPERTIES]; #define TYPE_SOURCE_COLLECTION (source_collection_get_type ()) #define SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOURCE_COLLECTION, SourceCollection)) @@ -431,16 +437,28 @@ extern TagSourceCollection* tag_global; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; @@ -455,25 +473,42 @@ GType thumbnail_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; #define THUMBNAIL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_THUMBNAIL, ThumbnailPrivate)) -enum { - THUMBNAIL_DUMMY_PROPERTY -}; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType container_source_get_type (void) G_GNUC_CONST; -static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking); -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); -static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered); -static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void thumbnail_on_tag_contents_altered (Thumbnail* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinking, + GeeCollection* removed, + gboolean unlinking); +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); +static void thumbnail_on_tags_altered (Thumbnail* self, + GeeMap* altered); +static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); #define CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES "show-subtitles" #define THUMBNAIL_PROP_SHOW_TAGS CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES #define THUMBNAIL_PROP_SIZE "thumbnail-size" @@ -481,232 +516,312 @@ static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollec #define THUMBNAIL_LOW_QUALITY_INTERP GDK_INTERP_NEAREST #define THUMBNAIL_HIGH_QUALITY_INTERP GDK_INTERP_BILINEAR #define THUMBNAIL_HQ_IMPROVEMENT_MSEC 100 -Thumbnail* thumbnail_new (MediaSource* media, gint scale); -Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale); +Thumbnail* thumbnail_new (MediaSource* media, + gint scale); +Thumbnail* thumbnail_construct (GType object_type, + MediaSource* media, + gint scale); GType photo_exception_get_type (void) G_GNUC_CONST; -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dimensions* result); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +void dimensions_get_scaled (Dimensions *self, + gint scale, + gboolean scale_up, + Dimensions* result); gchar* data_object_get_name (DataObject* self); gchar* media_source_get_comment (MediaSource* self); -MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); -MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); +MediaSourceItem* media_source_item_new (ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); +MediaSourceItem* media_source_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets); -static void thumbnail_update_title (Thumbnail* self, gboolean init); -static void thumbnail_update_comment (Thumbnail* self, gboolean init); -static void thumbnail_update_tags (Thumbnail* self, gboolean init); +void media_source_item_set_enable_sprockets (MediaSourceItem* self, + gboolean enable_sprockets); +static void thumbnail_update_title (Thumbnail* self, + gboolean init); +static void thumbnail_update_comment (Thumbnail* self, + gboolean init); +static void thumbnail_update_tags (Thumbnail* self, + gboolean init); GType tag_get_type (void) G_GNUC_CONST; -GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo); +GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, + MediaSource* photo); void checkerboard_item_clear_tags (CheckerboardItem* self); -void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, PangoAlignment alignment); -gboolean tag_contains (Tag* self, MediaSource* source); +void checkerboard_item_set_tags (CheckerboardItem* self, + GeeCollection* tags, + PangoAlignment alignment); +gboolean tag_contains (Tag* self, + MediaSource* source); gboolean is_string_empty (const gchar* s); void checkerboard_item_clear_title (CheckerboardItem* self); -void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +void media_source_item_set_title (MediaSourceItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); void checkerboard_item_clear_comment (CheckerboardItem* self); -void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); -static void thumbnail_real_notify_altered (DataObject* base, Alteration* alteration); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -void data_object_notify_altered (DataObject* self, Alteration* alteration); +void checkerboard_item_set_comment (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); +static void thumbnail_real_notify_altered (DataObject* base, + Alteration* alteration); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); MediaSource* thumbnail_get_media_source (Thumbnail* self); -gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b); +gint64 thumbnail_photo_id_ascending_comparator (void* a, + void* b); gint64 data_source_get_instance_id (DataSource* self); -gint64 thumbnail_photo_id_descending_comparator (void* a, void* b); -gint64 thumbnail_title_ascending_comparator (void* a, void* b); +gint64 thumbnail_photo_id_descending_comparator (void* a, + void* b); +gint64 thumbnail_title_ascending_comparator (void* a, + void* b); gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self); -gint64 thumbnail_title_descending_comparator (void* a, void* b); -gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* alteration); -gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b); +gint64 thumbnail_title_descending_comparator (void* a, + void* b); +gboolean thumbnail_title_comparator_predicate (DataObject* object, + Alteration* alteration); +gint64 thumbnail_exposure_time_ascending_comparator (void* a, + void* b); time_t media_source_get_exposure_time (MediaSource* self); -gint64 thumbnail_filename_ascending_comparator (void* a, void* b); -gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b); -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); +gint64 thumbnail_filename_ascending_comparator (void* a, + void* b); +gint64 thumbnail_exposure_time_desending_comparator (void* a, + void* b); +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); -gint64 thumbnail_rating_ascending_comparator (void* a, void* b); +gint64 thumbnail_rating_ascending_comparator (void* a, + void* b); GType rating_get_type (void) G_GNUC_CONST; Rating media_source_get_rating (MediaSource* self); -gint64 thumbnail_rating_descending_comparator (void* a, void* b); -gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* alteration); +gint64 thumbnail_rating_descending_comparator (void* a, + void* b); +gboolean thumbnail_rating_comparator_predicate (DataObject* object, + Alteration* alteration); static void thumbnail_real_thumbnail_altered (ThumbnailView* base); static void thumbnail_delayed_high_quality_fetch (Thumbnail* self); static void thumbnail_paint_empty (Thumbnail* self); -static void thumbnail_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val); -static void thumbnail_resize (Thumbnail* self, gint new_scale); +static void thumbnail_real_notify_collection_property_set (DataObject* base, + const gchar* name, + GValue* old, + GValue* val); +static void thumbnail_resize (Thumbnail* self, + gint new_scale); void data_view_notify_view_altered (DataView* self); -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); +void data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); gint thumbnail_get_MIN_SCALE (void); gint thumbnail_get_MAX_SCALE (void); static void thumbnail_cancel_async_fetch (Thumbnail* self); gboolean checkerboard_item_has_image (CheckerboardItem* self); GdkPixbuf* checkerboard_item_get_image (CheckerboardItem* self); -void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); -void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim); +void checkerboard_item_set_image (CheckerboardItem* self, + GdkPixbuf* pixbuf); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); +void checkerboard_item_clear_image (CheckerboardItem* self, + Dimensions* dim); static void thumbnail_schedule_low_quality_fetch (Thumbnail* self); -void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); +void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, + gint scale, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; -static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err); -static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self); +static void thumbnail_on_low_quality_fetched (Thumbnail* self, + GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err); +static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self); static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self); static gboolean _thumbnail_on_schedule_high_quality_gsource_func (gpointer self); -static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err); -static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self); +static void thumbnail_on_high_quality_fetched (Thumbnail* self, + GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err); +static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self); gchar* data_object_to_string (DataObject* self); static void thumbnail_real_exposed (CheckerboardItem* base); void checkerboard_item_exposed (CheckerboardItem* self); static void thumbnail_real_unexposed (CheckerboardItem* base); void checkerboard_item_unexposed (CheckerboardItem* self); -static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, gint scale); +static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, + gint scale); GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); -GdkPixbuf* resources_get_icon (const gchar* name, gint scale); +GdkPixbuf* resources_get_icon (const gchar* name, + gint scale); #define RESOURCES_ICON_FLAGGED_TRINKET "flag-trinket.png" #define RESOURCES_DEFAULT_ICON_SCALE 24 -static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base, gint scale); -void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result); +static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base, + gint scale); +void data_object_get_collection_property (DataObject* self, + const gchar* name, + GValue* def, + GValue* result); static void _vala_GValue_free (GValue* self); -GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale); +GdkPixbuf* resources_get_rating_trinket (Rating rating, + gint scale); gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self); gint thumbnail_get_DEFAULT_SCALE (void); static void thumbnail_finalize (GObject * obj); -static void _vala_thumbnail_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); - - -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) { +static void _vala_thumbnail_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); + + +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 585 "Thumbnail.c" +#line 726 "Thumbnail.c" } -static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +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 592 "Thumbnail.c" +#line 737 "Thumbnail.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" return self ? g_object_ref (self) : NULL; -#line 599 "Thumbnail.c" +#line 746 "Thumbnail.c" } -Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale) { +Thumbnail* +thumbnail_construct (GType object_type, + MediaSource* media, + gint scale) +{ Thumbnail * self = NULL; - MediaSource* _tmp0_; - MediaSource* _tmp1_; - Dimensions _tmp2_ = {0}; - gint _tmp3_; - Dimensions _tmp4_ = {0}; - MediaSource* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - MediaSource* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - MediaSource* _tmp11_; - MediaSource* _tmp12_; - gint _tmp13_; - TagSourceCollection* _tmp14_; - TagSourceCollection* _tmp15_; - gboolean _tmp16_ = FALSE; - MediaSource* _tmp17_; - MediaSource* _tmp19_; - MediaSource* _tmp20_; - Dimensions _tmp21_ = {0}; - gint _tmp22_; - Dimensions _tmp23_ = {0}; + Dimensions _tmp0_ = {0}; + Dimensions _tmp1_ = {0}; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + MediaSource* _tmp6_; + TagSourceCollection* _tmp7_; + TagSourceCollection* _tmp8_; + gboolean _tmp9_ = FALSE; + Dimensions _tmp10_ = {0}; + Dimensions _tmp11_ = {0}; #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = media; + media_source_get_dimensions (media, PHOTO_EXCEPTION_NONE, &_tmp0_); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = media; + dimensions_get_scaled (&_tmp0_, scale, TRUE, &_tmp1_); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - media_source_get_dimensions (_tmp1_, PHOTO_EXCEPTION_NONE, &_tmp2_); + _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_DATA_OBJECT, DataObject)); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = scale; -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - dimensions_get_scaled (&_tmp2_, _tmp3_, TRUE, &_tmp4_); -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = media; -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _tmp6_; -#line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = media; + _tmp3_ = _tmp2_; #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = media_source_get_comment (_tmp8_); + _tmp4_ = media_source_get_comment (media); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self = (Thumbnail*) media_source_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp4_, _tmp7_, _tmp10_, FALSE, PANGO_ALIGN_LEFT); + self = (Thumbnail*) media_source_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp1_, _tmp3_, _tmp5_, FALSE, PANGO_ALIGN_LEFT); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp5_); #line 50 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp7_); -#line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = media; + _g_free0 (_tmp3_); #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp6_ = _g_object_ref0 (media); #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->media); #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->media = _tmp12_; -#line 54 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = scale; + self->priv->media = _tmp6_; #line 54 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->scale = _tmp13_; + self->priv->scale = scale; #line 56 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = tag_global; + _tmp7_ = tag_global; #line 56 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), "container-contents-altered", (GCallback) _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), "container-contents-altered", (GCallback) _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered, self, 0); #line 57 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp15_ = tag_global; + _tmp8_ = tag_global; #line 57 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _thumbnail_on_tags_altered_data_collection_items_altered, self, 0); -#line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp17_ = media; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _thumbnail_on_tags_altered_data_collection_items_altered, self, 0); #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_LIBRARY_PHOTO)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_LIBRARY_PHOTO)) { #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp16_ = TRUE; -#line 684 "Thumbnail.c" + _tmp9_ = TRUE; +#line 808 "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 691 "Thumbnail.c" + _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_VIDEO); +#line 812 "Thumbnail.c" } #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _vala_assert (_tmp16_, "(media is LibraryPhoto) || (media is Video)"); -#line 60 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp19_ = media; + _vala_assert (_tmp9_, "(media is LibraryPhoto) || (media is Video)"); #line 60 "/home/jens/Source/shotwell/src/Thumbnail.vala" - media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO)); + media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_VIDEO)); #line 62 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp20_ = media; + media_source_get_dimensions (media, PHOTO_EXCEPTION_NONE, &_tmp10_); #line 62 "/home/jens/Source/shotwell/src/Thumbnail.vala" - media_source_get_dimensions (_tmp20_, PHOTO_EXCEPTION_NONE, &_tmp21_); -#line 62 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->original_dim = _tmp21_; -#line 63 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp22_ = scale; + self->priv->original_dim = _tmp10_; #line 63 "/home/jens/Source/shotwell/src/Thumbnail.vala" - dimensions_get_scaled (&self->priv->original_dim, _tmp22_, TRUE, &_tmp23_); + dimensions_get_scaled (&self->priv->original_dim, scale, TRUE, &_tmp11_); #line 63 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->dim = _tmp23_; + self->priv->dim = _tmp11_; #line 67 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_title (self, TRUE); #line 68 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -715,18 +830,24 @@ 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 719 "Thumbnail.c" +#line 834 "Thumbnail.c" } -Thumbnail* thumbnail_new (MediaSource* media, gint scale) { +Thumbnail* +thumbnail_new (MediaSource* media, + gint scale) +{ #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala" return thumbnail_construct (TYPE_THUMBNAIL, media, scale); -#line 726 "Thumbnail.c" +#line 844 "Thumbnail.c" } -static void thumbnail_update_tags (Thumbnail* self, gboolean init) { +static void +thumbnail_update_tags (Thumbnail* self, + gboolean init) +{ GeeCollection* tags = NULL; TagSourceCollection* _tmp0_; MediaSource* _tmp1_; @@ -749,7 +870,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 753 "Thumbnail.c" +#line 874 "Thumbnail.c" } else { GeeCollection* _tmp5_; gint _tmp6_; @@ -762,37 +883,42 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) { _tmp7_ = _tmp6_; #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp7_ == 0; -#line 766 "Thumbnail.c" +#line 887 "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 772 "Thumbnail.c" +#line 893 "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 779 "Thumbnail.c" +#line 900 "Thumbnail.c" } #line 80 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (tags); -#line 783 "Thumbnail.c" +#line 904 "Thumbnail.c" } -static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking) { +static void +thumbnail_on_tag_contents_altered (Thumbnail* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinking, + GeeCollection* removed, + gboolean unlinking) +{ gboolean _tmp0_; gboolean _tmp1_ = FALSE; - GeeCollection* _tmp2_; gboolean tag_added = FALSE; - gboolean _tmp6_ = FALSE; - GeeCollection* _tmp7_; + gboolean _tmp3_ = FALSE; gboolean tag_removed = FALSE; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_; + gboolean _tmp5_ = FALSE; + gboolean _tmp6_; #line 88 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 88 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -807,81 +933,68 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* if (!_tmp0_) { #line 91 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 811 "Thumbnail.c" +#line 937 "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 817 "Thumbnail.c" - GeeCollection* _tmp3_; - MediaSource* _tmp4_; - gboolean _tmp5_; -#line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = added; -#line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = self->priv->media; + if (added != NULL) { +#line 941 "Thumbnail.c" + MediaSource* _tmp2_; #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); + _tmp2_ = self->priv->media; #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = _tmp5_; -#line 829 "Thumbnail.c" + _tmp1_ = gee_collection_contains (added, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource)); +#line 947 "Thumbnail.c" } else { #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = FALSE; -#line 833 "Thumbnail.c" +#line 951 "Thumbnail.c" } #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala" tag_added = _tmp1_; #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = removed; -#line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp7_ != NULL) { -#line 841 "Thumbnail.c" - GeeCollection* _tmp8_; - MediaSource* _tmp9_; - gboolean _tmp10_; -#line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = removed; -#line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = self->priv->media; + if (removed != NULL) { +#line 957 "Thumbnail.c" + MediaSource* _tmp4_; #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = gee_collection_contains (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource)); + _tmp4_ = self->priv->media; #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp10_; -#line 853 "Thumbnail.c" + _tmp3_ = gee_collection_contains (removed, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); +#line 963 "Thumbnail.c" } else { #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = FALSE; -#line 857 "Thumbnail.c" + _tmp3_ = FALSE; +#line 967 "Thumbnail.c" } #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala" - tag_removed = _tmp6_; + tag_removed = _tmp3_; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = tag_added; + _tmp6_ = tag_added; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp12_) { + if (_tmp6_) { #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = TRUE; -#line 867 "Thumbnail.c" + _tmp5_ = TRUE; +#line 977 "Thumbnail.c" } else { - gboolean _tmp13_; + gboolean _tmp7_; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = tag_removed; + _tmp7_ = tag_removed; #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = _tmp13_; -#line 874 "Thumbnail.c" + _tmp5_ = _tmp7_; +#line 984 "Thumbnail.c" } #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp11_) { + if (_tmp5_) { #line 98 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_tags (self, FALSE); -#line 880 "Thumbnail.c" +#line 990 "Thumbnail.c" } } -static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { +static void +thumbnail_on_tags_altered (Thumbnail* self, + GeeMap* altered) +{ gboolean _tmp0_; #line 101 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); @@ -893,76 +1006,67 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) { if (!_tmp0_) { #line 103 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 897 "Thumbnail.c" +#line 1010 "Thumbnail.c" } { GeeIterator* _object_it = NULL; - GeeMap* _tmp1_; + GeeSet* _tmp1_; GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; + GeeIterator* _tmp4_; GeeIterator* _tmp5_; - GeeIterator* _tmp6_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = altered; + _tmp1_ = gee_map_get_keys (altered); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = gee_map_get_keys (_tmp1_); + _tmp2_ = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = _tmp2_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _tmp3_; + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp5_ = _tmp4_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp5_; + _g_object_unref0 (_tmp3_); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp4_); -#line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _object_it = _tmp6_; + _object_it = _tmp5_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" while (TRUE) { -#line 925 "Thumbnail.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 1035 "Thumbnail.c" + GeeIterator* _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; Tag* tag = NULL; - DataObject* _tmp11_; - Tag* _tmp12_; - Tag* _tmp13_; - MediaSource* _tmp14_; - gboolean _tmp15_; -#line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _object_it; + DataObject* _tmp9_; + Tag* _tmp10_; + Tag* _tmp11_; + MediaSource* _tmp12_; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp6_ = _object_it; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp6_)) { #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 945 "Thumbnail.c" +#line 1051 "Thumbnail.c" } #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = _object_it; + _tmp7_ = _object_it; #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" - object = (DataObject*) _tmp10_; + object = (DataObject*) _tmp8_; #line 106 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = object; + _tmp9_ = object; #line 106 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TAG, Tag)); + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_TAG, Tag)); #line 106 "/home/jens/Source/shotwell/src/Thumbnail.vala" - tag = _tmp12_; -#line 108 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = tag; + tag = _tmp10_; #line 108 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = self->priv->media; + _tmp11_ = tag; #line 108 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp15_ = tag_contains (_tmp13_, _tmp14_); + _tmp12_ = self->priv->media; #line 108 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp15_) { + if (tag_contains (_tmp11_, _tmp12_)) { #line 109 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_tags (self, FALSE); #line 111 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -971,27 +1075,29 @@ 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 975 "Thumbnail.c" +#line 1079 "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 981 "Thumbnail.c" +#line 1085 "Thumbnail.c" } #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_object_it); -#line 985 "Thumbnail.c" +#line 1089 "Thumbnail.c" } } -static void thumbnail_update_title (Thumbnail* self, gboolean init) { +static void +thumbnail_update_title (Thumbnail* self, + gboolean init) +{ gchar* title = NULL; MediaSource* _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; #line 116 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 117 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -1003,39 +1109,36 @@ static void thumbnail_update_title (Thumbnail* self, gboolean init) { #line 118 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = title; #line 118 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 118 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp3_) { + if (is_string_empty (_tmp2_)) { #line 119 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1012 "Thumbnail.c" +#line 1116 "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 1019 "Thumbnail.c" - const gchar* _tmp5_; + if (!init) { +#line 1120 "Thumbnail.c" + const gchar* _tmp3_; #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = title; + _tmp3_ = 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 1025 "Thumbnail.c" + media_source_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), _tmp3_, FALSE, PANGO_ALIGN_LEFT); +#line 1126 "Thumbnail.c" } } #line 116 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (title); -#line 1030 "Thumbnail.c" +#line 1131 "Thumbnail.c" } -static void thumbnail_update_comment (Thumbnail* self, gboolean init) { +static void +thumbnail_update_comment (Thumbnail* self, + gboolean init) +{ gchar* comment = NULL; MediaSource* _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; #line 124 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 125 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -1047,40 +1150,37 @@ static void thumbnail_update_comment (Thumbnail* self, gboolean init) { #line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = comment; #line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp3_) { + if (is_string_empty (_tmp2_)) { #line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala" checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1056 "Thumbnail.c" +#line 1157 "Thumbnail.c" } else { - gboolean _tmp4_; -#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = init; #line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (!_tmp4_) { -#line 1063 "Thumbnail.c" - const gchar* _tmp5_; + if (!init) { +#line 1161 "Thumbnail.c" + const gchar* _tmp3_; #line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = comment; + _tmp3_ = comment; #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 1069 "Thumbnail.c" + checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp3_, FALSE, PANGO_ALIGN_LEFT); +#line 1167 "Thumbnail.c" } } #line 124 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (comment); -#line 1074 "Thumbnail.c" +#line 1172 "Thumbnail.c" } -static void thumbnail_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +thumbnail_real_notify_altered (DataObject* base, + Alteration* alteration) +{ Thumbnail * self; gboolean _tmp0_ = FALSE; gboolean _tmp1_; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; - Alteration* _tmp8_; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_; #line 132 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); #line 132 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -1089,61 +1189,47 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat _tmp1_ = self->priv->exposure; #line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp1_) { -#line 1093 "Thumbnail.c" - Alteration* _tmp2_; - gboolean _tmp3_; #line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = alteration; -#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = alteration_has_detail (_tmp2_, "metadata", "name"); -#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = _tmp3_; -#line 1102 "Thumbnail.c" + _tmp0_ = alteration_has_detail (alteration, "metadata", "name"); +#line 1195 "Thumbnail.c" } else { #line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = FALSE; -#line 1106 "Thumbnail.c" +#line 1199 "Thumbnail.c" } #line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_) { #line 134 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_title (self, FALSE); -#line 1112 "Thumbnail.c" +#line 1205 "Thumbnail.c" } #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = self->priv->exposure; -#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp5_) { -#line 1118 "Thumbnail.c" - Alteration* _tmp6_; - gboolean _tmp7_; -#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = alteration; + _tmp3_ = self->priv->exposure; #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = alteration_has_detail (_tmp6_, "metadata", "comment"); + if (_tmp3_) { #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _tmp7_; -#line 1127 "Thumbnail.c" + _tmp2_ = alteration_has_detail (alteration, "metadata", "comment"); +#line 1213 "Thumbnail.c" } else { #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = FALSE; -#line 1131 "Thumbnail.c" + _tmp2_ = FALSE; +#line 1217 "Thumbnail.c" } #line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_) { + if (_tmp2_) { #line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_comment (self, FALSE); -#line 1137 "Thumbnail.c" +#line 1223 "Thumbnail.c" } #line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = alteration; -#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 1143 "Thumbnail.c" + 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), alteration); +#line 1227 "Thumbnail.c" } -MediaSource* thumbnail_get_media_source (Thumbnail* self) { +MediaSource* +thumbnail_get_media_source (Thumbnail* self) +{ MediaSource* result = NULL; MediaSource* _tmp0_; MediaSource* _tmp1_; @@ -1157,670 +1243,519 @@ MediaSource* thumbnail_get_media_source (Thumbnail* self) { result = _tmp1_; #line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1161 "Thumbnail.c" +#line 1247 "Thumbnail.c" } -gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_photo_id_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; + MediaSource* _tmp0_; MediaSource* _tmp1_; - gint64 _tmp2_; - void* _tmp3_; - MediaSource* _tmp4_; - gint64 _tmp5_; -#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = a; -#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#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 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = b; #line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_THUMBNAIL, Thumbnail)->priv->media; #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)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp2_ - _tmp5_; + result = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)) - data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); #line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1189 "Thumbnail.c" +#line 1266 "Thumbnail.c" } -gint64 thumbnail_photo_id_descending_comparator (void* a, void* b) { +gint64 +thumbnail_photo_id_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; #line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_photo_id_ascending_comparator (_tmp0_, _tmp1_); -#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp2_; + result = thumbnail_photo_id_ascending_comparator (b, a); #line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1208 "Thumbnail.c" +#line 1279 "Thumbnail.c" } -gint64 thumbnail_title_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_title_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; GCompareFunc _tmp0_; - void* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - void* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gint _tmp7_; - gint64 _tmp8_; - gint64 _tmp9_ = 0LL; - gint64 _tmp10_; + gchar* _tmp4_; + gint64 _tmp5_; + gint64 _tmp6_ = 0LL; + gint64 _tmp7_; #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = g_strcmp0; #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; -#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)); + _tmp1_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp2_; -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = b; + _tmp2_ = _tmp1_; #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)); + _tmp3_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _tmp0_ (_tmp3_, _tmp6_); + _tmp5_ = (gint64) _tmp0_ (_tmp2_, _tmp4_); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = (gint64) _tmp7_; + _g_free0 (_tmp4_); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp2_); #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp3_); -#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp8_; + _result_ = _tmp5_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp10_ != ((gint64) 0)) { -#line 1254 "Thumbnail.c" - gint64 _tmp11_; + if (_tmp7_ != ((gint64) 0)) { +#line 1319 "Thumbnail.c" + gint64 _tmp8_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = _result_; + _tmp8_ = _result_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = _tmp11_; -#line 1260 "Thumbnail.c" + _tmp6_ = _tmp8_; +#line 1325 "Thumbnail.c" } else { - void* _tmp12_; - void* _tmp13_; - gint64 _tmp14_; -#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = a; -#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = b; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = thumbnail_photo_id_ascending_comparator (_tmp12_, _tmp13_); -#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = _tmp14_; -#line 1273 "Thumbnail.c" + _tmp6_ = thumbnail_photo_id_ascending_comparator (a, b); +#line 1329 "Thumbnail.c" } #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp9_; + result = _tmp6_; #line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1279 "Thumbnail.c" +#line 1335 "Thumbnail.c" } -gint64 thumbnail_title_descending_comparator (void* a, void* b) { +gint64 +thumbnail_title_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; - gint64 _tmp3_ = 0LL; - gint64 _tmp4_; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; + gint64 _tmp0_ = 0LL; + gint64 _tmp1_; #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_title_ascending_comparator (_tmp0_, _tmp1_); -#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp2_; + _result_ = thumbnail_title_ascending_comparator (b, a); #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _result_; + _tmp1_ = _result_; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_ != ((gint64) 0)) { -#line 1303 "Thumbnail.c" - gint64 _tmp5_; + if (_tmp1_ != ((gint64) 0)) { +#line 1353 "Thumbnail.c" + gint64 _tmp2_; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp5_; -#line 1309 "Thumbnail.c" + _tmp0_ = _tmp2_; +#line 1359 "Thumbnail.c" } else { - void* _tmp6_; - void* _tmp7_; - gint64 _tmp8_; -#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = a; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = b; -#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp8_; -#line 1322 "Thumbnail.c" + _tmp0_ = thumbnail_photo_id_descending_comparator (a, b); +#line 1363 "Thumbnail.c" } #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp3_; + result = _tmp0_; #line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1328 "Thumbnail.c" +#line 1369 "Thumbnail.c" } -gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +thumbnail_title_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 168 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 168 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = alteration; -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "title"); -#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "title"); #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1348 "Thumbnail.c" +#line 1386 "Thumbnail.c" } -gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_exposure_time_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 time_a = 0LL; - void* _tmp0_; - MediaSource* _tmp1_; - time_t _tmp2_; + MediaSource* _tmp0_; gint64 time_b = 0LL; - void* _tmp3_; - MediaSource* _tmp4_; - time_t _tmp5_; + MediaSource* _tmp1_; gint64 _result_ = 0LL; - gint64 _tmp6_; - gint64 _tmp7_; - gint64 _tmp8_ = 0LL; - gint64 _tmp9_; -#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = a; -#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + gint64 _tmp2_; + gint64 _tmp3_; + gint64 _tmp4_ = 0LL; + gint64 _tmp5_; #line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = media_source_get_exposure_time (_tmp1_); + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala" - time_a = (gint64) _tmp2_; -#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = b; + time_a = (gint64) media_source_get_exposure_time (_tmp0_); #line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = media_source_get_exposure_time (_tmp4_); -#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala" - time_b = (gint64) _tmp5_; + time_b = (gint64) media_source_get_exposure_time (_tmp1_); #line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = time_a; + _tmp2_ = time_a; #line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = time_b; + _tmp3_ = time_b; #line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp6_ - _tmp7_; + _result_ = _tmp2_ - _tmp3_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = _result_; + _tmp5_ = _result_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp9_ != ((gint64) 0)) { -#line 1393 "Thumbnail.c" - gint64 _tmp10_; + if (_tmp5_ != ((gint64) 0)) { +#line 1422 "Thumbnail.c" + gint64 _tmp6_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _result_; + _tmp6_ = _result_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = _tmp10_; -#line 1399 "Thumbnail.c" + _tmp4_ = _tmp6_; +#line 1428 "Thumbnail.c" } else { - void* _tmp11_; - void* _tmp12_; - gint64 _tmp13_; -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = a; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = b; -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = thumbnail_filename_ascending_comparator (_tmp11_, _tmp12_); -#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = _tmp13_; -#line 1412 "Thumbnail.c" + _tmp4_ = thumbnail_filename_ascending_comparator (a, b); +#line 1432 "Thumbnail.c" } #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp8_; + result = _tmp4_; #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1418 "Thumbnail.c" +#line 1438 "Thumbnail.c" } -gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) { +gint64 +thumbnail_exposure_time_desending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; - gint64 _tmp3_ = 0LL; - gint64 _tmp4_; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; + gint64 _tmp0_ = 0LL; + gint64 _tmp1_; #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_exposure_time_ascending_comparator (_tmp0_, _tmp1_); -#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp2_; + _result_ = thumbnail_exposure_time_ascending_comparator (b, a); #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _result_; + _tmp1_ = _result_; #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_ != ((gint64) 0)) { -#line 1442 "Thumbnail.c" - gint64 _tmp5_; + if (_tmp1_ != ((gint64) 0)) { +#line 1456 "Thumbnail.c" + gint64 _tmp2_; #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp5_; -#line 1448 "Thumbnail.c" + _tmp0_ = _tmp2_; +#line 1462 "Thumbnail.c" } else { - void* _tmp6_; - void* _tmp7_; - gint64 _tmp8_; -#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = a; -#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = b; -#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = thumbnail_filename_descending_comparator (_tmp6_, _tmp7_); #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp8_; -#line 1461 "Thumbnail.c" + _tmp0_ = thumbnail_filename_descending_comparator (a, b); +#line 1466 "Thumbnail.c" } #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp3_; + result = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1467 "Thumbnail.c" +#line 1472 "Thumbnail.c" } -gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +thumbnail_exposure_time_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 186 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 186 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = alteration; -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time"); -#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "exposure-time"); #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1487 "Thumbnail.c" +#line 1489 "Thumbnail.c" } -gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +thumbnail_filename_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 190 "/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" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = alteration; -#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "filename"); -#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "filename"); #line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1507 "Thumbnail.c" +#line 1506 "Thumbnail.c" } -gint64 thumbnail_filename_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_filename_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gchar* path_a = NULL; - void* _tmp0_; - MediaSource* _tmp1_; + MediaSource* _tmp0_; + GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; gchar* path_b = NULL; - void* _tmp8_; - MediaSource* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; + MediaSource* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; gint64 _result_ = 0LL; - GCompareFunc _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; + GCompareFunc _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; gchar* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gint _tmp23_; - gint64 _tmp24_; - gint64 _tmp25_ = 0LL; - gint64 _tmp26_; -#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = a; + gchar* _tmp20_; + gint64 _tmp21_; + gint64 _tmp22_ = 0LL; + gint64 _tmp23_; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = media_source_get_file (_tmp1_); + _tmp1_ = media_source_get_file (_tmp0_); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = g_file_get_basename (_tmp3_); + _tmp3_ = g_file_get_basename (_tmp2_); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = g_utf8_strdown (_tmp5_, (gssize) -1); + _tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala" - path_a = _tmp7_; + path_a = _tmp6_; +#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = b; + _tmp8_ = media_source_get_file (_tmp7_); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp8_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp9_ = _tmp8_; #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = media_source_get_file (_tmp9_); + _tmp10_ = g_file_get_basename (_tmp9_); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp11_ = _tmp10_; #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = g_file_get_basename (_tmp11_); + _tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp13_ = _tmp12_; #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = g_utf8_strdown (_tmp13_, (gssize) -1); -#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp15_ = _tmp14_; + _g_free0 (_tmp11_); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp11_); -#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala" - path_b = _tmp15_; -#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp16_ = g_strcmp0; + path_b = _tmp13_; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp17_ = path_a; + _tmp14_ = g_strcmp0; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp18_ = g_utf8_collate_key_for_filename (_tmp17_, (gssize) -1); + _tmp15_ = path_a; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp19_ = _tmp18_; + _tmp16_ = g_utf8_collate_key_for_filename (_tmp15_, (gssize) -1); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp20_ = path_b; + _tmp17_ = _tmp16_; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp21_ = g_utf8_collate_key_for_filename (_tmp20_, (gssize) -1); + _tmp18_ = path_b; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp22_ = _tmp21_; + _tmp19_ = g_utf8_collate_key_for_filename (_tmp18_, (gssize) -1); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp23_ = _tmp16_ (_tmp19_, _tmp22_); + _tmp20_ = _tmp19_; #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp24_ = (gint64) _tmp23_; + _tmp21_ = (gint64) _tmp14_ (_tmp17_, _tmp20_); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp20_); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp17_); #line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp24_; + _result_ = _tmp21_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp26_ = _result_; + _tmp23_ = _result_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp26_ != ((gint64) 0)) { -#line 1615 "Thumbnail.c" - gint64 _tmp27_; + if (_tmp23_ != ((gint64) 0)) { +#line 1608 "Thumbnail.c" + gint64 _tmp24_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp27_ = _result_; + _tmp24_ = _result_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp25_ = _tmp27_; -#line 1621 "Thumbnail.c" + _tmp22_ = _tmp24_; +#line 1614 "Thumbnail.c" } else { - void* _tmp28_; - void* _tmp29_; - gint64 _tmp30_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp28_ = a; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp29_ = b; -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp30_ = thumbnail_photo_id_ascending_comparator (_tmp28_, _tmp29_); -#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp25_ = _tmp30_; -#line 1634 "Thumbnail.c" + _tmp22_ = thumbnail_photo_id_ascending_comparator (a, b); +#line 1618 "Thumbnail.c" } #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp25_; + result = _tmp22_; #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (path_b); #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_free0 (path_a); #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1644 "Thumbnail.c" +#line 1628 "Thumbnail.c" } -gint64 thumbnail_filename_descending_comparator (void* a, void* b) { +gint64 +thumbnail_filename_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; - gint64 _tmp3_ = 0LL; - gint64 _tmp4_; + gint64 _tmp0_ = 0LL; + gint64 _tmp1_; #line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; -#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; -#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_filename_ascending_comparator (_tmp0_, _tmp1_); -#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp2_; + _result_ = thumbnail_filename_ascending_comparator (b, a); #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _result_; + _tmp1_ = _result_; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_ != ((gint64) 0)) { -#line 1668 "Thumbnail.c" - gint64 _tmp5_; + if (_tmp1_ != ((gint64) 0)) { +#line 1646 "Thumbnail.c" + gint64 _tmp2_; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp5_; -#line 1674 "Thumbnail.c" + _tmp0_ = _tmp2_; +#line 1652 "Thumbnail.c" } else { - void* _tmp6_; - void* _tmp7_; - gint64 _tmp8_; -#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = a; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = b; -#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp8_; -#line 1687 "Thumbnail.c" + _tmp0_ = thumbnail_photo_id_descending_comparator (a, b); +#line 1656 "Thumbnail.c" } #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp3_; + result = _tmp0_; #line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1693 "Thumbnail.c" +#line 1662 "Thumbnail.c" } -gint64 thumbnail_rating_ascending_comparator (void* a, void* b) { +gint64 +thumbnail_rating_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; + MediaSource* _tmp0_; MediaSource* _tmp1_; - Rating _tmp2_; - void* _tmp3_; - MediaSource* _tmp4_; - Rating _tmp5_; - gint64 _tmp6_ = 0LL; - gint64 _tmp7_; -#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = a; -#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media; -#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = media_source_get_rating (_tmp1_); + gint64 _tmp2_ = 0LL; + gint64 _tmp3_; #line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = b; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) a, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) b, TYPE_THUMBNAIL, Thumbnail)->priv->media; #line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = media_source_get_rating (_tmp4_); -#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = (gint64) (_tmp2_ - _tmp5_); + _result_ = (gint64) (media_source_get_rating (_tmp0_) - media_source_get_rating (_tmp1_)); #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = _result_; + _tmp3_ = _result_; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp7_ != ((gint64) 0)) { -#line 1726 "Thumbnail.c" - gint64 _tmp8_; + if (_tmp3_ != ((gint64) 0)) { +#line 1686 "Thumbnail.c" + gint64 _tmp4_; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = _result_; + _tmp4_ = _result_; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp8_; -#line 1732 "Thumbnail.c" + _tmp2_ = _tmp4_; +#line 1692 "Thumbnail.c" } else { - void* _tmp9_; - void* _tmp10_; - gint64 _tmp11_; -#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = a; -#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = b; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = thumbnail_photo_id_ascending_comparator (_tmp9_, _tmp10_); -#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp11_; -#line 1745 "Thumbnail.c" + _tmp2_ = thumbnail_photo_id_ascending_comparator (a, b); +#line 1696 "Thumbnail.c" } #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp6_; + result = _tmp2_; #line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1751 "Thumbnail.c" +#line 1702 "Thumbnail.c" } -gint64 thumbnail_rating_descending_comparator (void* a, void* b) { +gint64 +thumbnail_rating_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; gint64 _result_ = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; - gint64 _tmp3_ = 0LL; - gint64 _tmp4_; + gint64 _tmp0_ = 0LL; + gint64 _tmp1_; #line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = b; -#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = a; -#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = thumbnail_rating_ascending_comparator (_tmp0_, _tmp1_); -#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _result_ = _tmp2_; + _result_ = thumbnail_rating_ascending_comparator (b, a); #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = _result_; + _tmp1_ = _result_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp4_ != ((gint64) 0)) { -#line 1775 "Thumbnail.c" - gint64 _tmp5_; + if (_tmp1_ != ((gint64) 0)) { +#line 1720 "Thumbnail.c" + gint64 _tmp2_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp5_; -#line 1781 "Thumbnail.c" + _tmp0_ = _tmp2_; +#line 1726 "Thumbnail.c" } else { - void* _tmp6_; - void* _tmp7_; - gint64 _tmp8_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = a; -#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = b; -#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_); -#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp8_; -#line 1794 "Thumbnail.c" + _tmp0_ = thumbnail_photo_id_descending_comparator (a, b); +#line 1730 "Thumbnail.c" } #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp3_; + result = _tmp0_; #line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1800 "Thumbnail.c" +#line 1736 "Thumbnail.c" } -gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +thumbnail_rating_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = alteration; -#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "rating"); -#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "rating"); #line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 1820 "Thumbnail.c" +#line 1753 "Thumbnail.c" } -static void thumbnail_real_thumbnail_altered (ThumbnailView* base) { +static void +thumbnail_real_thumbnail_altered (ThumbnailView* base) +{ Thumbnail * self; MediaSource* _tmp0_; Dimensions _tmp1_ = {0}; @@ -1847,26 +1782,28 @@ static void thumbnail_real_thumbnail_altered (ThumbnailView* base) { if (_tmp4_) { #line 229 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); -#line 1851 "Thumbnail.c" +#line 1786 "Thumbnail.c" } else { #line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_paint_empty (self); -#line 1855 "Thumbnail.c" +#line 1790 "Thumbnail.c" } #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 1859 "Thumbnail.c" +#line 1794 "Thumbnail.c" } -static void thumbnail_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val) { +static void +thumbnail_real_notify_collection_property_set (DataObject* base, + const gchar* name, + GValue* old, + GValue* val) +{ Thumbnail * self; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; - const gchar* _tmp5_; - GValue* _tmp6_; - GValue _tmp7_; + GQuark _tmp2_ = 0U; + GValue _tmp4_; #line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); #line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -1876,188 +1813,172 @@ static void thumbnail_real_notify_collection_property_set (DataObject* base, con #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = name; #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = _tmp0_; -#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp3_ == g_quark_from_string (THUMBNAIL_PROP_SIZE)) { + if (_tmp2_ == g_quark_from_string (THUMBNAIL_PROP_SIZE)) { #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (0) { -#line 1887 "Thumbnail.c" +#line 1822 "Thumbnail.c" default: { - GValue _tmp4_; + GValue _tmp3_; #line 239 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = *val; + _tmp3_ = *val; #line 239 "/home/jens/Source/shotwell/src/Thumbnail.vala" - thumbnail_resize (self, g_value_get_int (&_tmp4_)); + thumbnail_resize (self, g_value_get_int (&_tmp3_)); #line 240 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 1897 "Thumbnail.c" +#line 1832 "Thumbnail.c" } } - } else if (_tmp3_ == g_quark_from_string (THUMBNAIL_PROP_SHOW_RATINGS)) { + } else if (_tmp2_ == g_quark_from_string (THUMBNAIL_PROP_SHOW_RATINGS)) { #line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (0) { -#line 1903 "Thumbnail.c" +#line 1838 "Thumbnail.c" default: { #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 244 "/home/jens/Source/shotwell/src/Thumbnail.vala" break; -#line 1910 "Thumbnail.c" +#line 1845 "Thumbnail.c" } } } #line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = name; -#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = old; -#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = *val; + _tmp4_ = *val; #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 1922 "Thumbnail.c" + 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), name, old, &_tmp4_); +#line 1853 "Thumbnail.c" } -static void thumbnail_resize (Thumbnail* self, gint new_scale) { +static void +thumbnail_resize (Thumbnail* self, + gint new_scale) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; gint _tmp4_; gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; - gint _tmp9_; - Dimensions _tmp10_ = {0}; - gboolean _tmp11_; + Dimensions _tmp6_ = {0}; + gboolean _tmp7_; #line 250 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = new_scale; -#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = thumbnail_get_MIN_SCALE (); + _tmp0_ = thumbnail_get_MIN_SCALE (); #line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _vala_assert (_tmp0_ >= _tmp2_, "new_scale >= MIN_SCALE"); -#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = new_scale; + _vala_assert (new_scale >= _tmp1_, "new_scale >= MIN_SCALE"); #line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = thumbnail_get_MAX_SCALE (); + _tmp2_ = thumbnail_get_MAX_SCALE (); #line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _vala_assert (_tmp3_ <= _tmp5_, "new_scale <= MAX_SCALE"); + _vala_assert (new_scale <= _tmp3_, "new_scale <= MAX_SCALE"); #line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = self->priv->scale; + _tmp4_ = self->priv->scale; #line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = new_scale; -#line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp6_ == _tmp7_) { + if (_tmp4_ == new_scale) { #line 255 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 1965 "Thumbnail.c" +#line 1889 "Thumbnail.c" } #line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = new_scale; -#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->scale = _tmp8_; + self->priv->scale = new_scale; #line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = self->priv->scale; + _tmp5_ = self->priv->scale; #line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" - dimensions_get_scaled (&self->priv->original_dim, _tmp9_, TRUE, &_tmp10_); + dimensions_get_scaled (&self->priv->original_dim, _tmp5_, TRUE, &_tmp6_); #line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->dim = _tmp10_; + self->priv->dim = _tmp6_; #line 260 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cancel_async_fetch (self); #line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = self->priv->exposure; + _tmp7_ = self->priv->exposure; #line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp11_) { -#line 1983 "Thumbnail.c" + if (_tmp7_) { +#line 1905 "Thumbnail.c" GdkPixbuf* resizable = NULL; + GdkPixbuf* _tmp8_; GdkPixbuf* _tmp12_; - GdkPixbuf* _tmp17_; #line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala" resizable = NULL; #line 268 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp12_ = self->priv->unscaled_pixbuf; + _tmp8_ = self->priv->unscaled_pixbuf; #line 268 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp12_ != NULL) { -#line 1993 "Thumbnail.c" - GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; + if (_tmp8_ != NULL) { +#line 1915 "Thumbnail.c" + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; #line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp13_ = self->priv->unscaled_pixbuf; + _tmp9_ = self->priv->unscaled_pixbuf; #line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp14_ = _g_object_ref0 (_tmp13_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); #line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala" - resizable = _tmp14_; -#line 2004 "Thumbnail.c" + resizable = _tmp10_; +#line 1926 "Thumbnail.c" } else { - gboolean _tmp15_; -#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 270 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp15_) { -#line 2011 "Thumbnail.c" - GdkPixbuf* _tmp16_; + if (checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { +#line 1930 "Thumbnail.c" + GdkPixbuf* _tmp11_; #line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp16_ = checkerboard_item_get_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); + _tmp11_ = checkerboard_item_get_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); #line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); #line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala" - resizable = _tmp16_; -#line 2019 "Thumbnail.c" + resizable = _tmp11_; +#line 1938 "Thumbnail.c" } } #line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp17_ = resizable; + _tmp12_ = resizable; #line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp17_ != NULL) { -#line 2026 "Thumbnail.c" - GdkPixbuf* _tmp18_; - Dimensions _tmp19_; - GdkPixbuf* _tmp20_; - GdkPixbuf* _tmp21_; + if (_tmp12_ != NULL) { +#line 1945 "Thumbnail.c" + GdkPixbuf* _tmp13_; + Dimensions _tmp14_; + GdkPixbuf* _tmp15_; + GdkPixbuf* _tmp16_; #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp18_ = resizable; + _tmp13_ = resizable; #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp19_ = self->priv->dim; + _tmp14_ = self->priv->dim; #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp20_ = resize_pixbuf (_tmp18_, &_tmp19_, THUMBNAIL_LOW_QUALITY_INTERP); + _tmp15_ = resize_pixbuf (_tmp13_, &_tmp14_, THUMBNAIL_LOW_QUALITY_INTERP); #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp21_ = _tmp20_; + _tmp16_ = _tmp15_; #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp21_); + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp16_); #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp21_); -#line 2043 "Thumbnail.c" + _g_object_unref0 (_tmp16_); +#line 1962 "Thumbnail.c" } #line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); #line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (resizable); -#line 2049 "Thumbnail.c" +#line 1968 "Thumbnail.c" } else { - Dimensions _tmp22_; + Dimensions _tmp17_; #line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp22_ = self->priv->dim; + _tmp17_ = self->priv->dim; #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 2056 "Thumbnail.c" + checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp17_); +#line 1975 "Thumbnail.c" } } -static void thumbnail_paint_empty (Thumbnail* self) { +static void +thumbnail_paint_empty (Thumbnail* self) +{ Dimensions _tmp0_; #line 282 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); @@ -2071,18 +1992,27 @@ static void thumbnail_paint_empty (Thumbnail* self) { _g_object_unref0 (self->priv->unscaled_pixbuf); #line 285 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->unscaled_pixbuf = NULL; -#line 2075 "Thumbnail.c" +#line 1996 "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) { +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 292 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_low_quality_fetched ((Thumbnail*) self, pixbuf, unscaled, dim, interp, err); -#line 2082 "Thumbnail.c" +#line 2010 "Thumbnail.c" } -static void thumbnail_schedule_low_quality_fetch (Thumbnail* self) { +static void +thumbnail_schedule_low_quality_fetch (Thumbnail* self) +{ GCancellable* _tmp0_; MediaSource* _tmp1_; Dimensions _tmp2_; @@ -2105,20 +2035,24 @@ static void thumbnail_schedule_low_quality_fetch (Thumbnail* self) { _tmp3_ = self->priv->cancellable; #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 2109 "Thumbnail.c" +#line 2039 "Thumbnail.c" } -static gboolean _thumbnail_on_schedule_high_quality_gsource_func (gpointer self) { +static gboolean +_thumbnail_on_schedule_high_quality_gsource_func (gpointer self) +{ gboolean result; result = thumbnail_on_schedule_high_quality ((Thumbnail*) self); #line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2118 "Thumbnail.c" +#line 2050 "Thumbnail.c" } -static void thumbnail_delayed_high_quality_fetch (Thumbnail* self) { +static void +thumbnail_delayed_high_quality_fetch (Thumbnail* self) +{ gboolean _tmp0_; #line 296 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); @@ -2130,24 +2064,33 @@ static void thumbnail_delayed_high_quality_fetch (Thumbnail* self) { self->priv->hq_reschedule = TRUE; #line 300 "/home/jens/Source/shotwell/src/Thumbnail.vala" return; -#line 2134 "Thumbnail.c" +#line 2068 "Thumbnail.c" } #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 304 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->hq_scheduled = TRUE; -#line 2140 "Thumbnail.c" +#line 2074 "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) { +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 318 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_on_high_quality_fetched ((Thumbnail*) self, pixbuf, unscaled, dim, interp, err); -#line 2147 "Thumbnail.c" +#line 2088 "Thumbnail.c" } -static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { +static gboolean +thumbnail_on_schedule_high_quality (Thumbnail* self) +{ gboolean result = FALSE; gboolean _tmp0_; GCancellable* _tmp1_; @@ -2164,7 +2107,7 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { result = TRUE; #line 311 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2168 "Thumbnail.c" +#line 2111 "Thumbnail.c" } #line 314 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_cancel_async_fetch (self); @@ -2178,7 +2121,7 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { _tmp2_ = self->priv->exposure; #line 317 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp2_) { -#line 2182 "Thumbnail.c" +#line 2125 "Thumbnail.c" MediaSource* _tmp3_; gint _tmp4_; Dimensions _tmp5_; @@ -2193,7 +2136,7 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { _tmp6_ = self->priv->cancellable; #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 2197 "Thumbnail.c" +#line 2140 "Thumbnail.c" } #line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->hq_scheduled = FALSE; @@ -2201,11 +2144,13 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) { result = FALSE; #line 324 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2205 "Thumbnail.c" +#line 2148 "Thumbnail.c" } -static void thumbnail_cancel_async_fetch (Thumbnail* self) { +static void +thumbnail_cancel_async_fetch (Thumbnail* self) +{ GCancellable* _tmp0_; #line 327 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); @@ -2213,21 +2158,25 @@ static void thumbnail_cancel_async_fetch (Thumbnail* self) { _tmp0_ = self->priv->cancellable; #line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_ != NULL) { -#line 2217 "Thumbnail.c" +#line 2162 "Thumbnail.c" GCancellable* _tmp1_; #line 330 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp1_ = self->priv->cancellable; #line 330 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_cancellable_cancel (_tmp1_); -#line 2223 "Thumbnail.c" +#line 2168 "Thumbnail.c" } } -static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err) { - GError* _tmp0_; - GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp8_; +static void +thumbnail_on_low_quality_fetched (Thumbnail* self, + GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err) +{ #line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -2237,71 +2186,59 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf #line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (dim != NULL); #line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = err; -#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp0_ != NULL) { -#line 2244 "Thumbnail.c" + if (err != NULL) { +#line 2191 "Thumbnail.c" + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gint _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; + gint _tmp2_; + const gchar* _tmp3_; #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = self->priv->scale; + _tmp2_ = self->priv->scale; #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = err; -#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp4_->message; + _tmp3_ = err->message; #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_); +"e: %d): %s", _tmp1_, _tmp2_, _tmp3_); #line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp2_); -#line 2264 "Thumbnail.c" + _g_free0 (_tmp1_); +#line 2208 "Thumbnail.c" } #line 339 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = pixbuf; -#line 339 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp6_ != NULL) { -#line 2270 "Thumbnail.c" - GdkPixbuf* _tmp7_; + if (pixbuf != NULL) { #line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = pixbuf; -#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 2276 "Thumbnail.c" + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), pixbuf); +#line 2214 "Thumbnail.c" } #line 342 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = unscaled; -#line 342 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp8_ != NULL) { -#line 2282 "Thumbnail.c" - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp10_; -#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = unscaled; + if (unscaled != NULL) { +#line 2218 "Thumbnail.c" + GdkPixbuf* _tmp4_; #line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp4_ = _g_object_ref0 (unscaled); #line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->unscaled_pixbuf); #line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->unscaled_pixbuf = _tmp10_; -#line 2293 "Thumbnail.c" + self->priv->unscaled_pixbuf = _tmp4_; +#line 2226 "Thumbnail.c" } #line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_delayed_high_quality_fetch (self); -#line 2297 "Thumbnail.c" +#line 2230 "Thumbnail.c" } -static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err) { - GError* _tmp0_; - GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp8_; +static void +thumbnail_on_high_quality_fetched (Thumbnail* self, + GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err) +{ #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (IS_THUMBNAIL (self)); #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -2311,78 +2248,61 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_return_if_fail (dim != NULL); #line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = err; -#line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp0_ != NULL) { -#line 2317 "Thumbnail.c" + if (err != NULL) { +#line 2252 "Thumbnail.c" + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gint _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; + gint _tmp2_; + const gchar* _tmp3_; #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = self->priv->scale; + _tmp2_ = self->priv->scale; #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = err; -#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp4_->message; + _tmp3_ = err->message; #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_); +"le: %d): %s", _tmp1_, _tmp2_, _tmp3_); #line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_free0 (_tmp2_); -#line 2337 "Thumbnail.c" + _g_free0 (_tmp1_); +#line 2269 "Thumbnail.c" } #line 354 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = pixbuf; -#line 354 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp6_ != NULL) { -#line 2343 "Thumbnail.c" - GdkPixbuf* _tmp7_; + if (pixbuf != NULL) { #line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = pixbuf; -#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 2349 "Thumbnail.c" + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), pixbuf); +#line 2275 "Thumbnail.c" } #line 357 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = unscaled; -#line 357 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp8_ != NULL) { -#line 2355 "Thumbnail.c" - GdkPixbuf* _tmp9_; - GdkPixbuf* _tmp10_; -#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = unscaled; + if (unscaled != NULL) { +#line 2279 "Thumbnail.c" + GdkPixbuf* _tmp4_; #line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp4_ = _g_object_ref0 (unscaled); #line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (self->priv->unscaled_pixbuf); #line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala" - self->priv->unscaled_pixbuf = _tmp10_; -#line 2366 "Thumbnail.c" + self->priv->unscaled_pixbuf = _tmp4_; +#line 2287 "Thumbnail.c" } } -static void thumbnail_real_exposed (CheckerboardItem* base) { +static void +thumbnail_real_exposed (CheckerboardItem* base) +{ Thumbnail * self; - gboolean _tmp0_; #line 361 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); #line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv->exposure = TRUE; #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 364 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (!_tmp0_) { + if (!checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { #line 365 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_schedule_low_quality_fetch (self); -#line 2384 "Thumbnail.c" +#line 2304 "Thumbnail.c" } #line 367 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_update_title (self, FALSE); @@ -2392,11 +2312,13 @@ static void thumbnail_real_exposed (CheckerboardItem* base) { thumbnail_update_tags (self, FALSE); #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 2394 "Thumbnail.c" +#line 2314 "Thumbnail.c" } -static void thumbnail_real_unexposed (CheckerboardItem* base) { +static void +thumbnail_real_unexposed (CheckerboardItem* base) +{ Thumbnail * self; #line 374 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); @@ -2406,11 +2328,14 @@ static void thumbnail_real_unexposed (CheckerboardItem* base) { thumbnail_paint_empty (self); #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 2408 "Thumbnail.c" +#line 2330 "Thumbnail.c" } -static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, gint scale) { +static GdkPixbuf* +thumbnail_real_get_top_right_trinket (CheckerboardItem* base, + gint scale) +{ Thumbnail * self; GdkPixbuf* result = NULL; Flaggable* flaggable = NULL; @@ -2431,38 +2356,35 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, _tmp4_ = flaggable; #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp4_ != NULL) { -#line 2433 "Thumbnail.c" +#line 2358 "Thumbnail.c" Flaggable* _tmp5_; - gboolean _tmp6_; #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp5_ = flaggable; #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = flaggable_is_flagged (_tmp5_); -#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp3_ = _tmp6_; -#line 2442 "Thumbnail.c" + _tmp3_ = flaggable_is_flagged (_tmp5_); +#line 2364 "Thumbnail.c" } else { #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp3_ = FALSE; -#line 2446 "Thumbnail.c" +#line 2368 "Thumbnail.c" } #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp3_) { -#line 2450 "Thumbnail.c" - GdkPixbuf* _tmp7_; +#line 2372 "Thumbnail.c" + GdkPixbuf* _tmp6_; #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); + _tmp6_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE); #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp2_); #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = _tmp7_; -#line 2458 "Thumbnail.c" + _tmp2_ = _tmp6_; +#line 2380 "Thumbnail.c" } else { #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _g_object_unref0 (_tmp2_); #line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = NULL; -#line 2464 "Thumbnail.c" +#line 2386 "Thumbnail.c" } #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = _tmp2_; @@ -2470,139 +2392,140 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base, _g_object_unref0 (flaggable); #line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2472 "Thumbnail.c" +#line 2394 "Thumbnail.c" } -static void _vala_GValue_free (GValue* self) { +static void +_vala_GValue_free (GValue* self) +{ #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_value_unset (self); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" g_free (self); -#line 2481 "Thumbnail.c" +#line 2405 "Thumbnail.c" } -static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base, gint scale) { +static GdkPixbuf* +thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base, + gint scale) +{ Thumbnail * self; GdkPixbuf* result = NULL; Rating rating = 0; MediaSource* _tmp0_; - Rating _tmp1_; gboolean show_ratings = FALSE; - GValue* _tmp2_ = NULL; - GValue _tmp3_ = {0}; - gboolean _tmp4_; - GdkPixbuf* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - Rating _tmp7_; + GValue* _tmp1_ = NULL; + GValue _tmp2_ = {0}; + gboolean _tmp3_; + GdkPixbuf* _tmp4_ = NULL; + gboolean _tmp5_ = FALSE; + Rating _tmp6_; #line 389 "/home/jens/Source/shotwell/src/Thumbnail.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail); #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp0_ = self->priv->media; #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp1_ = media_source_get_rating (_tmp0_); -#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala" - rating = _tmp1_; + rating = media_source_get_rating (_tmp0_); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp2_ = g_new0 (GValue, 1); + _tmp1_ = g_new0 (GValue, 1); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_value_init (_tmp2_, G_TYPE_BOOLEAN); + g_value_init (_tmp1_, G_TYPE_BOOLEAN); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - g_value_set_boolean (_tmp2_, FALSE); + g_value_set_boolean (_tmp1_, FALSE); #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_); + data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), THUMBNAIL_PROP_SHOW_RATINGS, _tmp1_, &_tmp2_); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp4_ = g_value_get_boolean (&_tmp3_); + _tmp3_ = g_value_get_boolean (&_tmp2_); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - __vala_GValue_free0 (_tmp2_); + __vala_GValue_free0 (_tmp1_); #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala" - show_ratings = _tmp4_; + show_ratings = _tmp3_; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp7_ = rating; + _tmp6_ = rating; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp7_ != RATING_UNRATED) { -#line 2524 "Thumbnail.c" - gboolean _tmp8_; + if (_tmp6_ != RATING_UNRATED) { +#line 2448 "Thumbnail.c" + gboolean _tmp7_; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp8_ = show_ratings; + _tmp7_ = show_ratings; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = _tmp8_; -#line 2530 "Thumbnail.c" + _tmp5_ = _tmp7_; +#line 2454 "Thumbnail.c" } else { #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp6_ = FALSE; -#line 2534 "Thumbnail.c" + _tmp5_ = FALSE; +#line 2458 "Thumbnail.c" } #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - if (_tmp6_) { -#line 2538 "Thumbnail.c" - Rating _tmp9_; - gint _tmp10_; - GdkPixbuf* _tmp11_; -#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp9_ = rating; + if (_tmp5_) { +#line 2462 "Thumbnail.c" + Rating _tmp8_; + GdkPixbuf* _tmp9_; #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp10_ = scale; + _tmp8_ = rating; #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp11_ = resources_get_rating_trinket (_tmp9_, _tmp10_); + _tmp9_ = resources_get_rating_trinket (_tmp8_, scale); #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = _tmp11_; -#line 2552 "Thumbnail.c" + _tmp4_ = _tmp9_; +#line 2473 "Thumbnail.c" } else { #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp5_ = NULL; -#line 2558 "Thumbnail.c" + _tmp4_ = NULL; +#line 2479 "Thumbnail.c" } #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp5_; + result = _tmp4_; #line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2564 "Thumbnail.c" +#line 2485 "Thumbnail.c" } -gint thumbnail_get_MIN_SCALE (void) { +gint +thumbnail_get_MIN_SCALE (void) +{ gint result; #line 18 "/home/jens/Source/shotwell/src/Thumbnail.vala" result = 72; #line 18 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2574 "Thumbnail.c" +#line 2497 "Thumbnail.c" } -gint thumbnail_get_MAX_SCALE (void) { +gint +thumbnail_get_MAX_SCALE (void) +{ gint result; - gint _tmp0_; #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_LARGEST); -#line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp0_; + result = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_LARGEST); #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2587 "Thumbnail.c" +#line 2509 "Thumbnail.c" } -gint thumbnail_get_DEFAULT_SCALE (void) { +gint +thumbnail_get_DEFAULT_SCALE (void) +{ gint result; - gint _tmp0_; #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala" - _tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); -#line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala" - result = _tmp0_; + result = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala" return result; -#line 2600 "Thumbnail.c" +#line 2521 "Thumbnail.c" } -static void thumbnail_class_init (ThumbnailClass * klass) { +static void +thumbnail_class_init (ThumbnailClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" thumbnail_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -2625,11 +2548,13 @@ 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 2627 "Thumbnail.c" +#line 2550 "Thumbnail.c" } -static void thumbnail_instance_init (Thumbnail * self) { +static void +thumbnail_instance_init (Thumbnail * self) +{ #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" self->priv = THUMBNAIL_GET_PRIVATE (self); #line 41 "/home/jens/Source/shotwell/src/Thumbnail.vala" @@ -2642,11 +2567,13 @@ 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 2644 "Thumbnail.c" +#line 2569 "Thumbnail.c" } -static void thumbnail_finalize (GObject * obj) { +static void +thumbnail_finalize (GObject * obj) +{ Thumbnail * self; GCancellable* _tmp0_; TagSourceCollection* _tmp2_; @@ -2659,13 +2586,13 @@ static void thumbnail_finalize (GObject * obj) { _tmp0_ = self->priv->cancellable; #line 73 "/home/jens/Source/shotwell/src/Thumbnail.vala" if (_tmp0_ != NULL) { -#line 2661 "Thumbnail.c" +#line 2588 "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 2667 "Thumbnail.c" +#line 2594 "Thumbnail.c" } #line 76 "/home/jens/Source/shotwell/src/Thumbnail.vala" _tmp2_ = tag_global; @@ -2687,11 +2614,13 @@ 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 2689 "Thumbnail.c" +#line 2616 "Thumbnail.c" } -GType thumbnail_get_type (void) { +GType +thumbnail_get_type (void) +{ static volatile gsize thumbnail_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Thumbnail), 0, (GInstanceInitFunc) thumbnail_instance_init, NULL }; @@ -2703,18 +2632,23 @@ GType thumbnail_get_type (void) { } -static void _vala_thumbnail_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_thumbnail_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ Thumbnail * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_THUMBNAIL, Thumbnail); #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala" switch (property_id) { -#line 2710 "Thumbnail.c" +#line 2644 "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 2716 "Thumbnail.c" +#line 2650 "Thumbnail.c" } } -- cgit v1.2.3