[gnac] Code refactoring

[BenoÃt Dupasquier <bdupasqu src gnome org>]

commit 31cbc7e5d3df6db7e0deda4bd9b682f30c08ce24
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Fri Feb 17 00:38:01 2012 +0000

    Code refactoring

 src/gnac-ui-utils.c |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/src/gnac-ui-utils.c b/src/gnac-ui-utils.c
index 0a4e42c..249f14b 100644
--- a/src/gnac-ui-utils.c
+++ b/src/gnac-ui-utils.c
@@ -187,10 +187,9 @@ gnac_ui_utils_get_object(GtkBuilder  *builder,
                          const gchar *object_name)
 {
   GObject *object = gtk_builder_get_object(builder, object_name);
-  if (!object) {
+  if (!G_IS_OBJECT(object)) {
     libgnac_debug("Object %s not found\n", object_name);
   }
-
   return object;
 }
 
@@ -200,9 +199,7 @@ gnac_ui_utils_get_widget(GtkBuilder  *builder,
                          const gchar *widget_name)
 {
   GObject *object = gnac_ui_utils_get_object(builder, widget_name);
-  if (!object) return NULL;
-
-  return GTK_WIDGET(object);
+  return G_IS_OBJECT(object) ? GTK_WIDGET(object) : NULL;
 }
 
 
@@ -211,9 +208,7 @@ gnac_ui_utils_get_action(GtkBuilder  *builder,
                          const gchar *action_name)
 {
   GObject *object = gnac_ui_utils_get_object(builder, action_name);
-  if (!object) return NULL;
-
-  return GTK_ACTION(object);
+  return G_IS_OBJECT(object) ? GTK_ACTION(object) : NULL;
 }
 
 
@@ -223,7 +218,7 @@ gnac_ui_utils_set_action_sensitive(GtkBuilder  *builder,
                                    gboolean     activate)
 {
   GtkAction *action = gnac_ui_utils_get_action(builder, action_name);
-  if (action) gtk_action_set_sensitive(action, activate);
+  if (GTK_IS_ACTION(action)) gtk_action_set_sensitive(action, activate);
 }
 
 
@@ -233,7 +228,7 @@ gnac_ui_utils_set_action_visible(GtkBuilder  *builder,
                                  gboolean     visible)
 {
   GtkAction *action = gnac_ui_utils_get_action(builder, action_name);
-  if (action) gtk_action_set_visible(action, visible);
+  if (GTK_IS_ACTION(action)) gtk_action_set_visible(action, visible);
 }
 
 
@@ -243,5 +238,5 @@ gnac_ui_utils_set_widget_sensitive(GtkBuilder  *builder,
                                    gboolean     activate)
 {
   GtkWidget *widget = gnac_ui_utils_get_widget(builder, widget_name);
-  if (widget) gtk_widget_set_sensitive(widget, activate);
+  if (GTK_IS_WIDGET(widget)) gtk_widget_set_sensitive(widget, activate);
 }