diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
| commit | dfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch) | |
| tree | dee893916166ac1c8b479b74e7f341429945260e /src/CustomComponents.c | |
| parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/CustomComponents.c')
| -rw-r--r-- | src/CustomComponents.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CustomComponents.c b/src/CustomComponents.c index bc287da..b9cd57e 100644 --- a/src/CustomComponents.c +++ b/src/CustomComponents.c @@ -1,4 +1,4 @@ -/* CustomComponents.c generated by valac 0.34.4, the Vala compiler +/* CustomComponents.c generated by valac 0.34.7, the Vala compiler * generated from CustomComponents.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -762,7 +762,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) { #line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala" loaded_pixbuf = _tmp4_; #line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala" - _tmp5_ = gee_hash_set_new (TYPE_RGB_ANALYTIC_PIXEL, (GBoxedCopyFunc) rgb_analytic_pixel_dup, rgb_analytic_pixel_free, _theme_loader_rgb_pixel_hash_func_gee_hash_data_func, NULL, NULL, _theme_loader_rgb_pixel_equal_func_gee_equal_data_func, NULL, NULL); + _tmp5_ = gee_hash_set_new (TYPE_RGB_ANALYTIC_PIXEL, (GBoxedCopyFunc) rgb_analytic_pixel_dup, (GDestroyNotify) rgb_analytic_pixel_free, _theme_loader_rgb_pixel_hash_func_gee_hash_data_func, NULL, NULL, _theme_loader_rgb_pixel_equal_func_gee_equal_data_func, NULL, NULL); #line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala" colors = _tmp5_; #line 117 "/home/jens/Source/shotwell/src/CustomComponents.vala" @@ -944,7 +944,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) { #line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala" _tmp39_ = colors; #line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala" - _tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala" _tmp41_ = _tmp40_; #line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala" @@ -3599,7 +3599,7 @@ static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala" g_type_class_add_private (klass, sizeof (RGBHistogramManipulatorPrivate)); #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala" - ((GtkWidgetClass *) klass)->draw = rgb_histogram_manipulator_real_draw; + ((GtkWidgetClass *) klass)->draw = (gboolean (*)(GtkWidget*, cairo_t*)) rgb_histogram_manipulator_real_draw; #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala" G_OBJECT_CLASS (klass)->finalize = rgb_histogram_manipulator_finalize; #line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala" |