2004-08-29 [colin] 0.9.12cvs84.1

	* src/mimeview.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 94cf2f143699e550c70a694282318ce100f3bf65..975532ec34b85f55b1d71bba33f0d6e12e5cb33a 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-08-29 [colin]     0.9.12cvs84.1
+
+       * src/mimeview.c
+               Sync with HEAD
+
 2004-08-27 [colin]     0.9.12cvs83.1
 
        * ChangeLog

diff --git a/PATCHSETS b/PATCHSETS
index 6b5c1ec557f3fd98f9d037ec559b01b2345b8c1c..3191b16f240edb4163fda99f0bb559eafc71bb94 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -145,3 +145,4 @@
 ( cvs diff -u -r 1.115.2.16 -r 1.115.2.17 src/main.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/wizard.c; ) > 0.9.12cvs82.3.patchset
 ( cvs diff -u -r 1.65.2.12 -r 1.65.2.13 src/codeconv.c; ) > 0.9.12cvs82.4.patchset
 ( cvs diff -u -r 1.396.2.8 -r 1.396.2.9 ChangeLog; cvs diff -u -r 1.2504.2.16 -r 1.2504.2.17 ChangeLog.claws; cvs diff -u -r 1.391.2.8 -r 1.391.2.9 ChangeLog.jp; cvs diff -u -r 1.79.2.3 -r 1.79.2.4 src/mh.c; cvs diff -u -r 1.47.2.8 -r 1.47.2.9 src/procheader.c; cvs diff -u -r 1.150.2.7 -r 1.150.2.8 src/procmsg.c; cvs diff -u -r 1.60.2.6 -r 1.60.2.7 src/procmsg.h; cvs diff -u -r 1.36.2.6 -r 1.36.2.7 src/common/utils.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/gtk/menu.h; cvs diff -u -r 1.21 -r 1.22 po/bg.po; cvs diff -u -r 1.9 -r 1.10 po/cs.po; cvs diff -u -r 1.58.2.3 -r 1.58.2.4 po/de.po; cvs diff -u -r 1.9 -r 1.10 po/el.po; cvs diff -u -r 1.12.2.1 -r 1.12.2.2 po/en_GB.po; cvs diff -u -r 1.60.2.4 -r 1.60.2.5 po/es.po; cvs diff -u -r 1.42.2.4 -r 1.42.2.5 po/fr.po; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 po/hr.po; cvs diff -u -r 1.5 -r 1.6 po/hu.po; cvs diff -u -r 1.34.2.3 -r 1.34.2.4 po/it.po; cvs diff -u -r 1.16.2.2 -r 1.16.2.3 po/ja.po; cvs diff -u -r 1.8 -r 1.9 po/ko.po; cvs diff -u -r 1.28 -r 1.29 po/nl.po; cvs diff -u -r 1.10.2.4 -r 1.10.2.5 po/pl.po; cvs diff -u -r 1.50.2.2 -r 1.50.2.3 po/pt_BR.po; cvs diff -u -r 1.17.2.1 -r 1.17.2.2 po/ru.po; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 po/sk.po; cvs diff -u -r 1.17.2.4 -r 1.17.2.5 po/sr.po; cvs diff -u -r 1.4 -r 1.5 po/sv.po; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 po/zh_CN.po; cvs diff -u -r 1.11 -r 1.12 po/zh_TW.Big5.po; ) > 0.9.12cvs83.1.patchset
+( cvs diff -u -r 1.83.2.16 -r 1.83.2.17 src/mimeview.c; ) > 0.9.12cvs84.1.patchset

diff --git a/configure.ac b/configure.ac
index f51f90a284c93981b0e270d07118ebb507f50ff0..f39e9472c70860b847dd05b0c58f6365db3ec83e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=83
+EXTRA_VERSION=84
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 237dbb59e087794169e83a363a65532ef0e61329..edd792609c6ac0dc21a6120193bc908aab4e47fd 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1102,7 +1102,6 @@ static void mimeview_save_all(MimeView *mimeview)
 static void mimeview_save_as(MimeView *mimeview)
 {
        gchar *filename;
-       gchar *defname = NULL;
        gchar *filepath = NULL;
        gchar *filedir = NULL;
        MimeInfo *partinfo;
@@ -1121,16 +1120,15 @@ static void mimeview_save_as(MimeView *mimeview)
        }                        
        g_return_if_fail(partinfo != NULL);
        
-       if ((partname = get_part_name(partinfo)) != NULL) {
-               Xstrdup_a(defname, partname, return);
-               subst_for_shellsafe_filename(defname);
+       if ((partname = get_part_name(partinfo)) == NULL) {
+               return;
        }
 
        if (prefs_common.attach_save_dir)
                filepath = g_strconcat(prefs_common.attach_save_dir,
-                                      G_DIR_SEPARATOR_S, defname, NULL);
+                                      G_DIR_SEPARATOR_S, partname, NULL);
        else
-               filepath = g_strdup(defname);
+               filepath = g_strdup(partname);
 
        filename = filesel_select_file_save(_("Save as"), filepath);
        if (!filename) {