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 --- plugins/common/Resources.c | 281 +++++++++++++++++++++++++-------------------- 1 file changed, 154 insertions(+), 127 deletions(-) (limited to 'plugins/common/Resources.c') diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c index 9558cc1..828d6df 100644 --- a/plugins/common/Resources.c +++ b/plugins/common/Resources.c @@ -1,4 +1,4 @@ -/* Resources.c generated by valac 0.36.6, the Vala compiler +/* Resources.c generated by valac 0.40.4, the Vala compiler * generated from Resources.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -46,113 +47,129 @@ "c., \n" \ "51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" #define RESOURCES_TRANSLATORS _ ("translator-credits") -GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1); -static void _vala_array_add4 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value); -GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1); -static void _vala_array_add5 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +GdkPixbuf** resources_load_icon_set (GFile* icon_file, + int* result_length1); +static void _vala_array_add4 (GdkPixbuf** * array, + int* length, + int* size, + GdkPixbuf* value); +GdkPixbuf** resources_load_from_resource (const gchar* resource_path, + int* result_length1); +static void _vala_array_add5 (GdkPixbuf** * array, + int* length, + int* size, + GdkPixbuf* value); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" return self ? g_object_ref (self) : NULL; -#line 40 "Resources.c" +#line 55 "Resources.c" } -static void _vala_array_add4 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) { +static void +_vala_array_add4 (GdkPixbuf** * array, + int* length, + int* size, + GdkPixbuf* value) +{ #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if ((*length) == (*size)) { #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" *size = (*size) ? (2 * (*size)) : 4; #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" *array = g_renew (GdkPixbuf*, *array, (*size) + 1); -#line 51 "Resources.c" +#line 71 "Resources.c" } #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" (*array)[(*length)++] = value; #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" (*array)[*length] = NULL; -#line 57 "Resources.c" +#line 77 "Resources.c" } -GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { +GdkPixbuf** +resources_load_icon_set (GFile* icon_file, + int* result_length1) +{ GdkPixbuf** result = NULL; GdkPixbuf* icon = NULL; - GdkPixbuf* _tmp10_; - GdkPixbuf** _tmp16_; - gint _tmp16__length1; + GdkPixbuf* _tmp8_; + GdkPixbuf** _tmp14_; + gint _tmp14__length1; GError * _inner_error_ = NULL; #line 40 "/home/jens/Source/shotwell/plugins/common/Resources.vala" g_return_val_if_fail ((icon_file == NULL) || G_IS_FILE (icon_file), NULL); #line 41 "/home/jens/Source/shotwell/plugins/common/Resources.vala" icon = NULL; -#line 72 "Resources.c" +#line 95 "Resources.c" { GdkPixbuf* _tmp0_ = NULL; - GFile* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; + GdkPixbuf* _tmp3_; GdkPixbuf* _tmp4_; GdkPixbuf* _tmp5_; - GdkPixbuf* _tmp6_; #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp1_ = icon_file; + _tmp1_ = g_file_get_path (icon_file); #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp2_ = g_file_get_path (_tmp1_); + _tmp2_ = _tmp1_; #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp3_ = _tmp2_; + _tmp3_ = gdk_pixbuf_new_from_file (_tmp2_, &_inner_error_); #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp4_ = gdk_pixbuf_new_from_file (_tmp3_, &_inner_error_); + _tmp4_ = _tmp3_; #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp5_ = _tmp4_; + _g_free0 (_tmp2_); #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _g_free0 (_tmp3_); -#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp0_ = _tmp5_; + _tmp0_ = _tmp4_; #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 97 "Resources.c" +#line 117 "Resources.c" goto __catch4_g_error; } #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp6_ = _tmp0_; + _tmp5_ = _tmp0_; #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp0_ = NULL; #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_object_unref0 (icon); #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - icon = _tmp6_; + icon = _tmp5_; #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_object_unref0 (_tmp0_); -#line 110 "Resources.c" +#line 130 "Resources.c" } goto __finally4; __catch4_g_error: { GError* err = NULL; - GFile* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; + gchar* _tmp6_; + gchar* _tmp7_; #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala" err = _inner_error_; #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _inner_error_ = NULL; #line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp7_ = icon_file; -#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp8_ = g_file_get_path (_tmp7_); + _tmp6_ = g_file_get_path (icon_file); #line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - g_warning ("Resources.vala:45: couldn't load icon set from %s.", _tmp9_); + g_warning ("Resources.vala:45: couldn't load icon set from %s.", _tmp7_); #line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_error_free0 (err); -#line 135 "Resources.c" +#line 152 "Resources.c" } __finally4: #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -165,152 +182,154 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { g_clear_error (&_inner_error_); #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala" return NULL; -#line 148 "Resources.c" +#line 165 "Resources.c" } #line 48 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp10_ = icon; + _tmp8_ = icon; #line 48 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - if (_tmp10_ != NULL) { -#line 154 "Resources.c" + if (_tmp8_ != NULL) { +#line 171 "Resources.c" GdkPixbuf** icon_pixbuf_set = NULL; - GdkPixbuf** _tmp11_; + GdkPixbuf** _tmp9_; gint icon_pixbuf_set_length1; gint _icon_pixbuf_set_size_; - GdkPixbuf** _tmp12_; - gint _tmp12__length1; - GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; - GdkPixbuf** _tmp15_; - gint _tmp15__length1; + GdkPixbuf** _tmp10_; + gint _tmp10__length1; + GdkPixbuf* _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf** _tmp13_; + gint _tmp13__length1; #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp11_ = g_new0 (GdkPixbuf*, 0 + 1); + _tmp9_ = g_new0 (GdkPixbuf*, 0 + 1); #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - icon_pixbuf_set = _tmp11_; + icon_pixbuf_set = _tmp9_; #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala" icon_pixbuf_set_length1 = 0; #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _icon_pixbuf_set_size_ = icon_pixbuf_set_length1; #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp12_ = icon_pixbuf_set; + _tmp10_ = icon_pixbuf_set; #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp12__length1 = icon_pixbuf_set_length1; + _tmp10__length1 = icon_pixbuf_set_length1; #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp13_ = icon; + _tmp11_ = icon; #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp14_ = _g_object_ref0 (_tmp13_); + _tmp12_ = _g_object_ref0 (_tmp11_); #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _vala_array_add4 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp14_); + _vala_array_add4 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp12_); #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp15_ = icon_pixbuf_set; + _tmp13_ = icon_pixbuf_set; #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp15__length1 = icon_pixbuf_set_length1; + _tmp13__length1 = icon_pixbuf_set_length1; #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if (result_length1) { #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - *result_length1 = _tmp15__length1; -#line 191 "Resources.c" + *result_length1 = _tmp13__length1; +#line 208 "Resources.c" } #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - result = _tmp15_; + result = _tmp13_; #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_object_unref0 (icon); #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" return result; -#line 199 "Resources.c" +#line 216 "Resources.c" } #line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp16_ = NULL; + _tmp14_ = NULL; #line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp16__length1 = 0; + _tmp14__length1 = 0; #line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if (result_length1) { #line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - *result_length1 = _tmp16__length1; -#line 209 "Resources.c" + *result_length1 = _tmp14__length1; +#line 226 "Resources.c" } #line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - result = _tmp16_; + result = _tmp14_; #line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_object_unref0 (icon); #line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala" return result; -#line 217 "Resources.c" +#line 234 "Resources.c" } -static void _vala_array_add5 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) { +static void +_vala_array_add5 (GdkPixbuf** * array, + int* length, + int* size, + GdkPixbuf* value) +{ #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if ((*length) == (*size)) { #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" *size = (*size) ? (2 * (*size)) : 4; #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" *array = g_renew (GdkPixbuf*, *array, (*size) + 1); -#line 228 "Resources.c" +#line 250 "Resources.c" } #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" (*array)[(*length)++] = value; #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" (*array)[*length] = NULL; -#line 234 "Resources.c" +#line 256 "Resources.c" } -GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1) { +GdkPixbuf** +resources_load_from_resource (const gchar* resource_path, + int* result_length1) +{ GdkPixbuf** result = NULL; GdkPixbuf* icon = NULL; - GdkPixbuf* _tmp5_; - GdkPixbuf** _tmp11_; - gint _tmp11__length1; + GdkPixbuf* _tmp3_; + GdkPixbuf** _tmp9_; + gint _tmp9__length1; GError * _inner_error_ = NULL; #line 57 "/home/jens/Source/shotwell/plugins/common/Resources.vala" g_return_val_if_fail (resource_path != NULL, NULL); #line 58 "/home/jens/Source/shotwell/plugins/common/Resources.vala" icon = NULL; -#line 249 "Resources.c" +#line 274 "Resources.c" { GdkPixbuf* _tmp0_ = NULL; - const gchar* _tmp1_; + GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; -#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp1_ = resource_path; #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp2_ = gdk_pixbuf_new_from_resource (_tmp1_, &_inner_error_); + _tmp1_ = gdk_pixbuf_new_from_resource (resource_path, &_inner_error_); #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp0_ = _tmp2_; + _tmp0_ = _tmp1_; #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 263 "Resources.c" +#line 285 "Resources.c" goto __catch5_g_error; } #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp3_ = _tmp0_; + _tmp2_ = _tmp0_; #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp0_ = NULL; #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_object_unref0 (icon); #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - icon = _tmp3_; + icon = _tmp2_; #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_object_unref0 (_tmp0_); -#line 276 "Resources.c" +#line 298 "Resources.c" } goto __finally5; __catch5_g_error: { GError* _error_ = NULL; - const gchar* _tmp4_; #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _error_ = _inner_error_; #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _inner_error_ = NULL; #line 62 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp4_ = resource_path; -#line 62 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - g_warning ("Resources.vala:62: Couldn't load icon set from %s", _tmp4_); + g_warning ("Resources.vala:62: Couldn't load icon set from %s", resource_path); #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_error_free0 (_error_); -#line 293 "Resources.c" +#line 312 "Resources.c" } __finally5: #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -323,80 +342,84 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul g_clear_error (&_inner_error_); #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala" return NULL; -#line 306 "Resources.c" +#line 325 "Resources.c" } #line 65 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp5_ = icon; + _tmp3_ = icon; #line 65 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - if (_tmp5_ != NULL) { -#line 312 "Resources.c" + if (_tmp3_ != NULL) { +#line 331 "Resources.c" GdkPixbuf** icon_pixbuf_set = NULL; - GdkPixbuf** _tmp6_; + GdkPixbuf** _tmp4_; gint icon_pixbuf_set_length1; gint _icon_pixbuf_set_size_; - GdkPixbuf** _tmp7_; - gint _tmp7__length1; - GdkPixbuf* _tmp8_; - GdkPixbuf* _tmp9_; - GdkPixbuf** _tmp10_; - gint _tmp10__length1; + GdkPixbuf** _tmp5_; + gint _tmp5__length1; + GdkPixbuf* _tmp6_; + GdkPixbuf* _tmp7_; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp6_ = g_new0 (GdkPixbuf*, 0 + 1); + _tmp4_ = g_new0 (GdkPixbuf*, 0 + 1); #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - icon_pixbuf_set = _tmp6_; + icon_pixbuf_set = _tmp4_; #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala" icon_pixbuf_set_length1 = 0; #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _icon_pixbuf_set_size_ = icon_pixbuf_set_length1; #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp7_ = icon_pixbuf_set; + _tmp5_ = icon_pixbuf_set; #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp7__length1 = icon_pixbuf_set_length1; + _tmp5__length1 = icon_pixbuf_set_length1; #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp8_ = icon; + _tmp6_ = icon; #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp7_ = _g_object_ref0 (_tmp6_); #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _vala_array_add5 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp9_); + _vala_array_add5 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp7_); #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp10_ = icon_pixbuf_set; + _tmp8_ = icon_pixbuf_set; #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp10__length1 = icon_pixbuf_set_length1; + _tmp8__length1 = icon_pixbuf_set_length1; #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if (result_length1) { #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - *result_length1 = _tmp10__length1; -#line 349 "Resources.c" + *result_length1 = _tmp8__length1; +#line 368 "Resources.c" } #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - result = _tmp10_; + result = _tmp8_; #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_object_unref0 (icon); #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" return result; -#line 357 "Resources.c" +#line 376 "Resources.c" } #line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp11_ = NULL; + _tmp9_ = NULL; #line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _tmp11__length1 = 0; + _tmp9__length1 = 0; #line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala" if (result_length1) { #line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - *result_length1 = _tmp11__length1; -#line 367 "Resources.c" + *result_length1 = _tmp9__length1; +#line 386 "Resources.c" } #line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - result = _tmp11_; + result = _tmp9_; #line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _g_object_unref0 (icon); #line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala" return result; -#line 375 "Resources.c" +#line 394 "Resources.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -408,7 +431,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -- cgit v1.2.3