diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2009-05-24 00:30:58 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2009-05-24 00:30:58 -0400 |
| commit | 96912b564f164243a143c787ea882c0c738fe2f3 (patch) | |
| tree | 886536d1fbe3b8d7ff68528a0b9e0455496624a7 /gdk/x11/gdkdnd-x11.c | |
| parent | 478cc88f8dcaa35c7b1be819d1bf7387606ce1a8 (diff) | |
| download | gtk+-96912b564f164243a143c787ea882c0c738fe2f3.tar.gz | |
Avoid another case of treating None as an atom
Diffstat (limited to 'gdk/x11/gdkdnd-x11.c')
| -rw-r--r-- | gdk/x11/gdkdnd-x11.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 942ad91eb9..82ef442265 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -1919,9 +1919,14 @@ static GdkDragAction xdnd_action_from_atom (GdkDisplay *display, Atom xatom) { - GdkAtom atom = gdk_x11_xatom_to_atom_for_display (display, xatom); + GdkAtom atom; gint i; + if (xatom == None) + return 0; + + atom = gdk_x11_xatom_to_atom_for_display (display, xatom); + if (!xdnd_actions_initialized) xdnd_initialize_actions(); |