[gtk+] Avoid another case of treating None as an atom



commit 96912b564f164243a143c787ea882c0c738fe2f3
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun May 24 00:30:58 2009 -0400

    Avoid another case of treating None as an atom
---
 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 942ad91..82ef442 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();
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]