summaryrefslogtreecommitdiff
path: root/src/Thumbnail.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-09-21 21:31:53 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-09-21 21:31:53 +0200
commit3a8d89b7362838104c14739d83110690bae508a7 (patch)
tree78550d01b68a4f7bca9c791e0b6999c1ff4e0ea6 /src/Thumbnail.c
parentfcc96b0c8e06650d6df451f2eb4cd3621923bab1 (diff)
parentb67c4ba420286470899a63ff8b2fbbfdc17d082c (diff)
Merge tag 'upstream/0.24.0'
Upstream version 0.24.0
Diffstat (limited to 'src/Thumbnail.c')
-rw-r--r--src/Thumbnail.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Thumbnail.c b/src/Thumbnail.c
index 3bc86fb..062529f 100644
--- a/src/Thumbnail.c
+++ b/src/Thumbnail.c
@@ -570,7 +570,7 @@ 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);
-GValue* data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def);
+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);
gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self);
@@ -2500,7 +2500,7 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
Rating _tmp1_ = 0;
gboolean show_ratings = FALSE;
GValue* _tmp2_ = NULL;
- GValue* _tmp3_ = NULL;
+ GValue _tmp3_ = {0};
gboolean _tmp4_ = FALSE;
GdkPixbuf* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
@@ -2520,9 +2520,9 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
g_value_set_boolean (_tmp2_, FALSE);
#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
- _tmp3_ = data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), THUMBNAIL_PROP_SHOW_RATINGS, _tmp2_);
+ 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"
- _tmp4_ = g_value_get_boolean (_tmp3_);
+ _tmp4_ = g_value_get_boolean (&_tmp3_);
#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
__vala_GValue_free0 (_tmp2_);
#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"