diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-05-18 18:13:27 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-05-18 18:13:27 +0000 |
| commit | 0b98adf31af51bf873797045601fc346756f04b1 (patch) | |
| tree | d0248b00e9779d0c02e705f4b469d59d350a7672 | |
| parent | 0e1bc0d4113c8c444a8108eecf1ae722afd40fcb (diff) | |
| download | gtk+-0b98adf31af51bf873797045601fc346756f04b1.tar.gz | |
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)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | gdk/x11/gdkdnd-x11.c | 5 |
3 files changed, 7 insertions, 4 deletions
@@ -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 e82e1bd118..1c22de2cb6 100644 --- 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 ad816c9f5b..b4eb8e9d39 100644 --- 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); |