New upstream version 0.25.3upstream/0.25.3

1 files changed, 17 insertions, 17 deletions

diff --git a/src/Resources.c b/src/Resources.c
index 3a59fbe..1682cda 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.32.1, the Vala compiler
+/* Resources.c generated by valac 0.34.4, the Vala compiler
  * generated from Resources.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -201,8 +201,8 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_ADJUST "image-adjust"
 #define RESOURCES_PIN_TOOLBAR "shotwell-pin-toolbar"
 #define RESOURCES_MAKE_PRIMARY "shotwell-make-primary"
-#define RESOURCES_IMPORT "shotwell-import"
-#define RESOURCES_IMPORT_ALL "shotwell-import-all"
+#define RESOURCES_IMPORT "import"
+#define RESOURCES_IMPORT_ALL "import-all"
 #define RESOURCES_ENHANCE "shotwell-auto-enhance"
 #define RESOURCES_CROP_PIVOT_RETICLE "shotwell-crop-pivot-reticle"
 #define RESOURCES_PUBLISH "applications-internet"
@@ -2718,7 +2718,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 #line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2693 "Resources.c"
-				goto __catch426_g_error;
+				goto __catch428_g_error;
 			}
 #line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = _tmp1_;
@@ -2732,8 +2732,8 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			_g_object_unref0 (_tmp1_);
 #line 2706 "Resources.c"
 		}
-		goto __finally426;
-		__catch426_g_error:
+		goto __finally428;
+		__catch428_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp13_ = NULL;
@@ -2750,7 +2750,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			_g_error_free0 (err);
 #line 2723 "Resources.c"
 		}
-		__finally426:
+		__finally428:
 #line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 840 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2899,7 +2899,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 #line 2871 "Resources.c"
 		GeeHashMap* _tmp11_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 870 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_icon_cache);
 #line 870 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2980,7 +2980,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 #line 2952 "Resources.c"
 		GeeHashMap* _tmp27_ = NULL;
 #line 888 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 888 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_scaled_icon_cache);
 #line 888 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3075,7 +3075,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 #line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3049 "Resources.c"
-			goto __catch427_g_error;
+			goto __catch429_g_error;
 		}
 #line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = _tmp4_;
@@ -3089,8 +3089,8 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp4_);
 #line 3062 "Resources.c"
 	}
-	goto __finally427;
-	__catch427_g_error:
+	goto __finally429;
+	__catch429_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -3112,7 +3112,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_error_free0 (err);
 #line 3085 "Resources.c"
 	}
-	__finally427:
+	__finally429:
 #line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3632,11 +3632,11 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 #line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3606 "Resources.c"
-			goto __catch428_g_error;
+			goto __catch430_g_error;
 		}
 	}
-	goto __finally428;
-	__catch428_g_error:
+	goto __finally430;
+	__catch430_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp14_ = NULL;
@@ -3662,7 +3662,7 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 		return;
 #line 3635 "Resources.c"
 	}
-	__finally428:
+	__finally430:
 #line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 994 "/home/jens/Source/shotwell/src/Resources.vala"