[gnome-builder] egg-state-machine: Kill freeze() and thaw()

[Garrett Regier <gregier src gnome org>]

commit 32be6abeeb7765069d65318f25c5f7da449d5ada
Author: Garrett Regier <garrettregier gmail com>
Date:   Wed May 20 21:48:21 2015 -0700

    egg-state-machine: Kill freeze() and thaw()

 contrib/egg/egg-state-machine-buildable.c |   11 --------
 contrib/egg/egg-state-machine-private.h   |    2 -
 contrib/egg/egg-state-machine.c           |   40 +----------------------------
 contrib/egg/egg-state-machine.h           |    2 -
 4 files changed, 1 insertions(+), 54 deletions(-)
---
diff --git a/contrib/egg/egg-state-machine-buildable.c b/contrib/egg/egg-state-machine-buildable.c
index 5ac235e..c83abb6 100644
--- a/contrib/egg/egg-state-machine-buildable.c
+++ b/contrib/egg/egg-state-machine-buildable.c
@@ -626,8 +626,6 @@ egg_state_machine_buildable_custom_tag_start (GtkBuildable  *buildable,
       parser_data->builder = g_object_ref (builder);
       parser_data->stack = g_queue_new ();
 
-      egg_state_machine_freeze (self);
-
       *parser = StatesParser;
       *data = parser_data;
 
@@ -653,20 +651,11 @@ egg_state_machine_buildable_custom_finished (GtkBuildable *buildable,
   if (g_strcmp0 (tagname, "states") == 0)
     {
       StatesParserData *parser_data = user_data;
-      gchar *state;
 
       g_object_unref (parser_data->self);
       g_object_unref (parser_data->builder);
       g_queue_free_full (parser_data->stack, (GDestroyNotify)stack_item_free);
       g_slice_free (StatesParserData, parser_data);
-
-      egg_state_machine_thaw (self);
-
-      /* XXX: reapply current state */
-      state = g_strdup (egg_state_machine_get_state (self));
-      egg_state_machine_set_state (self, NULL);
-      egg_state_machine_set_state (self, state);
-      g_free (state);
     }
 }
 
diff --git a/contrib/egg/egg-state-machine-private.h b/contrib/egg/egg-state-machine-private.h
index 72239cd..db45490 100644
--- a/contrib/egg/egg-state-machine-private.h
+++ b/contrib/egg/egg-state-machine-private.h
@@ -28,8 +28,6 @@ typedef struct
   gchar      *state;
   GPtrArray  *actions;
   GHashTable *states;
-  gchar      *freeze_state;
-  gint        freeze_count;
 } EggStateMachinePrivate;
 
 typedef struct
diff --git a/contrib/egg/egg-state-machine.c b/contrib/egg/egg-state-machine.c
index f07f1a2..ee3933e 100644
--- a/contrib/egg/egg-state-machine.c
+++ b/contrib/egg/egg-state-machine.c
@@ -477,8 +477,7 @@ egg_state_machine_set_state (EggStateMachine *self,
 
       priv->state = g_strdup (state);
 
-      if (priv->freeze_count == 0)
-        egg_state_machine_transition (self, old_state, state);
+      egg_state_machine_transition (self, old_state, state);
 
       g_free (new_state);
       g_free (old_state);
@@ -695,40 +694,3 @@ egg_state_machine_connect_object (EggStateMachine *self,
 
   egg_signal_group_connect_object (signals, detailed_signal, callback, user_data, flags);
 }
-
-void
-egg_state_machine_freeze (EggStateMachine *self)
-{
-  EggStateMachinePrivate *priv = egg_state_machine_get_instance_private (self);
-
-  g_return_if_fail (EGG_IS_STATE_MACHINE (self));
-  g_return_if_fail (priv->freeze_count >= 0);
-
-  if (++priv->freeze_count == 1)
-    {
-      g_assert (priv->freeze_state == NULL);
-      priv->freeze_state = g_strdup (priv->state);
-    }
-}
-
-void
-egg_state_machine_thaw (EggStateMachine *self)
-{
-  EggStateMachinePrivate *priv = egg_state_machine_get_instance_private (self);
-
-  g_return_if_fail (EGG_IS_STATE_MACHINE (self));
-  g_return_if_fail (priv->freeze_count > 0);
-
-  if (--priv->freeze_count == 0)
-    {
-      if (g_strcmp0 (priv->freeze_state, priv->state) != 0)
-        {
-          gchar *state;
-
-          state = priv->freeze_state;
-          priv->freeze_state = NULL;
-          egg_state_machine_set_state (self, state);
-          g_free (state);
-        }
-    }
-}
diff --git a/contrib/egg/egg-state-machine.h b/contrib/egg/egg-state-machine.h
index 96b4a23..d0dc3c5 100644
--- a/contrib/egg/egg-state-machine.h
+++ b/contrib/egg/egg-state-machine.h
@@ -65,8 +65,6 @@ void             egg_state_machine_add_style         (EggStateMachine *self,
                                                       const gchar     *state,
                                                       GtkWidget       *widget,
                                                       const gchar     *style);
-void             egg_state_machine_freeze            (EggStateMachine *self);
-void             egg_state_machine_thaw              (EggStateMachine *self);
 void             egg_state_machine_connect_object    (EggStateMachine *self,
                                                       const gchar     *state,
                                                       gpointer         source,