Always set protocol. (#342003, Tommi Komulainen)

2006-05-18  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display):
	Always set protocol.  (#342003, Tommi Komulainen)

diff --git a/ChangeLog b/ChangeLog
index e82e1bd1186a29980a6d93ecaa9ab6f7b5d78815..1c22de2cb6b810fd98319df345c559b0cbe86380 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): 
+       Always set protocol.  (#342003, Tommi Komulainen)
+
        * gtk/gtkimage.c (icon_theme_changed): Only unref the pixbuf
        if the image has the appropriate storage type.  (#342096, Tommi
        Komulainen)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e82e1bd1186a29980a6d93ecaa9ab6f7b5d78815..1c22de2cb6b810fd98319df345c559b0cbe86380 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): 
+       Always set protocol.  (#342003, Tommi Komulainen)
+
        * gtk/gtkimage.c (icon_theme_changed): Only unref the pixbuf
        if the image has the appropriate storage type.  (#342096, Tommi
        Komulainen)

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index ad816c9f5bb218b2b72b139c403122415d3ed213..b4eb8e9d39e1e65c13d5663e8ff6d6b2a1fb4cef 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -3012,11 +3012,8 @@ _gdk_drag_get_protocol_for_display (GdkDisplay      *display,
          GDK_NOTE (DND, g_message ("Entering root window\n"));
          return xid;
        }
-              
-       return None;
     }
-  
-  if ((retval = xdnd_check_dest (display, xid, version)))
+  else if ((retval = xdnd_check_dest (display, xid, version)))
     {
       *protocol = GDK_DRAG_PROTO_XDND;
       xdnd_precache_atoms (display);