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.

7 files changed, 29 insertions, 31 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");
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"