diff options
author | Owen Taylor <otaylor@src.gnome.org> | 2000-03-14 19:57:25 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2000-03-14 19:57:25 +0000 |
commit | 10ba4fd066042b4335ae45e7560565872f71ba9b (patch) | |
tree | 17f68ffb0d402b6e66bb891d4a7d9a02a9b6108b /gdk/x11/gdkselection-x11.c | |
parent | 3f98a849c70ae570b78095cef0152a33ec07c64e (diff) | |
download | gtk+-10ba4fd066042b4335ae45e7560565872f71ba9b.tar.gz |
Merges from gtk-1-2
Diffstat (limited to 'gdk/x11/gdkselection-x11.c')
-rw-r--r-- | gdk/x11/gdkselection-x11.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index e1272f4213..42e00195ed 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -34,11 +34,11 @@ #include "gdkx.h" -gint +gboolean gdk_selection_owner_set (GdkWindow *owner, GdkAtom selection, guint32 time, - gint send_event) + gboolean send_event) { Display *xdisplay; Window xwindow; @@ -187,9 +187,11 @@ gdk_selection_send_notify (guint32 requestor, } gint -gdk_text_property_to_text_list (GdkAtom encoding, gint format, - guchar *text, gint length, - gchar ***list) +gdk_text_property_to_text_list (GdkAtom encoding, + gint format, + const guchar *text, + gint length, + gchar ***list) { XTextProperty property; gint count = 0; @@ -198,7 +200,7 @@ gdk_text_property_to_text_list (GdkAtom encoding, gint format, if (!list) return 0; - property.value = text; + property.value = (guchar *)text; property.encoding = encoding; property.format = format; property.nitems = length; @@ -220,15 +222,17 @@ gdk_free_text_list (gchar **list) } gint -gdk_string_to_compound_text (gchar *str, - GdkAtom *encoding, gint *format, - guchar **ctext, gint *length) +gdk_string_to_compound_text (const gchar *str, + GdkAtom *encoding, + gint *format, + guchar **ctext, + gint *length) { gint res; XTextProperty property; res = XmbTextListToTextProperty (GDK_DISPLAY(), - &str, 1, XCompoundTextStyle, + (char **)&str, 1, XCompoundTextStyle, &property); if (res != Success) { |