callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Owen Taylor 2002-02-21 03:00:40 +00:00 committed by Owen Taylor
parent 639c8cac7a
commit e6d7f5e196
10 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

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

8
ChangeLog.pre-2-0
View File

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

8
ChangeLog.pre-2-10
View File

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

8
ChangeLog.pre-2-2
View File

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

8
ChangeLog.pre-2-4
View File

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

8
ChangeLog.pre-2-6
View File

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

8
ChangeLog.pre-2-8
View File

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

5
gdk/x11/gdkproperty-x11.c
View File

@ -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

2
gdk/x11/gdkselection-x11.c
View File

@ -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;

2
gtk/gtkselection.c
View File

@ -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);