summaryrefslogtreecommitdiff
path: root/src/publishing
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-09 06:55:40 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-09 06:55:40 +0100
commit71376a8631a4262793351e3431b3bc2df93b15dd (patch)
treea7b7313268ffc0e98a0f51e15fb2477b00194458 /src/publishing
parent524a49de17c1c432b0ad6b16f11e64586bf10e7c (diff)
parent7152401783578b56343f578b4ec920998660de33 (diff)
Merge tag 'upstream/0.25.0.1'
Upstream version 0.25.0.1
Diffstat (limited to 'src/publishing')
-rw-r--r--src/publishing/APIGlue.c2
-rw-r--r--src/publishing/Publishing.c2
-rw-r--r--src/publishing/PublishingPluginHost.c2
-rw-r--r--src/publishing/PublishingUI.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 92b9412..1355179 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.34.1, the Vala compiler
+/* APIGlue.c generated by valac 0.34.2, the Vala compiler
* generated from APIGlue.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index 99b7a82..603fb4c 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.34.1, the Vala compiler
+/* Publishing.c generated by valac 0.34.2, the Vala compiler
* generated from Publishing.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 6e24dc1..dd7f5a0 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.34.1, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.34.2, the Vala compiler
* generated from PublishingPluginHost.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index a057694..ad6c097 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.34.1, the Vala compiler
+/* PublishingUI.c generated by valac 0.34.2, the Vala compiler
* generated from PublishingUI.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1664,7 +1664,7 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_);
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp43_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
+ _tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->service_selector_box_model);
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"