Merges from gtk-1-2

[~andy/gtk] / gdk / x11 / gdkproperty-x11.c

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 54fa55c51fd480c116d8c383c0e7da08110e6c81..58b51a9712927dd45ca003c862bf44762136bc9d 100644 (file)
--- 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