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.

2 files changed, 15 insertions, 15 deletions

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");