? centerstate.patch
? help/bg/.xml2po.mo
? help/bg/epiphany.xml
? lib/.ephy-state.h.swp
? lib/egg/.deps
? lib/egg/.libs
? lib/egg/libegg.la
? lib/egg/libegg_la-egg-editable-toolbar.lo
? lib/egg/libegg_la-egg-toolbar-editor.lo
? lib/egg/libegg_la-egg-toolbars-model.lo
? lib/egg/libegg_la-eggmarshalers.lo
? lib/egg/libegg_la-eggstatusicon.lo
? lib/egg/libegg_la-eggtrayicon.lo
? lib/egg/libegg_la-eggtraymanager.lo
? lib/egg/libegg_la-eggtreemultidnd.lo
? lib/egg/libegg_la-eggtypebuiltins.lo
? po/stamp-it
? src/.ephy-window.c.swp
? src/.epiphany.c.swp
? src/.pdm-dialog.c.swp
? src/bookmarks/.ephy-bookmarks-editor.c.swp
Index: lib/ephy-dialog.c
===================================================================
RCS file: /cvs/gnome/epiphany/lib/ephy-dialog.c,v
retrieving revision 1.54
diff -u -r1.54 ephy-dialog.c
--- lib/ephy-dialog.c	16 Jan 2006 23:51:40 -0000	1.54
+++ lib/ephy-dialog.c	11 Apr 2006 22:13:59 -0000
@@ -1050,7 +1050,7 @@
 				       dialog->priv->name,
 				       dialog->priv->default_width,
 				       dialog->priv->default_height,
-				       FALSE, flags);
+				       FALSE, FALSE, flags);
 
 		dialog->priv->has_default_size = TRUE;
 	}
Index: lib/ephy-state.c
===================================================================
RCS file: /cvs/gnome/epiphany/lib/ephy-state.c,v
retrieving revision 1.39
diff -u -r1.39 ephy-state.c
--- lib/ephy-state.c	4 Feb 2006 13:57:42 -0000	1.39
+++ lib/ephy-state.c	11 Apr 2006 22:13:59 -0000
@@ -48,7 +48,8 @@
 	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_STATE_PROP_ACTIVE = 10,
+	EPHY_NODE_STATE_PROP_POSITION_CENTER = 11
 };
 
 static EphyNode *states = NULL;
@@ -164,7 +165,7 @@
 	GdkScreen *screen;
 	int x, y;
 	int screen_width, screen_height;
-	gboolean maximize, size;
+	gboolean maximize, size, center;
 
 	g_return_if_fail (GTK_IS_WINDOW (window));
 
@@ -173,6 +174,7 @@
 
 	maximize = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_MAXIMIZE);
 	size = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_POSITION);
+	center = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_POSITION_CENTER);
 
 	/* Don't set the position of the window if it is maximized */
 	if ((!maximize) && size)
@@ -189,6 +191,9 @@
 		{
 			gtk_window_move (GTK_WINDOW (window), x, y);
 		}
+	} else if ((!maximize) && center) {
+		/* Center the window if no position state is saved */
+		gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
 	}
 }
 
@@ -324,6 +329,7 @@
 		    int default_width,
 		    int default_height,
 		    gboolean maximize,
+		    gboolean center,
 		    EphyStateWindowFlags flags)
 {
 	EphyNode *node;
@@ -344,6 +350,12 @@
 			        &value);
 	g_value_unset (&value);
 
+	g_value_init (&value, G_TYPE_BOOLEAN);
+	g_value_set_boolean (&value, center);
+	ephy_node_set_property (node, EPHY_NODE_STATE_PROP_POSITION_CENTER,
+				&value);
+	g_value_unset (&value);
+
 	if (flags & EPHY_STATE_WINDOW_SAVE_SIZE)
 	{
 		g_value_init (&value, G_TYPE_BOOLEAN);
@@ -374,6 +386,7 @@
 		       int default_width,
 		       int default_height,
 		       gboolean maximize,
+		       gboolean center,
 		       EphyStateWindowFlags flags)
 {
 	EphyNode *node;
@@ -384,7 +397,7 @@
 	if (node == NULL)
 	{
 		node = create_window_node (name, default_width, default_height,
-					   maximize, flags);
+					   maximize, center, flags);
 	}
 
 	ephy_state_window_set_size (window, node);
Index: lib/ephy-state.h
===================================================================
RCS file: /cvs/gnome/epiphany/lib/ephy-state.h,v
retrieving revision 1.13
diff -u -r1.13 ephy-state.h
--- lib/ephy-state.h	4 Feb 2006 13:57:42 -0000	1.13
+++ lib/ephy-state.h	11 Apr 2006 22:13:59 -0000
@@ -39,6 +39,7 @@
 				 int default_width,
 				 int default_heigth,
 				 gboolean maximize,
+				 gboolean center,
 				 EphyStateWindowFlags flags);
 
 void  ephy_state_add_paned	(GtkWidget *paned,
Index: src/ephy-history-window.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/ephy-history-window.c,v
retrieving revision 1.105
diff -u -r1.105 ephy-history-window.c
--- src/ephy-history-window.c	2 Mar 2006 22:04:09 -0000	1.105
+++ src/ephy-history-window.c	11 Apr 2006 22:14:00 -0000
@@ -1346,7 +1346,7 @@
 
 	ephy_state_add_window (GTK_WIDGET (editor),
 			       "history_window",
-		               450, 400, FALSE,
+		               450, 400, FALSE, TRUE,
 			       EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION);
 	ephy_state_add_paned  (GTK_WIDGET (hpaned),
 			       "history_paned",
Index: src/ephy-toolbar-editor.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/ephy-toolbar-editor.c,v
retrieving revision 1.7
diff -u -r1.7 ephy-toolbar-editor.c
--- src/ephy-toolbar-editor.c	25 Jan 2006 23:33:05 -0000	1.7
+++ src/ephy-toolbar-editor.c	11 Apr 2006 22:14:01 -0000
@@ -295,7 +295,7 @@
 	gtk_widget_show (editor);
 	
 	ephy_state_add_window (dialog, "toolbar_editor",
-			       500, 330, FALSE,
+			       500, 330, FALSE, TRUE,
 			       EPHY_STATE_WINDOW_SAVE_SIZE);
 	gtk_widget_show (dialog);
 
Index: src/ephy-window.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/ephy-window.c,v
retrieving revision 1.345
diff -u -r1.345 ephy-window.c
--- src/ephy-window.c	2 Mar 2006 21:49:26 -0000	1.345
+++ src/ephy-window.c	11 Apr 2006 22:14:03 -0000
@@ -3506,7 +3506,7 @@
 		if (width == -1 && height == -1)
 		{
 			ephy_state_add_window (widget, "main_window", 600, 500,
-					       TRUE, EPHY_STATE_WINDOW_SAVE_SIZE);
+					       TRUE, TRUE, EPHY_STATE_WINDOW_SAVE_SIZE);
 		}
 
 		priv->has_size = TRUE;
Index: src/pdm-dialog.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/pdm-dialog.c,v
retrieving revision 1.62
diff -u -r1.62 pdm-dialog.c
--- src/pdm-dialog.c	8 Dec 2005 21:32:52 -0000	1.62
+++ src/pdm-dialog.c	11 Apr 2006 22:14:05 -0000
@@ -380,7 +380,7 @@
 		  GTK_DIALOG_DESTROY_WITH_PARENT,
 		  GTK_STOCK_CLOSE, 0, NULL);
 	ephy_state_add_window (GTK_WIDGET (gdialog), "cookie_properties", 
-			       -1, -1, FALSE,
+			       -1, -1, FALSE, TRUE,
 			       EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION);
 	gtk_dialog_set_has_separator (GTK_DIALOG(gdialog), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (gdialog), 5);
Index: src/window-commands.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/window-commands.c,v
retrieving revision 1.191
diff -u -r1.191 window-commands.c
--- src/window-commands.c	12 Mar 2006 18:21:14 -0000	1.191
+++ src/window-commands.c	11 Apr 2006 22:14:05 -0000
@@ -225,6 +225,9 @@
 	bwindow = ephy_shell_get_bookmarks_editor (ephy_shell);
 	ephy_bookmarks_editor_set_parent (EPHY_BOOKMARKS_EDITOR (bwindow),
 			                  GTK_WIDGET (window));
+
+/*	gtk_window_set_position(GTK_WINDOW(bwindow), GTK_WIN_POS_CENTER); */
+
 	gtk_window_present (GTK_WINDOW (bwindow));
 }
 
Index: src/bookmarks/ephy-bookmark-properties.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/bookmarks/ephy-bookmark-properties.c,v
retrieving revision 1.58
diff -u -r1.58 ephy-bookmark-properties.c
--- src/bookmarks/ephy-bookmark-properties.c	21 Feb 2006 13:30:40 -0000	1.58
+++ src/bookmarks/ephy-bookmark-properties.c	11 Apr 2006 22:14:06 -0000
@@ -522,7 +522,7 @@
 	{
 		ephy_state_add_window (widget,
 				       "bookmark_properties",
-				       290, 280, FALSE,
+				       290, 280, FALSE, FALSE,
 				       EPHY_STATE_WINDOW_SAVE_POSITION |
 				       EPHY_STATE_WINDOW_SAVE_SIZE);
 	}
Index: src/bookmarks/ephy-bookmarks-editor.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/bookmarks/ephy-bookmarks-editor.c,v
retrieving revision 1.192.2.1
diff -u -r1.192.2.1 ephy-bookmarks-editor.c
--- src/bookmarks/ephy-bookmarks-editor.c	3 Apr 2006 13:31:04 -0000	1.192.2.1
+++ src/bookmarks/ephy-bookmarks-editor.c	11 Apr 2006 22:14:08 -0000
@@ -1930,8 +1930,9 @@
 
 	ephy_state_add_window (GTK_WIDGET(editor),
 			       "bookmarks_editor",
-			       450, 400, FALSE,
+			       450, 400, FALSE, TRUE,
 			       EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION);
+
 	ephy_state_add_paned  (GTK_WIDGET (hpaned),
 			       "bookmarks_paned",
 			       130);
