dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: g_printerr() a warning if grabbing fails 

This should not happen, but happens anyway on GTK+ 3.x, so better warn
about it to make debugging easier.
This commit is contained in:
Michael Natterer 2010-12-07 19:57:13 +01:00
parent 0ba0b637f2
commit 748fac5c00
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/display/gimpdisplayshell-callbacks.c
View File

@ -1845,6 +1845,8 @@ gimp_display_shell_ruler_button_press (GtkWidget *widget,
if (active_tool)
{
GdkGrabStatus status;
if (! gtk_widget_has_focus (shell->canvas))
{
gimp_display_shell_update_focus (shell, NULL, event->state);
@ -1858,21 +1860,42 @@ gimp_display_shell_ruler_button_press (GtkWidget *widget,
gdk_event_get_time ((GdkEvent *) event));
}
gdk_pointer_grab (gtk_widget_get_window (shell->canvas), FALSE,
GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON1_MOTION_MASK |
GDK_BUTTON_RELEASE_MASK,
NULL, NULL, event->time);
status = gdk_pointer_grab (gtk_widget_get_window (shell->canvas), FALSE,
GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON1_MOTION_MASK |
GDK_BUTTON_RELEASE_MASK,
NULL, NULL, event->time);
gdk_keyboard_grab (gtk_widget_get_window (shell->canvas),
FALSE, event->time);
if (status == GDK_GRAB_SUCCESS)
{
status = gdk_keyboard_grab (gtk_widget_get_window (shell->canvas),
FALSE, event->time);
if (sample_point)
gimp_color_tool_start_sample_point (active_tool, display);
else if (horizontal)
gimp_move_tool_start_hguide (active_tool, display);
if (status == GDK_GRAB_SUCCESS)
{
if (sample_point)
gimp_color_tool_start_sample_point (active_tool, display);
else if (horizontal)
gimp_move_tool_start_hguide (active_tool, display);
else
gimp_move_tool_start_vguide (active_tool, display);
return TRUE;
}
else
{
g_printerr ("%s: gdk_keyboard_grab failed with status %d\n",
G_STRFUNC, status);
gdk_display_pointer_ungrab (gtk_widget_get_display (shell->canvas),
event->time);
}
}
else
gimp_move_tool_start_vguide (active_tool, display);
{
g_printerr ("%s: gdk_pointer_grab failed with status %d\n",
G_STRFUNC, status);
}
}
}