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)
This commit is contained in:
committed by
Matthias Clasen
parent
184937d212
commit
a0d6f01036
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user