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

Avoid warnings in atom conversion

Browse Source 
Cave in and revert to silently converting GDK_NONE to None.
Fixes bug 580511.
This commit is contained in:
Matthias Clasen 2009-06-05 22:36:48 -04:00
parent dccfd423ca
commit 4b16b875db
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,37 +173,40 @@ lookup_cached_xatom (GdkDisplay *display,
/** /**
* gdk_x11_atom_to_xatom_for_display: * gdk_x11_atom_to_xatom_for_display:
* @display: A #GdkDisplay * @display: A #GdkDisplay
* @atom: A #GdkAtom * @atom: A #GdkAtom, or %GDK_NONE
* *
* Converts from a #GdkAtom to the X atom for a #GdkDisplay * Converts from a #GdkAtom to the X atom for a #GdkDisplay
* with the same string value. * with the same string value. The special value %GDK_NONE
* * is converted to %None.
* Return value: the X atom corresponding to @atom. *
* Return value: the X atom corresponding to @atom, or %None
* *
* Since: 2.2 * Since: 2.2
**/ **/
Atom Atom
gdk_x11_atom_to_xatom_for_display (GdkDisplay *display, gdk_x11_atom_to_xatom_for_display (GdkDisplay *display,
GdkAtom atom) GdkAtom atom)
{ {
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 (atom == GDK_NONE)
return None;
if (display->closed) if (display->closed)
return None; return None;
xatom = lookup_cached_xatom (display, atom); xatom = lookup_cached_xatom (display, atom);
if (!xatom) if (!xatom)
{ {
char *name; char *name;
g_return_val_if_fail (ATOM_TO_INDEX (atom) < virtual_atom_array->len, None); g_return_val_if_fail (ATOM_TO_INDEX (atom) < virtual_atom_array->len, None);
name = g_ptr_array_index (virtual_atom_array, ATOM_TO_INDEX (atom)); name = g_ptr_array_index (virtual_atom_array, ATOM_TO_INDEX (atom));
xatom = XInternAtom (GDK_DISPLAY_XDISPLAY (display), name, FALSE); xatom = XInternAtom (GDK_DISPLAY_XDISPLAY (display), name, FALSE);
insert_atom_pair (display, atom, xatom); insert_atom_pair (display, atom, xatom);
} }