Merge branch 'master' into toolpalette

2 files changed, 4 insertions, 3 deletions

diff --git a/demos/gtk-demo/printing.c b/demos/gtk-demo/printing.c
index 124eed905f..34212d32b3 100644
--- a/demos/gtk-demo/printing.c
+++ b/demos/gtk-demo/printing.c
@@ -149,7 +149,8 @@ do_printing (GtkWidget *do_widget)
   GtkPrintOperation *operation;
   GtkPrintSettings *settings;
   PrintData *data;
-  gchar *uri, *dir, *ext;
+  gchar *uri, *ext;
+  const gchar *dir;
   GError *error = NULL;
 
   operation = gtk_print_operation_new ();
diff --git a/demos/testpixbuf-save.c b/demos/testpixbuf-save.c
index a8893f90eb..3929c7eaf1 100644
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -72,7 +72,7 @@ save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
 {
         GdkPixbufLoader *loader = data;
 
-        return gdk_pixbuf_loader_write (loader, buf, count, err);
+        return gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err);
 }
 
 static GdkPixbuf *
@@ -82,7 +82,7 @@ buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
         GdkPixbuf *pixbuf;
 
         loader = gdk_pixbuf_loader_new ();
-        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
+        if (gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err) &&
             gdk_pixbuf_loader_close (loader, err)) {
                 pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
                 g_object_unref (loader);