[gnome-builder] egg-state-machine: Small cleanup

[Garrett Regier <gregier src gnome org>]

commit d62a330b481d8a179e1975663a6d412091c9222b
Author: Garrett Regier <garrettregier gmail com>
Date:   Wed May 20 20:54:04 2015 -0700

    egg-state-machine: Small cleanup

 contrib/egg/egg-state-machine-action.c    |   15 +++++++--------
 contrib/egg/egg-state-machine-buildable.c |    2 +-
 contrib/egg/egg-state-machine.c           |   10 +++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/contrib/egg/egg-state-machine-action.c b/contrib/egg/egg-state-machine-action.c
index 879af83..12e670d 100644
--- a/contrib/egg/egg-state-machine-action.c
+++ b/contrib/egg/egg-state-machine-action.c
@@ -110,14 +110,13 @@ egg_state_machine_action_set_state_machine (EggStateMachineAction *self,
   g_return_if_fail (EGG_IS_STATE_MACHINE (state_machine));
   g_return_if_fail (self->state_machine == NULL);
 
-  if (g_set_object (&self->state_machine, state_machine))
-    {
-      g_signal_connect_object (state_machine,
-                               "notify::state",
-                               G_CALLBACK (egg_state_machine_action_state_set_cb),
-                               self,
-                               G_CONNECT_SWAPPED);
-    }
+  self->state_machine = g_object_ref (state_machine);
+
+  g_signal_connect_object (state_machine,
+                           "notify::state",
+                           G_CALLBACK (egg_state_machine_action_state_set_cb),
+                           self,
+                           G_CONNECT_SWAPPED);
 }
 
 static void
diff --git a/contrib/egg/egg-state-machine-buildable.c b/contrib/egg/egg-state-machine-buildable.c
index f69c2f9..5b60966 100644
--- a/contrib/egg/egg-state-machine-buildable.c
+++ b/contrib/egg/egg-state-machine-buildable.c
@@ -163,7 +163,7 @@ add_state (StatesParserData  *parser_data,
           else if (stack_prop->u.property.text != NULL)
             {
               GParamSpec *pspec;
-              GValue value = { 0 };
+              GValue value = G_VALUE_INIT;
 
               pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object), 
stack_prop->u.property.name);
 
diff --git a/contrib/egg/egg-state-machine.c b/contrib/egg/egg-state-machine.c
index f545a27..6892d90 100644
--- a/contrib/egg/egg-state-machine.c
+++ b/contrib/egg/egg-state-machine.c
@@ -439,7 +439,7 @@ egg_state_machine_get_state (EggStateMachine *self)
 {
   EggStateMachinePrivate *priv = egg_state_machine_get_instance_private (self);
 
-  g_return_if_fail (EGG_IS_STATE_MACHINE (self));
+  g_return_val_if_fail (EGG_IS_STATE_MACHINE (self), NULL);
 
   return priv->state;
 }
@@ -566,7 +566,7 @@ egg_state_machine_add_propertyv (EggStateMachine *self,
 
   g_return_if_fail (EGG_IS_STATE_MACHINE (self));
   g_return_if_fail (state != NULL);
-  g_return_if_fail (object != NULL);
+  g_return_if_fail (G_IS_OBJECT (object));
   g_return_if_fail (property != NULL);
   g_return_if_fail (G_IS_VALUE (value));
 
@@ -600,9 +600,9 @@ egg_state_machine_add_binding (EggStateMachine *self,
 
   g_return_if_fail (EGG_IS_STATE_MACHINE (self));
   g_return_if_fail (state != NULL);
-  g_return_if_fail (source_object != NULL);
+  g_return_if_fail (G_IS_OBJECT (source_object));
   g_return_if_fail (source_property != NULL);
-  g_return_if_fail (target_object != NULL);
+  g_return_if_fail (G_IS_OBJECT (target_object));
   g_return_if_fail (target_property != NULL);
 
   state_obj = egg_state_machine_get_state_obj (self, state);
@@ -634,7 +634,7 @@ egg_state_machine_add_style (EggStateMachine *self,
   g_return_if_fail (EGG_IS_STATE_MACHINE (self));
   g_return_if_fail (state != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (style);
+  g_return_if_fail (style != NULL);
 
   state_obj = egg_state_machine_get_state_obj (self, state);