- Switched a_UIcmd_save() to take its URL from history (not location bar).

2 files changed, 14 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 3592f376..ca1bffd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ dillo-2.1
  - Tuned input width a bit.
  - Cleaned up resource embedding (forms)
  - Made cookierc parsing more robust.
+ - Switched a_UIcmd_save() to take its URL from history (not location bar).
    Patches: place (AKA corvid)
 +- Switched SSL-enabled to configure.in (./configure --enable-ssl).
  - Standardised the installation of dpid/dpidrc with auto* tools.
diff --git a/src/uicmd.cc b/src/uicmd.cc
index c093f73e..9534a7fb 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -484,24 +484,21 @@ void a_UIcmd_set_save_dir(const char *dir)
 void a_UIcmd_save(void *vbw)
 {
    const char *name;
-   char *SuggestedName, *urlstr;
-   DilloUrl *url;
-
-   a_UIcmd_set_save_dir(prefs.save_dir);
-
-   urlstr = a_UIcmd_get_location_text((BrowserWindow*)vbw);
-   url = a_Url_new(urlstr, NULL);
-   SuggestedName = UIcmd_make_save_filename(URL_PATH(url));
-   name = a_Dialog_save_file("Save Page as File", NULL, SuggestedName);
-   MSG("a_UIcmd_save: %s\n", name);
-   dFree(SuggestedName);
-   dFree(urlstr);
+   char *SuggestedName;
+   BrowserWindow *bw = (BrowserWindow *)vbw;
+   const DilloUrl *url = a_History_get_url(NAV_TOP_UIDX(bw));
 
-   if (name) {
-      a_Nav_save_url((BrowserWindow*)vbw, url, name);
-   }
+   if (url) {
+      a_UIcmd_set_save_dir(prefs.save_dir);
+      SuggestedName = UIcmd_make_save_filename(URL_PATH(url));
+      name = a_Dialog_save_file("Save Page as File", NULL, SuggestedName);
+      MSG("a_UIcmd_save: %s\n", name);
+      dFree(SuggestedName);
 
-   a_Url_free(url);
+      if (name) {
+         a_Nav_save_url(bw, url, name);
+      }
+   } 
 }
 
 /*