summaryrefslogtreecommitdiff
path: root/gtk/a11y/gailutil.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-06-28 23:42:50 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-07-05 16:08:55 -0400
commit48c3d8e1cfa7dfde5eea1339c754e81075fe17e8 (patch)
treedd0281dd07e068031f82f6c1d9a4d7c6eff9534b /gtk/a11y/gailutil.c
parente4dc06b7d5a9df0ec695b5c737a584a9505ae39b (diff)
downloadgtk+-48c3d8e1cfa7dfde5eea1339c754e81075fe17e8.tar.gz
Drop gail-private-macros.h
Nothing like obfuscating an early return behind a macro.
Diffstat (limited to 'gtk/a11y/gailutil.c')
-rw-r--r--gtk/a11y/gailutil.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk/a11y/gailutil.c b/gtk/a11y/gailutil.c
index 4d1d6da02c..316efff919 100644
--- a/gtk/a11y/gailutil.c
+++ b/gtk/a11y/gailutil.c
@@ -25,7 +25,6 @@
#include "gailutil.h"
#include "gailtoplevel.h"
#include "gailwindow.h"
-#include "gail-private-macros.h"
static void gail_util_class_init (GailUtilClass *klass);
static void gail_util_init (GailUtil *utils);
@@ -441,7 +440,8 @@ state_event_watcher (GSignalInvocationHint *hint,
return FALSE;
event = g_value_get_boxed (param_values + 1);
- gail_return_val_if_fail (event->type == GDK_WINDOW_STATE, FALSE);
+ if (event->type == GDK_WINDOW_STATE)
+ return FALSE;
widget = GTK_WIDGET (object);
if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
@@ -488,7 +488,8 @@ window_added (AtkObject *atk_obj,
if (!GAIL_IS_WINDOW (child)) return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
- gail_return_if_fail (widget);
+ if (!widget)
+ return;
g_signal_connect (widget, "focus-in-event",
(GCallback) window_focus, NULL);
@@ -509,7 +510,8 @@ window_removed (AtkObject *atk_obj,
if (!GAIL_IS_WINDOW (child)) return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
- gail_return_if_fail (widget);
+ if (!widget)
+ return;
window = GTK_WINDOW (widget);
/*