Merges from gtk-1-2

1 files changed, 9 insertions, 9 deletions

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 54fa55c51..58b51a971 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -91,7 +91,7 @@ gdk_atom_name (GdkAtom atom)
     }
 }
 
-gint
+gboolean
 gdk_property_get (GdkWindow   *window,
 		  GdkAtom      property,
 		  GdkAtom      type,
@@ -190,13 +190,13 @@ gdk_property_get (GdkWindow   *window,
 }
 
 void
-gdk_property_change (GdkWindow   *window,
-		     GdkAtom      property,
-		     GdkAtom      type,
-		     gint         format,
-		     GdkPropMode  mode,
-		     guchar      *data,
-		     gint         nelements)
+gdk_property_change (GdkWindow    *window,
+		     GdkAtom       property,
+		     GdkAtom       type,
+		     gint          format,
+		     GdkPropMode   mode,
+		     const guchar *data,
+		     gint          nelements)
 {
   Display *xdisplay;
   Window xwindow;
@@ -219,7 +219,7 @@ gdk_property_change (GdkWindow   *window,
     }
 
   XChangeProperty (xdisplay, xwindow, property, type,
-		   format, mode, data, nelements);
+		   format, mode, (guchar *)data, nelements);
 }
 
 void