[gimp/soc-2011-seamless-clone2] app: allow to pass NULL to gimp_window_set_primary_focus_widget()
- From: Clayton Walker <claytonw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2011-seamless-clone2] app: allow to pass NULL to gimp_window_set_primary_focus_widget()
- Date: Wed, 8 May 2013 15:10:47 +0000 (UTC)
commit 92f1f07e8ae4e90fef6f3c1b23f6e363f33479b3
Author: Michael Natterer <mitch gimp org>
Date: Wed Apr 10 19:28:49 2013 +0200
app: allow to pass NULL to gimp_window_set_primary_focus_widget()
app/widgets/gimpwindow.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/app/widgets/gimpwindow.c b/app/widgets/gimpwindow.c
index 9d3f129..4bcf607 100644
--- a/app/widgets/gimpwindow.c
+++ b/app/widgets/gimpwindow.c
@@ -177,8 +177,9 @@ gimp_window_set_primary_focus_widget (GimpWindow *window,
GtkWidget *primary_focus)
{
g_return_if_fail (GIMP_IS_WINDOW (window));
- g_return_if_fail (GTK_IS_WIDGET (primary_focus));
- g_return_if_fail (gtk_widget_get_toplevel (primary_focus) ==
+ g_return_if_fail (primary_focus == NULL || GTK_IS_WIDGET (primary_focus));
+ g_return_if_fail (primary_focus == NULL ||
+ gtk_widget_get_toplevel (primary_focus) ==
GTK_WIDGET (window));
if (window->primary_focus_widget)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]