Assign xtype using gdk_x11_atom_to_xatom_for_display () when type !=

Thu Feb 12 11:05:16 2004  Manish Singh  <yosh@gimp.org>

        * gdk/x11/gdkproperty-x11.c (gdk_property_get): Assign xtype using
        gdk_x11_atom_to_xatom_for_display () when type != GDK_NONE.

        * gtk/gtkselection.c (_gtk_selection_request): Use GDK_NONE in
        gdk_property_get call instead of 0.

        * docs/reference/gdk/tmpl/properties.sgml: Document the above
        as GDK_NONE instead of simply 0.

diff --git a/ChangeLog b/ChangeLog
index 1b3f714cc1a79d00821659e45ef62ba251d1d683..d384d49c6d20f4f0973c3fad1f35087e1103e228 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Feb 12 11:05:16 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Assign xtype using
+       gdk_x11_atom_to_xatom_for_display () when type != GDK_NONE.
+
+       * gtk/gtkselection.c (_gtk_selection_request): Use GDK_NONE in
+       gdk_property_get call instead of 0.
+
+       * docs/reference/gdk/tmpl/properties.sgml: Document the above
+       as GDK_NONE instead of simply 0.
+
 Thu Feb 12 15:46:26 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1b3f714cc1a79d00821659e45ef62ba251d1d683..d384d49c6d20f4f0973c3fad1f35087e1103e228 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Thu Feb 12 11:05:16 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Assign xtype using
+       gdk_x11_atom_to_xatom_for_display () when type != GDK_NONE.
+
+       * gtk/gtkselection.c (_gtk_selection_request): Use GDK_NONE in
+       gdk_property_get call instead of 0.
+
+       * docs/reference/gdk/tmpl/properties.sgml: Document the above
+       as GDK_NONE instead of simply 0.
+
 Thu Feb 12 15:46:26 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1b3f714cc1a79d00821659e45ef62ba251d1d683..d384d49c6d20f4f0973c3fad1f35087e1103e228 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Thu Feb 12 11:05:16 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Assign xtype using
+       gdk_x11_atom_to_xatom_for_display () when type != GDK_NONE.
+
+       * gtk/gtkselection.c (_gtk_selection_request): Use GDK_NONE in
+       gdk_property_get call instead of 0.
+
+       * docs/reference/gdk/tmpl/properties.sgml: Document the above
+       as GDK_NONE instead of simply 0.
+
 Thu Feb 12 15:46:26 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1b3f714cc1a79d00821659e45ef62ba251d1d683..d384d49c6d20f4f0973c3fad1f35087e1103e228 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Thu Feb 12 11:05:16 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Assign xtype using
+       gdk_x11_atom_to_xatom_for_display () when type != GDK_NONE.
+
+       * gtk/gtkselection.c (_gtk_selection_request): Use GDK_NONE in
+       gdk_property_get call instead of 0.
+
+       * docs/reference/gdk/tmpl/properties.sgml: Document the above
+       as GDK_NONE instead of simply 0.
+
 Thu Feb 12 15:46:26 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1b3f714cc1a79d00821659e45ef62ba251d1d683..d384d49c6d20f4f0973c3fad1f35087e1103e228 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Thu Feb 12 11:05:16 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Assign xtype using
+       gdk_x11_atom_to_xatom_for_display () when type != GDK_NONE.
+
+       * gtk/gtkselection.c (_gtk_selection_request): Use GDK_NONE in
+       gdk_property_get call instead of 0.
+
+       * docs/reference/gdk/tmpl/properties.sgml: Document the above
+       as GDK_NONE instead of simply 0.
+
 Thu Feb 12 15:46:26 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area

diff --git a/docs/reference/gdk/tmpl/properties.sgml b/docs/reference/gdk/tmpl/properties.sgml
index baea1588569a1ae675c5b4b2fa19eca8f5697912..9aac1ff75e33e8dfe83ffbf72fc343867a8ee24c 100644 (file)
--- a/docs/reference/gdk/tmpl/properties.sgml
+++ b/docs/reference/gdk/tmpl/properties.sgml
@@ -267,7 +267,7 @@ is provided.
 
 @window: a #GdkWindow.
 @property: the property to retrieve.
-@type: the desired property type, or 0, if any type of data
+@type: the desired property type, or %GDK_NONE, if any type of data
        is acceptable. If this does not match the actual
        type, then @actual_format and @actual_length will
        be filled in, a warning will be printed to stderr

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 8f09cf8a9b324f8e604d9fa516d5de3f90c7a558..3f722492a92dd4928cb95699c954709b3fed417d 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -508,7 +508,7 @@ gdk_property_get (GdkWindow   *window,
   if (type == GDK_NONE)
     xtype = AnyPropertyType;
   else
-    xtype = GDK_NONE;
+    xtype = gdk_x11_atom_to_xatom_for_display (display, type);
 
   ret_data = NULL;
   

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index e14135e2539199954300a4950d529cc33ca83dba..c0417ca82c991b1368874f7957262b9dca8b5e5c 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1141,7 +1141,7 @@ _gtk_selection_request (GtkWidget *widget,
       mult_atoms = NULL;
       
       gdk_error_trap_push ();
-      if (!gdk_property_get (info->requestor, event->property, 0, /* AnyPropertyType */
+      if (!gdk_property_get (info->requestor, event->property, GDK_NONE, /* AnyPropertyType */
                             0, GTK_SELECTION_MAX_SIZE, FALSE,
                             &type, &format, &length, &mult_atoms))
        {