Prepare for 1.1.5

2004-01-24  Marco Pesenti Gritti  <marco@gnome.org>

        * configure.in:

        Prepare for 1.1.5

        * lib/ephy-dialog.c: (setup_default_size):

        Fix a bug with downloader dialog size persistance

3 files changed, 19 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ba7bbec82..b0d89f0c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@
 
 	* lib/ephy-dialog.c: (setup_default_size):
 
-	Fix a bug with downloader dialog size persistance
+	Fix a bug with dialog size persistance
 
 2004-01-24  Marco Pesenti Gritti  <marco@gnome.org>
 
diff --git a/NEWS b/NEWS
index 06e56a49a..3a37d6a2e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
 ==============
+Epiphany 1.1.5
+==============
+
+Bugfixes
+
+	* Fix dialogs size persistance
+
+==============
 Epiphany 1.1.4
 ==============
 
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index 4d1fd9e17..0ed3df6fd 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -968,11 +968,18 @@ setup_default_size (EphyDialog *dialog)
 {
 	if (dialog->priv->has_default_size == FALSE)
 	{
+		EphyStateWindowFlags flags;
+
+		flags = EPHY_STATE_WINDOW_SAVE_SIZE;
+
+		if (dialog->priv->persist_position)
+		{
+			flags |= EPHY_STATE_WINDOW_SAVE_POSITION;
+		}
+
 		ephy_state_add_window (dialog->priv->dialog,
 				       dialog->priv->name, -1, -1,
-				       dialog->priv->persist_position ?
-				       EPHY_STATE_WINDOW_SAVE_POSITION :
-				       EPHY_STATE_WINDOW_SAVE_SIZE);
+				       flags);
 
 		dialog->priv->has_default_size = TRUE;
 	}