From e6d7f5e1965bf172184e84fc85f1a32b585ae3a0 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 21 Feb 2002 03:00:40 +0000 Subject: [PATCH] Set the property as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) Wed Feb 20 21:52:13 2002 Owen Taylor * gtk/gtkselection.c (gtk_selection_request): Set the property as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) * gdk/x11/gdk{property,selecton}-x11.c: Auto-convert properties of type ATOM_PAIR as well as properties of type ATOM. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/x11/gdkproperty-x11.c | 5 +++-- gdk/x11/gdkselection-x11.c | 2 +- gtk/gtkselection.c | 2 +- 10 files changed, 61 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 319a018d0..799173064 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Feb 20 21:52:13 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_request): Set the property + as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) + + * gdk/x11/gdk{property,selecton}-x11.c: Auto-convert properties + of type ATOM_PAIR as well as properties of type ATOM. + 2002-02-21 Matthias Clasen * docs/tutorial/images/*.png: screenshots of examples. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 319a018d0..799173064 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Wed Feb 20 21:52:13 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_request): Set the property + as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) + + * gdk/x11/gdk{property,selecton}-x11.c: Auto-convert properties + of type ATOM_PAIR as well as properties of type ATOM. + 2002-02-21 Matthias Clasen * docs/tutorial/images/*.png: screenshots of examples. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 319a018d0..799173064 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Wed Feb 20 21:52:13 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_request): Set the property + as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) + + * gdk/x11/gdk{property,selecton}-x11.c: Auto-convert properties + of type ATOM_PAIR as well as properties of type ATOM. + 2002-02-21 Matthias Clasen * docs/tutorial/images/*.png: screenshots of examples. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 319a018d0..799173064 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Wed Feb 20 21:52:13 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_request): Set the property + as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) + + * gdk/x11/gdk{property,selecton}-x11.c: Auto-convert properties + of type ATOM_PAIR as well as properties of type ATOM. + 2002-02-21 Matthias Clasen * docs/tutorial/images/*.png: screenshots of examples. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 319a018d0..799173064 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Wed Feb 20 21:52:13 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_request): Set the property + as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) + + * gdk/x11/gdk{property,selecton}-x11.c: Auto-convert properties + of type ATOM_PAIR as well as properties of type ATOM. + 2002-02-21 Matthias Clasen * docs/tutorial/images/*.png: screenshots of examples. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 319a018d0..799173064 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Wed Feb 20 21:52:13 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_request): Set the property + as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) + + * gdk/x11/gdk{property,selecton}-x11.c: Auto-convert properties + of type ATOM_PAIR as well as properties of type ATOM. + 2002-02-21 Matthias Clasen * docs/tutorial/images/*.png: screenshots of examples. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 319a018d0..799173064 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Wed Feb 20 21:52:13 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_request): Set the property + as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.) + + * gdk/x11/gdk{property,selecton}-x11.c: Auto-convert properties + of type ATOM_PAIR as well as properties of type ATOM. + 2002-02-21 Matthias Clasen * docs/tutorial/images/*.png: screenshots of examples. diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index 8c9555a1a..74abf87ad 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -382,7 +382,8 @@ gdk_property_get (GdkWindow *window, if (data) { - if (ret_prop_type == XA_ATOM) + if (ret_prop_type == XA_ATOM || + ret_prop_type == gdk_x11_get_xatom_by_name ("ATOM_PAIR")) { /* * data is an array of X atom, we need to convert it @@ -461,7 +462,7 @@ gdk_property_change (GdkWindow *window, xwindow = _gdk_root_window; } - if (xtype == XA_ATOM) + if (xtype == XA_ATOM || xtype == gdk_x11_get_xatom_by_name ("ATOM_PAIR")) { /* * data is an array of GdkAtom, we need to convert it diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index def7c6593..2a4919dea 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -246,7 +246,7 @@ gdk_selection_property_get (GdkWindow *requestor, { *data = g_new (guchar, length); - if (prop_type == XA_ATOM) + if (prop_type == XA_ATOM || prop_type == gdk_x11_get_xatom_by_name ("ATOM_PAIR")) { Atom* atoms = (Atom*) t; GdkAtom* atoms_dest = (GdkAtom*) *data; diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index d973e7374..95018fcfb 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -1180,7 +1180,7 @@ gtk_selection_request (GtkWidget *widget, if (event->target == gtk_selection_atoms[MULTIPLE]) { gdk_property_change (info->requestor, event->property, - GDK_SELECTION_TYPE_ATOM, 32, + gdk_atom_intern ("ATOM_PAIR", FALSE), 32, GDK_PROP_MODE_REPLACE, mult_atoms, 2*info->num_conversions); g_free (mult_atoms); -- 2.43.2