fix bug 4155, 'remember directory of last saving'

drop messageview_save_as(), use only summary_save_as()

diff --git a/src/messageview.c b/src/messageview.c
index fe9767db1c43f98a2adc93926873e5bb157b69cf..62d63ad0f77cfe44416c699b94279d3d2d26666e 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1813,52 +1813,6 @@ gboolean messageview_is_visible(MessageView *messageview)
        return messageview->visible;
 }
 
        return messageview->visible;
 }
 

-static void messageview_save_as(MessageView *messageview)
-{
-       gchar *filename = NULL;
-       MsgInfo *msginfo;
-       gchar *src, *dest, *tmp;
-
-       if (!messageview->msginfo) return;
-       msginfo = messageview->msginfo;
-
-       if (msginfo->subject) {
-               Xstrdup_a(filename, msginfo->subject, return);
-               subst_for_filename(filename);
-       }
-       if (filename && !g_utf8_validate(filename, -1, NULL)) {
-               gchar *oldstr = filename;
-               filename = conv_codeset_strdup(filename,
-                                              conv_get_locale_charset_str(),
-                                              CS_UTF_8);
-               if (!filename) {
-                       g_warning("messageview_save_as(): failed to convert character set.");
-                       filename = g_strdup(oldstr);
-               }
-               dest = filesel_select_file_save(_("Save as"), filename);
-               g_free(filename);
-       } else
-               dest = filesel_select_file_save(_("Save as"), filename);
-       if (!dest) return;
-       if (is_file_exist(dest)) {
-               AlertValue aval;
-
-               aval = alertpanel(_("Overwrite"),
-                                 _("Overwrite existing file?"),
-                                 GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST);
-               if (G_ALERTALTERNATE != aval) return;
-       }
-
-       src = procmsg_get_message_file(msginfo);
-       if (copy_file(src, dest, TRUE) < 0) {
-               tmp =  g_path_get_basename(dest);
-               alertpanel_error(_("Couldn't save the file '%s'."), tmp);
-               g_free(tmp);
-       }
-       g_free(dest);
-       g_free(src);
-}
-

 static gint messageview_delete_cb(GtkWidget *widget, GdkEventAny *event,
                                  MessageView *messageview)
 {
 static gint messageview_delete_cb(GtkWidget *widget, GdkEventAny *event,
                                  MessageView *messageview)
 {


@@ -2199,7 +2153,7 @@ gchar *messageview_get_selection(MessageView *msgview)
 static void save_as_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
 static void save_as_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;

-       messageview_save_as(messageview);
+       summary_save_as(messageview->mainwin->summaryview);

 }
 
 static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gint partnum) 
 }
 
 static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gint partnum) 

diff --git a/src/summaryview.c b/src/summaryview.c
index 99b30c80589e30ea9afa4a3364a8f6af728bd6e7..59bd9d6d25ec724ce29c6c6f20bf17c7f1d34379 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4995,6 +4995,7 @@ void summary_save_as(SummaryView *summaryview)
        gchar *filename = NULL;
        gchar *src, *dest;
        gchar *tmp;
        gchar *filename = NULL;
        gchar *src, *dest;
        gchar *tmp;

+       gchar *filedir = NULL;

 
        AlertValue aval = 0;
 
 
        AlertValue aval = 0;
 


@@ -5018,12 +5019,17 @@ void summary_save_as(SummaryView *summaryview)
                        g_warning("summary_save_as(): failed to convert character set.");
                        filename = g_strdup(oldstr);
                }
                        g_warning("summary_save_as(): failed to convert character set.");
                        filename = g_strdup(oldstr);
                }

-               dest = filesel_select_file_save(_("Save as"), filename);
+               dest = filename;

                g_free(filename);
        } else
                g_free(filename);
        } else

-               dest = filesel_select_file_save(_("Save as"), filename);
+               dest = filename;

        filename = NULL;
        if (!dest) return;
        filename = NULL;
        if (!dest) return;

+       if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
+               dest = g_strconcat(prefs_common.attach_save_dir, G_DIR_SEPARATOR_S,
+                                  dest, NULL);
+       dest = filesel_select_file_save(_("Save as"), dest);
+

        if (is_file_exist(dest)) {
                aval = alertpanel(_("Append or Overwrite"),
                                  _("Append or overwrite existing file?"),
        if (is_file_exist(dest)) {
                aval = alertpanel(_("Append or Overwrite"),
                                  _("Append or overwrite existing file?"),


@@ -5060,6 +5066,13 @@ void summary_save_as(SummaryView *summaryview)
                }
                g_free(src);
        }
                }
                g_free(src);
        }

+
+       filedir = g_path_get_dirname(dest);
+       if (filedir && strcmp(filedir, ".")) {
+               g_free(prefs_common.attach_save_dir);
+               prefs_common.attach_save_dir = g_filename_to_utf8(filedir, -1, NULL, NULL, NULL);
+       }
+

        g_free(dest);
        g_free(tmp);
 }
        g_free(dest);
        g_free(tmp);
 }