ephy-state: rename to 'ephy-initial-state'

The purpose of EphyState is to track the sizes and positions of
windows, paned or expanders in order to remember what is the preferred
*initial* and *default* state of those UI elements. So for example we
merge the tracking of the size/positions of all main windows in one
record, because we only need an initial value which we'll use as
default for newly created EphyWindows.

Since this is a very specific task, different to the actual tracking
of all sizes and positions in EphySession in order to restore them at
startup, rename the class to EphyInitialState to avoid confusions.

12 files changed, 117 insertions, 120 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c120afc51..146e64709 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -32,15 +32,15 @@ NOINST_H_FILES = \
 	ephy-zoom.h
 
 TYPES_H_FILES = \
-	ephy-node.h				\
-	ephy-state.h
+	ephy-initial-state.h			\
+	ephy-node.h
 
 INST_H_FILES = \
 	ephy-dialog.h				\
+	ephy-initial-state.h			\
 	ephy-node.h				\
 	ephy-node-db.h				\
-	ephy-settings.h				\
-	ephy-state.h
+	ephy-settings.h
 
 libephymisc_la_SOURCES = \
 	ephy-debug.c				\
@@ -50,6 +50,7 @@ libephymisc_la_SOURCES = \
 	ephy-file-chooser.c			\
 	ephy-file-helpers.c			\
 	ephy-gui.c				\
+	ephy-initial-state.c			\
 	ephy-langs.c				\
 	ephy-node.c				\
 	ephy-node.h				\
@@ -66,7 +67,6 @@ libephymisc_la_SOURCES = \
 	ephy-snapshot-service.c			\
 	ephy-sqlite-connection.c		\
 	ephy-sqlite-statement.c			\
-	ephy-state.c				\
 	ephy-string.c				\
 	ephy-time-helpers.c			\
 	ephy-web-app-utils.c			\
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index f170d01f5..a5dd290e6 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "ephy-dialog.h"
-#include "ephy-state.h"
+#include "ephy-initial-state.h"
 #include "ephy-gui.h"
 #include "ephy-debug.h"
 
@@ -110,20 +110,20 @@ setup_default_size (EphyDialog *dialog)
 {
 	if (dialog->priv->has_default_size == FALSE)
 	{
-		EphyStateWindowFlags flags;
+		EphyInitialStateWindowFlags flags;
 
-		flags = EPHY_STATE_WINDOW_SAVE_SIZE;
+		flags = EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE;
 
 		if (dialog->priv->persist_position)
 		{
-			flags |= EPHY_STATE_WINDOW_SAVE_POSITION;
+			flags |= EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION;
 		}
 
-		ephy_state_add_window (dialog->priv->dialog,
-				       dialog->priv->name,
-				       dialog->priv->default_width,
-				       dialog->priv->default_height,
-				       FALSE, flags);
+		ephy_initial_state_add_window (dialog->priv->dialog,
+                                               dialog->priv->name,
+                                               dialog->priv->default_width,
+                                               dialog->priv->default_height,
+                                               FALSE, flags);
 
 		dialog->priv->has_default_size = TRUE;
 	}
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 2e228103d..4f8357578 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -22,7 +22,6 @@
 
 #include "ephy-file-chooser.h"
 #include "ephy-file-helpers.h"
-#include "ephy-state.h"
 #include "ephy-gui.h"
 #include "ephy-debug.h"
 #include "ephy-settings.h"
diff --git a/lib/ephy-state.c b/lib/ephy-initial-state.c
index 57dc211a9..fb625ac45 100644
--- a/lib/ephy-state.c
+++ b/lib/ephy-initial-state.c
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "ephy-state.h"
+#include "ephy-initial-state.h"
 
 #include "ephy-file-helpers.h"
 #include "ephy-lib-type-builtins.h"
@@ -37,15 +37,15 @@
 
 enum
 {
-  EPHY_NODE_STATE_PROP_NAME = 2,
-  EPHY_NODE_STATE_PROP_WIDTH = 3,
-  EPHY_NODE_STATE_PROP_HEIGHT = 4,
-  EPHY_NODE_STATE_PROP_MAXIMIZE = 5,
-  EPHY_NODE_STATE_PROP_POSITION_X = 6,
-  EPHY_NODE_STATE_PROP_POSITION_Y = 7,
-  EPHY_NODE_STATE_PROP_SIZE = 8,
-  EPHY_NODE_STATE_PROP_POSITION = 9,
-  EPHY_NODE_STATE_PROP_ACTIVE = 10
+  EPHY_NODE_INITIAL_STATE_PROP_NAME = 2,
+  EPHY_NODE_INITIAL_STATE_PROP_WIDTH = 3,
+  EPHY_NODE_INITIAL_STATE_PROP_HEIGHT = 4,
+  EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE = 5,
+  EPHY_NODE_INITIAL_STATE_PROP_POSITION_X = 6,
+  EPHY_NODE_INITIAL_STATE_PROP_POSITION_Y = 7,
+  EPHY_NODE_INITIAL_STATE_PROP_SIZE = 8,
+  EPHY_NODE_INITIAL_STATE_PROP_POSITION = 9,
+  EPHY_NODE_INITIAL_STATE_PROP_ACTIVE = 10
 };
 
 static EphyNode *states = NULL;
@@ -86,7 +86,7 @@ find_by_name (const char *name)
     kid = g_ptr_array_index (children, i);
 
     node_name = ephy_node_get_property_string
-      (kid, EPHY_NODE_STATE_PROP_NAME);
+      (kid, EPHY_NODE_INITIAL_STATE_PROP_NAME);
 
     if (strcmp (node_name, name) == 0)
       result = kid;
@@ -121,10 +121,10 @@ ephy_state_window_set_size (GtkWidget *window, EphyNode *node)
   int width, height, w = -1, h = -1;
   gboolean maximize, size;
 
-  width = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_WIDTH);
-  height = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_HEIGHT);
-  maximize = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_MAXIMIZE);
-  size = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_SIZE);
+  width = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_WIDTH);
+  height = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_HEIGHT);
+  maximize = ephy_node_get_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE);
+  size = ephy_node_get_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_SIZE);
 
   gtk_window_get_default_size (GTK_WINDOW (window), &w, &h);
 
@@ -158,13 +158,13 @@ ephy_state_window_set_position (GtkWidget *window, EphyNode *node)
   /* Setting the default size doesn't work when the window is already showing. */
   g_return_if_fail (!gtk_widget_get_visible (window));
 
-  maximize = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_MAXIMIZE);
-  size = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_POSITION);
+  maximize = ephy_node_get_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE);
+  size = ephy_node_get_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION);
 
   /* Don't set the position of the window if it is maximized */
   if ((!maximize) && size) {
-    x = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_POSITION_X);
-    y = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_POSITION_Y);
+    x = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION_X);
+    y = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION_Y);
 
     screen = gtk_window_get_screen (GTK_WINDOW (window));
     screen_width  = gdk_screen_get_width  (screen);
@@ -179,22 +179,22 @@ ephy_state_window_set_position (GtkWidget *window, EphyNode *node)
 static void
 ephy_state_save_unmaximized_size (EphyNode *node, int width, int height)
 {
-  ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_WIDTH,
+  ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_WIDTH,
                               width);
-  ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_HEIGHT,
+  ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_HEIGHT,
                               height);
-  ephy_node_set_property_boolean (node, EPHY_NODE_STATE_PROP_SIZE,
+  ephy_node_set_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_SIZE,
                                   TRUE);
 }
 
 static void
 ephy_state_save_position (EphyNode *node, int x, int y)
 {
-  ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_POSITION_X,
+  ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION_X,
                               x);
-  ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_POSITION_Y,
+  ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION_Y,
                               y);
-  ephy_node_set_property_boolean (node, EPHY_NODE_STATE_PROP_POSITION,
+  ephy_node_set_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION,
                                   TRUE);
 }
 
@@ -216,7 +216,7 @@ ephy_state_window_save_size (GtkWidget *window, EphyNode *node)
     ephy_state_save_unmaximized_size (node, width, height);
   
   ephy_node_set_property_boolean (node,
-                                  EPHY_NODE_STATE_PROP_MAXIMIZE,
+                                  EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE,
                                   maximize);
 }
 
@@ -240,14 +240,14 @@ ephy_state_window_save_position (GtkWidget *window, EphyNode *node)
 static void
 ephy_state_window_save (GtkWidget *widget, EphyNode *node)
 {
-  EphyStateWindowFlags flags;
+  EphyInitialStateWindowFlags flags;
 
   flags = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "state_flags"));
 
-  if (flags & EPHY_STATE_WINDOW_SAVE_SIZE)
+  if (flags & EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE)
     ephy_state_window_save_size (widget, node);
 
-  if (flags & EPHY_STATE_WINDOW_SAVE_POSITION)
+  if (flags & EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION)
     ephy_state_window_save_position (widget, node);
 }
 
@@ -282,25 +282,25 @@ create_window_node (const char *name,
                     int default_width,
                     int default_height,
                     gboolean maximize,
-                    EphyStateWindowFlags flags)
+                    EphyInitialStateWindowFlags flags)
 {
   EphyNode *node;
 
   node = ephy_node_new (states_db);
   ephy_node_add_child (states, node);
 
-  ephy_node_set_property_string (node, EPHY_NODE_STATE_PROP_NAME,
+  ephy_node_set_property_string (node, EPHY_NODE_INITIAL_STATE_PROP_NAME,
                                  name);
-  ephy_node_set_property_boolean (node, EPHY_NODE_STATE_PROP_MAXIMIZE,
+  ephy_node_set_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE,
                                   maximize);
 
-  if (flags & EPHY_STATE_WINDOW_SAVE_SIZE) {
+  if (flags & EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE) {
     ephy_state_save_unmaximized_size (node,
                                       default_width,
                                       default_height);
   }
 
-  if (flags & EPHY_STATE_WINDOW_SAVE_POSITION) {
+  if (flags & EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION) {
     /* Constants for now, these should be default_wi  dth
        and default_height. */
     ephy_state_save_position (node, 0, 0);
@@ -310,12 +310,12 @@ create_window_node (const char *name,
 }
 
 void
-ephy_state_add_window (GtkWidget *window,
-                       const char *name,
-                       int default_width,
-                       int default_height,
-                       gboolean maximize,
-                       EphyStateWindowFlags flags)
+ephy_initial_state_add_window (GtkWidget *window,
+                               const char *name,
+                               int default_width,
+                               int default_height,
+                               gboolean maximize,
+                               EphyInitialStateWindowFlags flags)
 {
   EphyNode *node;
 
@@ -349,15 +349,15 @@ paned_sync_position_cb (GtkWidget *paned,
   int width;
 
   width = gtk_paned_get_position (GTK_PANED (paned));
-  ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_WIDTH,
+  ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_WIDTH,
                               width);
   return FALSE;
 }
 
 void
-ephy_state_add_paned (GtkWidget *paned,
-                      const char *name,
-                      int default_width)
+ephy_initial_state_add_paned (GtkWidget *paned,
+                              const char *name,
+                              int default_width)
 {
   EphyNode *node;
   int width;
@@ -371,14 +371,14 @@ ephy_state_add_paned (GtkWidget *paned,
     ephy_node_add_child (states, node);
 
     ephy_node_set_property_string (node,
-                                   EPHY_NODE_STATE_PROP_NAME,
+                                   EPHY_NODE_INITIAL_STATE_PROP_NAME,
                                    name);
     ephy_node_set_property_int (node,
-                                EPHY_NODE_STATE_PROP_WIDTH,
+                                EPHY_NODE_INITIAL_STATE_PROP_WIDTH,
                                 default_width);
   }
 
-  width = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_WIDTH);
+  width = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_WIDTH);
   gtk_paned_set_position (GTK_PANED (paned), width);
 
   g_signal_connect (paned, "notify::position",
@@ -394,7 +394,7 @@ sync_expander_cb (GtkExpander *expander,
 
   is_expanded = gtk_expander_get_expanded (expander);
   ephy_node_set_property_boolean (node,
-                                  EPHY_NODE_STATE_PROP_ACTIVE,
+                                  EPHY_NODE_INITIAL_STATE_PROP_ACTIVE,
                                   is_expanded);
 }
 
@@ -407,14 +407,14 @@ sync_toggle_cb (GtkToggleButton *toggle,
 
   is_active = gtk_toggle_button_get_active (toggle);
   ephy_node_set_property_boolean (node,
-                                  EPHY_NODE_STATE_PROP_ACTIVE,
+                                  EPHY_NODE_INITIAL_STATE_PROP_ACTIVE,
                                   is_active);
 }
 
 void 
-ephy_state_add_expander (GtkWidget *widget,
-                         const char *name,
-                         gboolean default_state)
+ephy_initial_state_add_expander (GtkWidget *widget,
+                                 const char *name,
+                                 gboolean default_state)
 {
   EphyNode *node;
   gboolean active;
@@ -428,15 +428,15 @@ ephy_state_add_expander (GtkWidget *widget,
     ephy_node_add_child (states, node);
 
     ephy_node_set_property_string (node,
-                                   EPHY_NODE_STATE_PROP_NAME,
+                                   EPHY_NODE_INITIAL_STATE_PROP_NAME,
                                    name);
     ephy_node_set_property_boolean (node,
-                                    EPHY_NODE_STATE_PROP_ACTIVE,
+                                    EPHY_NODE_INITIAL_STATE_PROP_ACTIVE,
                                     default_state);
   }
 
   active = ephy_node_get_property_boolean
-    (node, EPHY_NODE_STATE_PROP_ACTIVE);
+    (node, EPHY_NODE_INITIAL_STATE_PROP_ACTIVE);
 
   if (GTK_IS_TOGGLE_BUTTON (widget)) {
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), active);
@@ -450,7 +450,7 @@ ephy_state_add_expander (GtkWidget *widget,
 }
 
 void
-ephy_state_save (void)
+ephy_initial_state_save (void)
 {
   if (states) {
     ephy_states_save ();
diff --git a/lib/ephy-state.h b/lib/ephy-initial-state.h
index fdeeb8ee5..8458ac0d5 100644
--- a/lib/ephy-state.h
+++ b/lib/ephy-initial-state.h
@@ -33,24 +33,24 @@ G_BEGIN_DECLS
 
 typedef enum
 {
-  EPHY_STATE_WINDOW_SAVE_NONE = 0,
-  EPHY_STATE_WINDOW_SAVE_SIZE = 1 << 0,
-  EPHY_STATE_WINDOW_SAVE_POSITION = 1 << 1
-} EphyStateWindowFlags;
-
-void ephy_state_add_window   (GtkWidget            *window,
-                              const char           *name,
-                              int                   default_width,
-                              int                   default_heigth,
-                              gboolean              maximize,
-                              EphyStateWindowFlags  flags);
-void ephy_state_add_paned    (GtkWidget            *paned,
-                              const char           *name,
-                              int                   default_width);
-void ephy_state_add_expander (GtkWidget            *widget,
-                              const char           *name,
-                              gboolean              default_state);
-void ephy_state_save         (void);
+  EPHY_INITIAL_STATE_WINDOW_SAVE_NONE = 0,
+  EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE = 1 << 0,
+  EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION = 1 << 1
+} EphyInitialStateWindowFlags;
+
+void ephy_initial_state_add_window   (GtkWidget            *window,
+                                      const char           *name,
+                                      int                   default_width,
+                                      int                   default_heigth,
+                                      gboolean              maximize,
+                                      EphyInitialStateWindowFlags  flags);
+void ephy_initial_state_add_paned    (GtkWidget            *paned,
+                                      const char           *name,
+                                      int                   default_width);
+void ephy_initial_state_add_expander (GtkWidget            *widget,
+                                      const char           *name,
+                                      gboolean              default_state);
+void ephy_initial_state_save         (void);
 
 G_END_DECLS
 
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 1dde8eee1..294f0c085 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -29,7 +29,7 @@
 #include "ephy-node-common.h"
 #include "ephy-debug.h"
 #include "ephy-shell.h"
-#include "ephy-state.h"
+#include "ephy-initial-state.h"
 #include "ephy-gui.h"
 #include "ephy-dnd.h"
 #include "ephy-prefs.h"
@@ -512,11 +512,11 @@ ephy_bookmark_properties_constructor (GType type,
 
 	if (!priv->creating)
 	{
-		ephy_state_add_window (widget,
-				       "bookmark_properties",
-				       290, 280, FALSE,
-				       EPHY_STATE_WINDOW_SAVE_POSITION |
-				       EPHY_STATE_WINDOW_SAVE_SIZE);
+		ephy_initial_state_add_window (widget,
+                                               "bookmark_properties",
+                                               290, 280, FALSE,
+                                               EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION |
+                                               EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE);
 	}
 	/* Lockdown */
 	lockdown = g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
@@ -598,7 +598,7 @@ ephy_bookmark_properties_constructor (GType type,
 
 	widget = gtk_expander_new (_("Sho_w all topics"));
 	gtk_expander_set_use_underline (GTK_EXPANDER (widget), TRUE);
-	ephy_state_add_expander (widget, "bookmark_properties_list", FALSE);
+	ephy_initial_state_add_expander (widget, "bookmark_properties_list", FALSE);
 	gtk_container_add (GTK_CONTAINER (widget), container);
 	gtk_widget_show (widget);
 	gtk_grid_attach (GTK_GRID (grid), widget, 1, 3, 1, 1);
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 19151c195..adef067e8 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -36,7 +36,7 @@
 #include "ephy-session.h"
 #include "ephy-settings.h"
 #include "ephy-shell.h"
-#include "ephy-state.h"
+#include "ephy-initial-state.h"
 #include "ephy-topic-action.h"
 #include "ephy-window.h"
 #include "popup-commands.h"
@@ -1764,13 +1764,13 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 			  G_CALLBACK (view_selection_changed_cb),
 			  editor);
 
-	ephy_state_add_window (GTK_WIDGET(editor),
-			       "bookmarks_editor",
-			       450, 400, FALSE,
-			       EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION);
-	ephy_state_add_paned  (GTK_WIDGET (hpaned),
-			       "bookmarks_paned",
-			       130);
+	ephy_initial_state_add_window (GTK_WIDGET(editor),
+                                       "bookmarks_editor",
+                                       450, 400, FALSE,
+                                       EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE | EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION);
+	ephy_initial_state_add_paned  (GTK_WIDGET (hpaned),
+                                       "bookmarks_paned",
+                                       130);
 
 	/* Lockdown settings */
 	action = gtk_action_group_get_action (action_group, "Export");
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 1d8df417a..81ba3b147 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -34,7 +34,7 @@
 #include "ephy-session.h"
 #include "ephy-settings.h"
 #include "ephy-shell.h"
-#include "ephy-state.h"
+#include "ephy-initial-state.h"
 #include "ephy-time-helpers.h"
 #include "ephy-urls-store.h"
 #include "ephy-urls-view.h"
@@ -1273,13 +1273,13 @@ ephy_history_window_constructed (GObject *object)
 			  G_CALLBACK (key_pressed_cb),
 			  editor);
 
-	ephy_state_add_window (GTK_WIDGET (editor),
-			       "history_window",
-			       450, 400, FALSE,
-			       EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION);
-	ephy_state_add_paned  (GTK_WIDGET (hpaned),
-			       "history_paned",
-			       130);
+	ephy_initial_state_add_window (GTK_WIDGET (editor),
+				       "history_window",
+				       450, 400, FALSE,
+				       EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE | EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION);
+	ephy_initial_state_add_paned  (GTK_WIDGET (hpaned),
+				       "history_paned",
+				       130);
 
 	editor->priv->cancellable = g_cancellable_new ();
 	filter_now (editor, TRUE, TRUE);
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 73b03d65a..5c33629ab 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -25,12 +25,12 @@
 #include "ephy-debug.h"
 #include "ephy-embed-prefs.h"
 #include "ephy-file-helpers.h"
+#include "ephy-initial-state.h"
 #include "ephy-private.h"
 #include "ephy-profile-utils.h"
 #include "ephy-session.h"
 #include "ephy-settings.h"
 #include "ephy-shell.h"
-#include "ephy-state.h"
 #include "ephy-string.h"
 #include "ephy-web-app-utils.h"
 
@@ -483,7 +483,7 @@ main (int argc,
   if (notify_is_initted ())
     notify_uninit ();
 
-  ephy_state_save ();
+  ephy_initial_state_save ();
   ephy_embed_prefs_shutdown ();
   ephy_settings_shutdown ();
   ephy_file_helpers_shutdown ();
diff --git a/src/ephy-window.c b/src/ephy-window.c
index db6b13431..adb7e956d 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -41,6 +41,7 @@
 #include "ephy-find-toolbar.h"
 #include "ephy-gui.h"
 #include "ephy-home-action.h"
+#include "ephy-initial-state.h"
 #include "ephy-link.h"
 #include "ephy-location-entry.h"
 #include "ephy-navigation-history-action.h"
@@ -51,7 +52,6 @@
 #include "ephy-session.h"
 #include "ephy-settings.h"
 #include "ephy-shell.h"
-#include "ephy-state.h"
 #include "ephy-toolbar.h"
 #include "ephy-type-builtins.h"
 #include "ephy-web-view.h"
@@ -4004,10 +4004,10 @@ ephy_window_show (GtkWidget *widget)
 		g_return_if_fail (EPHY_IS_EMBED (embed));
 
 		if (!priv->is_popup)
-			flags = EPHY_STATE_WINDOW_SAVE_SIZE;
+			flags = EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE;
 
-		ephy_state_add_window (widget, "main_window", 600, 500,
-				       TRUE, flags);
+		ephy_initial_state_add_window (widget, "main_window", 600, 500,
+					       TRUE, flags);
 		priv->has_size = TRUE;
 	}
 
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 7e3336467..5243c1517 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -28,7 +28,6 @@
 #include "ephy-shell.h"
 #include "ephy-file-helpers.h"
 #include "ephy-gui.h"
-#include "ephy-state.h"
 #include "ephy-string.h"
 #include "ephy-debug.h"
 #include "ephy-time-helpers.h"
diff --git a/src/window-commands.c b/src/window-commands.c
index 8ab465bd0..c0193dfe9 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -46,7 +46,6 @@
 #include "ephy-session.h"
 #include "ephy-settings.h"
 #include "ephy-shell.h"
-#include "ephy-state.h"
 #include "ephy-string.h"
 #include "ephy-web-app-utils.h"
 #include "ephy-zoom.h"