From a0d6f010366e5a96d97d53eb985c4d0439ec320f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 May 2006 18:15:40 +0000 Subject: [PATCH] Always set protocol. (#342003, Tommi Komulainen) 2006-05-18 Matthias Clasen * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): Always set protocol. (#342003, Tommi Komulainen) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gdk/x11/gdkdnd-x11.c | 5 +---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f7a5c9eb9..843cde377a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-05-18 Matthias Clasen + * 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 4f7a5c9eb9..843cde377a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-05-18 Matthias Clasen + * 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 252a030127..41bc282054 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -3041,11 +3041,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);