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

GtkWindowGroup: Add guards to some gtk_window_group_* functions

Browse Source
This commit is contained in:
Javier Jardón 2010-06-24 18:38:16 +02:00
parent 9ee3d73a19
commit cd9a9e1548
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkwindow.c
View File

@ -7884,6 +7884,8 @@ gtk_window_has_group (GtkWindow *window)
GtkWidget * GtkWidget *
gtk_window_group_get_current_grab (GtkWindowGroup *window_group) gtk_window_group_get_current_grab (GtkWindowGroup *window_group)
{ {
g_return_val_if_fail (GTK_IS_WINDOW_GROUP (window_group), NULL);
if (window_group->grabs) if (window_group->grabs)
return GTK_WIDGET (window_group->grabs->data); return GTK_WIDGET (window_group->grabs->data);
return NULL; return NULL;
@ -7964,6 +7966,9 @@ gtk_window_group_get_current_device_grab (GtkWindowGroup *window_group,
GdkDevice *other_device; GdkDevice *other_device;
GSList *list; GSList *list;
g_return_val_if_fail (GTK_IS_WINDOW_GROUP (window_group), NULL);
g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
priv = GTK_WINDOW_GROUP_GET_PRIVATE (window_group); priv = GTK_WINDOW_GROUP_GET_PRIVATE (window_group);
list = priv->device_grabs; list = priv->device_grabs;
other_device = gdk_device_get_associated_device (device); other_device = gdk_device_get_associated_device (device);