callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to get an icon window when constructing the fallback_icon. This

Browse Source 
2006-03-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkdnd.c (gtk_drag_get_icon): Make sure to get an
	icon window when constructing the fallback_icon. This
	fixes a crash when dragging icons between screens in
	nautilus.  (#325751, Hylke van der Schaaf)
This commit is contained in:
Matthias Clasen 2006-03-30 18:22:39 +00:00 committed by Matthias Clasen
parent cfd72f5cd6
commit bbec8800a4
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,6 +1,13 @@
2006-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_get_icon): Make sure to get an
icon window when constructing the fallback_icon. This
fixes a crash when dragging icons between screens in
nautilus. (#325751, Hylke van der Schaaf)
2006-03-30 Michael Emmel <mike.emmel@gmail.com> 2006-03-30 Michael Emmel <mike.emmel@gmail.com>
* gdk/directfb/gdkpixmap-directfb.c implement * gdk/directfb/gdkpixmap-directfb.c implement
(gdk_pixmap_foreign_new_for_screen) (gdk_pixmap_foreign_new_for_screen)
2006-03-30 Emmanuele Bassi <ebassi@cvs.gnome.org> 2006-03-30 Emmanuele Bassi <ebassi@cvs.gnome.org>

9
ChangeLog.pre-2-10
View File

@ -1,6 +1,13 @@
2006-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_get_icon): Make sure to get an
icon window when constructing the fallback_icon. This
fixes a crash when dragging icons between screens in
nautilus. (#325751, Hylke van der Schaaf)
2006-03-30 Michael Emmel <mike.emmel@gmail.com> 2006-03-30 Michael Emmel <mike.emmel@gmail.com>
* gdk/directfb/gdkpixmap-directfb.c implement * gdk/directfb/gdkpixmap-directfb.c implement
(gdk_pixmap_foreign_new_for_screen) (gdk_pixmap_foreign_new_for_screen)
2006-03-30 Emmanuele Bassi <ebassi@cvs.gnome.org> 2006-03-30 Emmanuele Bassi <ebassi@cvs.gnome.org>

20
gtk/gtkdnd.c
View File

@ -288,6 +288,13 @@ static gboolean gtk_drag_button_release_cb (GtkWidget *widget,
gpointer data); gpointer data);
static gboolean gtk_drag_abort_timeout (gpointer data); static gboolean gtk_drag_abort_timeout (gpointer data);
static void set_icon_stock_pixbuf (GdkDragContext *context,
const gchar *stock_id,
GdkPixbuf *pixbuf,
gint hot_x,
gint hot_y,
gboolean force_window);
/************************ /************************
* Cursor and Icon data * * Cursor and Icon data *
************************/ ************************/
@ -2764,7 +2771,16 @@ gtk_drag_get_icon (GtkDragSourceInfo *info,
save_destroy_icon = info->destroy_icon; save_destroy_icon = info->destroy_icon;
info->icon_window = NULL; info->icon_window = NULL;
gtk_drag_set_icon_default (info->context); if (!default_icon_pixmap)
set_icon_stock_pixbuf (info->context,
GTK_STOCK_DND, NULL, -2, -2, TRUE);
else
gtk_drag_set_icon_pixmap (info->context,
default_icon_colormap,
default_icon_pixmap,
default_icon_mask,
default_icon_hot_x,
default_icon_hot_y);
info->fallback_icon = info->icon_window; info->fallback_icon = info->icon_window;
info->icon_window = save_icon_window; info->icon_window = save_icon_window;
@ -3145,7 +3161,7 @@ gtk_drag_set_icon_name (GdkDragContext *context,
* icon. * icon.
**/ **/
void void
gtk_drag_set_icon_default (GdkDragContext *context) gtk_drag_set_icon_default (GdkDragContext *context)
{ {
g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
g_return_if_fail (context->is_source); g_return_if_fail (context->is_source);