Prepare for 1.1.4

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

        * NEWS:
        * configure.in:

        Prepare for 1.1.4

        * embed/mozilla/ContentHandler.cpp:

        Fix Save As from download dialog

4 files changed, 74 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index fb64d8581..0ffcda3ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-24  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* NEWS:
+	* configure.in:
+
+	Prepare for 1.1.4
+
+	* embed/mozilla/ContentHandler.cpp:
+
+	Fix Save As from download dialog
+
 2004-01-24  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/prefs-dialog.c: (get_download_button_label):
diff --git a/NEWS b/NEWS
index e49a45d08..06e56a49a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,60 @@
 ==============
+Epiphany 1.1.4
+==============
+
+Code changes
+
+	* Make EphyEmbedEvent abstract, implemented by MozillaEmbedEvent (Christian)
+	* Api to get the page content into a string (Lee Willis)
+	* Use ngettext for number of downloads and remaining minutes display in
+	  the tooltip of the tray icon. (Piers Cornwell)
+	* Allow to open glade files not inside epiphany dirs (Adam Hooper)
+	* Make Cancel safe against non active downloads (Xan)
+	* Allow passing the translation domain to ephy_dialog_construct,
+          to make extension's dialogues translatable. (Christian)
+
+Interface improvements
+
+	* Allow to  show/hide downloader clicking on tray icon (Xan)
+	* Show help for menu items in the statusbar (Christian)
+	* Use a Downloads folder on the desktop by default (Marco)
+	* Allow to disable automatic downloads (Marco)
+	* Re-enable fonts language font filtering (Christian)
+	* Better string for history disabling lockdown pref (Marco)
+	* Delete UTF-7 from our list of known encodings (Christian)
+	* Persist downloader position (Marco)
+
+Bugfixes
+
+	* Fix crash closing windows/tabs (Christian)
+	* Actually save the file in downloads dir and then
+          open it (Marco)
+	* Create an epiphany temp dir in /tmp so that we can have
+	  the right permissions on it (Christopher James Lahey)
+	* Work around a bug in mozilla where  0xa0 (NBSP) are
+	  converted to spaces (Christian)
+	* Fix force reload (Christian)
+	* Do not use the same pref of 1.0 for the download dir,
+	  they are different things (Marco)
+	* Do not use the downloader folder key to persist
+	  Save As actions (Marco)
+
+Translations
+
+	* Miloslav Trmac (cs)
+	* Christian Neumair (de)
+	* Nikos Charonitakis (el)
+	* Francisco Javier F. Serrador (es)
+	* Alastair McKinstry (ga)
+	* Changwoo Ryu (ko)
+	* Hasbullah Bin Pit (ms)
+	* Vincent van Adrighem (nl)
+	* Kjartan Maraas (no)
+	* Artur Flinta (pl)
+	* Danilo Šegan  (sr, sr@Latn)
+	* Laurent Dhima (sq)
+
+==============
 Epiphany 1.1.3
 ==============
 
diff --git a/configure.in b/configure.in
index a4f5930ea..c98894b90 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(epiphany, 1.1.3,
+AC_INIT(epiphany, 1.1.4,
        [http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany])
 
 EPIPHANY_MAJOR=1.1
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index a92f2ce02..0d315d8e5 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -135,7 +135,7 @@ NS_IMETHODIMP GContentHandler::PromptForSaveToFile(
 
 	dialog = ephy_file_chooser_new (_("Save"), parentWindow,
 					GTK_FILE_CHOOSER_ACTION_SAVE,
-					CONF_STATE_DOWNLOAD_DIR);
+					CONF_STATE_SAVE_DIR);
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog),
 					   NS_ConvertUCS2toUTF8 (aDefaultFile).get());
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -143,9 +143,13 @@ NS_IMETHODIMP GContentHandler::PromptForSaveToFile(
 	if (response == EPHY_RESPONSE_SAVE)
 	{
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-		BuildDownloadPath (filename, _retval);
+
+		nsCOMPtr <nsILocalFile> destFile (do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
+		destFile->InitWithNativePath (nsDependentCString (filename));
 		g_free (filename);
 
+		NS_IF_ADDREF (*_retval = destFile);
+
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 
 		return NS_OK;