From e0a1e78a5a8d20b35db103ff230a456e48a50c58 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 20 Aug 2009 18:06:35 -0400
Subject: [PATCH] Silence the conversion from xatom to atom too

---
 gdk/x11/gdkproperty-x11.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 181b13e819..b0ce21b35f 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -296,7 +296,9 @@ gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
   GdkAtom virtual_atom = GDK_NONE;
   
   g_return_val_if_fail (GDK_IS_DISPLAY (display), GDK_NONE);
-  g_return_val_if_fail (xatom != None, GDK_NONE);
+
+  if (xatom == None)
+    return GDK_NONE;
 
   if (display->closed)
     return GDK_NONE;