[gtk+/gtk-2-24] gdk_drawable_get_screen() used for mask, which is a pixmap, not a window



commit d9164e9c6075f95aad11012ec4114d97b26aa7c5
Author: Sebastian Gerhardt <sebgerhardt gmx net>
Date:   Mon Aug 18 18:40:48 2014 +0200

    gdk_drawable_get_screen() used for mask, which is a pixmap, not a window
    
    The function gtk_drag_set_icon_pixmap() triggered failing assertions. This was because it called the 
function gdk_window_get_screen(mask), where "mask" is a pixmap, but not a window.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735005

 gtk/gtkdnd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 7488358..144ec2b 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3272,7 +3272,7 @@ gtk_drag_set_icon_pixmap (GdkDragContext    *context,
   screen = gdk_colormap_get_screen (colormap);
   
   g_return_if_fail (gdk_drawable_get_screen (pixmap) == screen);
-  g_return_if_fail (!mask || gdk_window_get_screen (mask) == screen);
+  g_return_if_fail (!mask || gdk_drawable_get_screen (mask) == screen);
 
   gdk_drawable_get_size (pixmap, &width, &height);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]