From 7cf055efb317410c049540dca9e3ee7ae8708527 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 12 Feb 2004 19:18:23 +0000 Subject: [PATCH] Assign xtype using gdk_x11_atom_to_xatom_for_display () when type != Thu Feb 12 11:05:16 2004 Manish Singh * 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. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ docs/reference/gdk/tmpl/properties.sgml | 2 +- gdk/x11/gdkproperty-x11.c | 2 +- gtk/gtkselection.c | 2 +- 8 files changed, 58 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b3f714cc1..d384d49c6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Feb 12 11:05:16 2004 Manish Singh + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1b3f714cc1..d384d49c6d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Thu Feb 12 11:05:16 2004 Manish Singh + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1b3f714cc1..d384d49c6d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Thu Feb 12 11:05:16 2004 Manish Singh + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1b3f714cc1..d384d49c6d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Thu Feb 12 11:05:16 2004 Manish Singh + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Fix up item_area diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1b3f714cc1..d384d49c6d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Thu Feb 12 11:05:16 2004 Manish Singh + + * 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 * 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 baea158856..9aac1ff75e 100644 --- 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 8f09cf8a9b..3f722492a9 100644 --- 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 e14135e253..c0417ca82c 100644 --- 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)) {