Merge tag 'upstream/0.25.2'

Upstream version 0.25.2

7 files changed, 20 insertions, 20 deletions

diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c
index e7fb3d4..96920a9 100644
--- a/src/plugins/DataImportsInterfaces.c
+++ b/src/plugins/DataImportsInterfaces.c
@@ -1,4 +1,4 @@
-/* DataImportsInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* DataImportsInterfaces.c generated by valac 0.32.1, the Vala compiler
  * generated from DataImportsInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index 6a9f109..a542964 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1,4 +1,4 @@
-/* ManifestWidget.c generated by valac 0.34.2, the Vala compiler
+/* ManifestWidget.c generated by valac 0.32.1, the Vala compiler
  * generated from ManifestWidget.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -245,19 +245,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 263 "ManifestWidget.c"
 }
@@ -1402,7 +1402,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp46_ = _tmp45_;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-				_tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_icon_get_type (), GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0);
+				_tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_ICON, GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0);
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp48_ = _tmp47_;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2187,7 +2187,7 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView *
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv = PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE (self);
 #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, gdk_pixbuf_get_type (), G_TYPE_STRING, G_TYPE_STRING);
+	_tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
 #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv->store = _tmp0_;
 #line 2194 "ManifestWidget.c"
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index 8040d16..245a6b2 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1,4 +1,4 @@
-/* Plugins.c generated by valac 0.34.2, the Vala compiler
+/* Plugins.c generated by valac 0.32.1, the Vala compiler
  * generated from Plugins.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c
index f42f462..e2e22cb 100644
--- a/src/plugins/PublishingInterfaces.c
+++ b/src/plugins/PublishingInterfaces.c
@@ -1,4 +1,4 @@
-/* PublishingInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* PublishingInterfaces.c generated by valac 0.32.1, the Vala compiler
  * generated from PublishingInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c
index da797f9..9357a68 100644
--- a/src/plugins/SpitInterfaces.c
+++ b/src/plugins/SpitInterfaces.c
@@ -1,4 +1,4 @@
-/* SpitInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* SpitInterfaces.c generated by valac 0.32.1, the Vala compiler
  * generated from SpitInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c
index 7e300b8..3465427 100644
--- a/src/plugins/StandardHostInterface.c
+++ b/src/plugins/StandardHostInterface.c
@@ -1,4 +1,4 @@
-/* StandardHostInterface.c generated by valac 0.34.2, the Vala compiler
+/* StandardHostInterface.c generated by valac 0.32.1, the Vala compiler
  * generated from StandardHostInterface.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c
index 1f05177..aedb555 100644
--- a/src/plugins/TransitionsInterfaces.c
+++ b/src/plugins/TransitionsInterfaces.c
@@ -1,4 +1,4 @@
-/* TransitionsInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* TransitionsInterfaces.c generated by valac 0.32.1, the Vala compiler
  * generated from TransitionsInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -726,7 +726,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning from a blank screen, this will return null.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", GDK_TYPE_PIXBUF, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 731 "TransitionsInterfaces.c"
 	/**
 	     * Returns the position of the starting pixbuf on the display.
@@ -734,7 +734,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning from a blank screen, this will be zeroed.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", GDK_TYPE_RECTANGLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 739 "TransitionsInterfaces.c"
 	/**
 	     * Returns the ending pixbuf (the pixbuf that the transition should result in).
@@ -742,7 +742,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning to a blank screen, this will return null.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", GDK_TYPE_PIXBUF, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 747 "TransitionsInterfaces.c"
 	/**
 	     * Returns the position of the ending pixbuf on the display.
@@ -750,7 +750,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning to a blank screen, this will be zeroed.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", GDK_TYPE_RECTANGLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 755 "TransitionsInterfaces.c"
 	/**
 	     * Returns the background color of the viewport.