diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
| commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
| tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /plugins/common/Resources.c | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'plugins/common/Resources.c')
| -rw-r--r-- | plugins/common/Resources.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c index fa81657..9558cc1 100644 --- a/plugins/common/Resources.c +++ b/plugins/common/Resources.c @@ -47,9 +47,9 @@ "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_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value); +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_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value); +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); @@ -61,7 +61,7 @@ static gpointer _g_object_ref0 (gpointer self) { } -static void _vala_array_add2 (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" @@ -199,7 +199,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp14_ = _g_object_ref0 (_tmp13_); #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _vala_array_add2 (&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_, _tmp14_); #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp15_ = icon_pixbuf_set; #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala" @@ -238,7 +238,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) { } -static void _vala_array_add3 (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" @@ -357,7 +357,7 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp9_ = _g_object_ref0 (_tmp8_); #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala" - _vala_array_add3 (&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_, _tmp9_); #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" _tmp10_ = icon_pixbuf_set; #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala" |