Set the property as type ATOM_PAIR, not ATOM. (#72074, Gregory Merchan.)

Wed Feb 20 21:52:13 2002  Owen Taylor  <otaylor@redhat.com>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index 319a018d0f3c543ccfaa765221824c98860807ef..79917306408461b88886617462f9b86498866dfd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Feb 20 21:52:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * docs/tutorial/images/*.png: screenshots of examples.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 319a018d0f3c543ccfaa765221824c98860807ef..79917306408461b88886617462f9b86498866dfd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Wed Feb 20 21:52:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * docs/tutorial/images/*.png: screenshots of examples.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 319a018d0f3c543ccfaa765221824c98860807ef..79917306408461b88886617462f9b86498866dfd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed Feb 20 21:52:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * docs/tutorial/images/*.png: screenshots of examples.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 319a018d0f3c543ccfaa765221824c98860807ef..79917306408461b88886617462f9b86498866dfd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed Feb 20 21:52:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * docs/tutorial/images/*.png: screenshots of examples.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 319a018d0f3c543ccfaa765221824c98860807ef..79917306408461b88886617462f9b86498866dfd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed Feb 20 21:52:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * docs/tutorial/images/*.png: screenshots of examples.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 319a018d0f3c543ccfaa765221824c98860807ef..79917306408461b88886617462f9b86498866dfd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed Feb 20 21:52:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * docs/tutorial/images/*.png: screenshots of examples.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 319a018d0f3c543ccfaa765221824c98860807ef..79917306408461b88886617462f9b86498866dfd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed Feb 20 21:52:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * docs/tutorial/images/*.png: screenshots of examples.

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 8c9555a1a869cc75ed98f9d0d695694c03e41e6f..74abf87adbdb407de726b7ca040d699ee5f852c6 100644 (file)
--- 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 def7c65930417317dd3dc1ab56bf89083ff481b2..2a4919dea9572470d22f51a182a5a1a0696f978f 100644 (file)
--- 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 d973e73741f24f036caf7aabd3ae028c5579e6bb..95018fcfbf85c6d5e0330b9366cee7d5cfa77b10 100644 (file)
--- 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);