Commit 9f3f20dc authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Don't fail if we can't get a keyboard grab. (#168351)

2005-07-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkdnd.c (gtk_drag_begin_internal): Don't fail if we
	can't get a keyboard grab.  (#168351)
parent 81ca5ae7
2005-07-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin_internal): Don't fail if we
can't get a keyboard grab. (#168351)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_[sg]et_property):
Add GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION.
......
2005-07-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin_internal): Don't fail if we
can't get a keyboard grab. (#168351)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_[sg]et_property):
Add GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION.
......
2005-07-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin_internal): Don't fail if we
can't get a keyboard grab. (#168351)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_[sg]et_property):
Add GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION.
......
......@@ -115,8 +115,7 @@ struct _GtkDragSourceInfo
guint destroy_icon : 1; /* If true, destroy icon_window
*/
guint have_grab : 1; /* Do we still have the pointer grab
*/
*/
GdkPixbuf *icon_pixbuf;
GdkCursor *drag_cursors[6];
};
......@@ -2095,18 +2094,14 @@ gtk_drag_begin_internal (GtkWidget *widget,
if (gdk_pointer_grab (ipc_widget->window, FALSE,
GDK_POINTER_MOTION_MASK |
GDK_BUTTON_RELEASE_MASK, NULL,
cursor, time) != 0)
{
gtk_drag_release_ipc_widget (ipc_widget);
return NULL;
}
if (gdk_keyboard_grab (ipc_widget->window, FALSE, time) != 0)
cursor, time) != GDK_GRAB_SUCCESS)
{
gtk_drag_release_ipc_widget (ipc_widget);
return NULL;
}
gdk_keyboard_grab (ipc_widget->window, FALSE, time);
/* We use a GTK grab here to override any grabs that the widget
* we are dragging from might have held
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment