AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix handling of GDK_NONE

Browse Source 
Don't intern "NONE" and warn if GDK_NONE is converted to an
X atom. Problem pointed out in bug 580511.
This commit is contained in:
Matthias Clasen 2009-05-03 21:38:54 -04:00
parent 832be659b7
commit d183f44748
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ static GHashTable *virtual_atom_hash;
static const gchar xatoms_string[] = static const gchar xatoms_string[] =
/* These are all the standard predefined X atoms */ /* These are all the standard predefined X atoms */
"NONE\0" "\0" /* leave a space for None, even though it is not a predefined atom */
"PRIMARY\0" "PRIMARY\0"
"SECONDARY\0" "SECONDARY\0"
"ARC\0" "ARC\0"
@ -120,12 +120,12 @@ static const gchar xatoms_string[] =
; ;
static const gint xatoms_offset[] = { static const gint xatoms_offset[] = {
0, 5, 13, 23, 27, 32, 39, 48, 57, 64, 76, 88, 0, 1, 9, 19, 23, 28, 35, 44, 53, 60, 72, 84,
100, 112, 124, 136, 148, 160, 169, 174, 182, 189, 195, 205, 96, 108, 120, 132, 144, 156, 165, 170, 178, 185, 189, 201,
222, 236, 249, 262, 278, 291, 305, 317, 324, 333, 340, 351, 218, 232, 245, 258, 274, 287, 301, 313, 320, 329, 336, 347,
360, 378, 391, 404, 412, 428, 442, 456, 466, 477, 487, 497, 356, 374, 387, 400, 408, 424, 438, 452, 462, 473, 483, 493,
511, 525, 537, 549, 568, 588, 605, 623, 636, 645, 656, 663, 507, 521, 533, 545, 564, 584, 601, 619, 632, 641, 652, 659,
674, 685, 695, 702, 712, 724, 734, 745, 754, 771 670, 681, 691, 698, 708, 720, 730, 741, 750, 767
}; };
#define N_CUSTOM_PREDEFINED 1 #define N_CUSTOM_PREDEFINED 1
@ -189,6 +189,7 @@ gdk_x11_atom_to_xatom_for_display (GdkDisplay *display,
Atom xatom = None; Atom xatom = None;
g_return_val_if_fail (GDK_IS_DISPLAY (display), None); g_return_val_if_fail (GDK_IS_DISPLAY (display), None);
g_return_val_if_fail (atom != GDK_NONE, None);
if (display->closed) if (display->closed)
return None; return None;
@ -292,6 +293,7 @@ gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
GdkAtom virtual_atom = GDK_NONE; GdkAtom virtual_atom = GDK_NONE;
g_return_val_if_fail (GDK_IS_DISPLAY (display), GDK_NONE); g_return_val_if_fail (GDK_IS_DISPLAY (display), GDK_NONE);
g_return_val_if_fail (xatom != None, GDK_NONE);
if (display->closed) if (display->closed)
return GDK_NONE; return GDK_NONE;

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

@ -404,7 +404,10 @@ gdk_selection_send_notify_for_display (GdkDisplay *display,
xevent.requestor = requestor; xevent.requestor = requestor;
xevent.selection = gdk_x11_atom_to_xatom_for_display (display, selection); xevent.selection = gdk_x11_atom_to_xatom_for_display (display, selection);
xevent.target = gdk_x11_atom_to_xatom_for_display (display, target); xevent.target = gdk_x11_atom_to_xatom_for_display (display, target);
xevent.property = gdk_x11_atom_to_xatom_for_display (display, property); if (property == GDK_NONE)
xevent.property = None;
else
xevent.property = gdk_x11_atom_to_xatom_for_display (display, property);
xevent.time = time; xevent.time = time;
_gdk_send_xevent (display, requestor, False, NoEventMask, (XEvent*) & xevent); _gdk_send_xevent (display, requestor, False, NoEventMask, (XEvent*) & xevent);