reviewed by: Christian Persch <chpe@cvs.gnome.org>

2004-10-08  Marco Pesenti Gritti  <marco@gnome.org>

        reviewed by: Christian Persch  <chpe@cvs.gnome.org>

        * lib/ephy-dialog.c: (setup_default_size):
        * lib/ephy-state.c: (create_window_node), (ephy_state_add_window):
        * lib/ephy-state.h:
        * src/bookmarks/ephy-bookmark-properties.c: (build_ui):
        * src/bookmarks/ephy-bookmarks-editor.c:
        (ephy_bookmarks_editor_construct):
        * src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_construct):
        * src/ephy-history-window.c: (ephy_history_window_construct):
        * src/ephy-window.c: (ephy_window_show):
        * src/pdm-dialog.c: (show_cookies_properties):
        * src/window-commands.c: (window_cmd_edit_toolbar):

        Allow to set the default window state to maximize.
        Default to maximize for the browser window.

8 files changed, 33 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 55c961301..b13bc8b9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2004-10-08  Marco Pesenti Gritti  <marco@gnome.org>
+
+	reviewed by: Christian Persch  <chpe@cvs.gnome.org>
+
+	* lib/ephy-dialog.c: (setup_default_size):
+	* lib/ephy-state.c: (create_window_node), (ephy_state_add_window):
+	* lib/ephy-state.h:
+	* src/bookmarks/ephy-bookmark-properties.c: (build_ui):
+	* src/bookmarks/ephy-bookmarks-editor.c:
+	(ephy_bookmarks_editor_construct):
+	* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_construct):
+	* src/ephy-history-window.c: (ephy_history_window_construct):
+	* src/ephy-window.c: (ephy_window_show):
+	* src/pdm-dialog.c: (show_cookies_properties):
+	* src/window-commands.c: (window_cmd_edit_toolbar):
+
+	Allow to set the default window state to maximize.
+	Default to maximize for the browser window.
+
 2004-10-07  Christian Persch  <chpe@cvs.gnome.org>
 
 	* configure.in:
@@ -18,6 +37,7 @@
 
 	Fix compilation with gtk+ 2.4.x.
 
+>>>>>>> 1.1908.2.43
 2004-10-07  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* configure.in:
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index 23bf95dd0..15e5c5aad 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -1018,7 +1018,7 @@ setup_default_size (EphyDialog *dialog)
 				       dialog->priv->name,
 				       dialog->priv->default_width,
 				       dialog->priv->default_height,
-				       flags);
+				       FALSE, flags);
 
 		dialog->priv->has_default_size = TRUE;
 	}
diff --git a/lib/ephy-state.c b/lib/ephy-state.c
index 5cf37c744..32e4f1c48 100644
--- a/lib/ephy-state.c
+++ b/lib/ephy-state.c
@@ -318,6 +318,7 @@ static EphyNode *
 create_window_node (const char *name,
 		    int default_width,
 		    int default_height,
+		    gboolean maximize,
 		    EphyStateWindowFlags flags)
 {
 	EphyNode *node;
@@ -333,7 +334,7 @@ create_window_node (const char *name,
 	g_value_unset (&value);
 
 	g_value_init (&value, G_TYPE_BOOLEAN);
-	g_value_set_boolean (&value, FALSE);
+	g_value_set_boolean (&value, maximize);
 	ephy_node_set_property (node, EPHY_NODE_STATE_PROP_MAXIMIZE,
 			        &value);
 	g_value_unset (&value);
@@ -367,6 +368,7 @@ ephy_state_add_window (GtkWidget *window,
 		       const char *name,
 		       int default_width,
 		       int default_height,
+		       gboolean maximize,
 		       EphyStateWindowFlags flags)
 {
 	EphyNode *node;
@@ -376,7 +378,8 @@ ephy_state_add_window (GtkWidget *window,
 	node = find_by_name (name);
 	if (node == NULL)
 	{
-		node = create_window_node (name, default_width, default_height, flags);
+		node = create_window_node (name, default_width, default_height,
+					   maximize, flags);
 	}
 
 	ephy_state_window_set_size (window, node);
diff --git a/lib/ephy-state.h b/lib/ephy-state.h
index 260c03ba1..f54eb9bc0 100644
--- a/lib/ephy-state.h
+++ b/lib/ephy-state.h
@@ -38,6 +38,7 @@ 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,
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index fc0b5b163..c75cd55b8 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -1367,7 +1367,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 
 	ephy_state_add_window (GTK_WIDGET (editor),
 			       "history_window",
-		               450, 400,
+		               450, 400, FALSE,
 			       EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION);
 	ephy_state_add_paned  (GTK_WIDGET (hpaned),
 			       "history_paned",
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 7dbaf8eca..2758d4c99 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2631,7 +2631,7 @@ ephy_window_show (GtkWidget *widget)
 		if (width == -1 && height == -1)
 		{
 			ephy_state_add_window (widget, "main_window", 600, 500,
-					       EPHY_STATE_WINDOW_SAVE_SIZE);
+					       TRUE, EPHY_STATE_WINDOW_SAVE_SIZE);
 		}
 
 		window->priv->has_size = TRUE;
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 893412a7f..cfed42209 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -908,7 +908,8 @@ show_cookies_properties (PdmDialog *dialog,
 		  GTK_DIALOG_MODAL,
 		  GTK_STOCK_CLOSE, 0, NULL);
 	ephy_state_add_window (GTK_WIDGET (gdialog), "cookie_properties", 
-			       -1, -1, EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION);
+			       -1, -1, FALSE,
+			       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), 6);
 
diff --git a/src/window-commands.c b/src/window-commands.c
index 7d22c11c4..315ec92d7 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -907,9 +907,8 @@ window_cmd_edit_toolbar (GtkAction *action,
 	
 	g_signal_connect (G_OBJECT (dialog), "response",
 			  G_CALLBACK (toolbar_editor_response_cb), model);
-	ephy_state_add_window (dialog,
-			       "toolbar_editor",
-		               500, 330,
+	ephy_state_add_window (dialog, "toolbar_editor",
+		               500, 330, FALSE,
 			       EPHY_STATE_WINDOW_SAVE_SIZE);
 	gtk_widget_show (dialog);