From 92b2e9b5b9066771fdb92518bab7a89207aa7f6c Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 15 Feb 2005 15:00:28 +0000 Subject: [PATCH] 2005-02-15 [colin] 1.0.1cvs8.1 * src/mimeview.c * src/common/utils.c Sync with HEAD --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 4 ++-- src/common/utils.c | 2 +- src/mimeview.c | 15 ++++++++++----- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 948a450bf..b571b928d 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-02-15 [colin] 1.0.1cvs8.1 + + * src/mimeview.c + * src/common/utils.c + Sync with HEAD + 2005-02-15 [colin] 1.0.1cvs7.3 * src/gtk/pluginwindow.c diff --git a/PATCHSETS b/PATCHSETS index a63c687f5..e8ab34ce9 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -381,3 +381,4 @@ ( cvs diff -u -r 1.382.2.101 -r 1.382.2.102 src/compose.c; cvs diff -u -r 1.49.2.33 -r 1.49.2.34 src/procmime.c; ) > 1.0.1cvs7.1.patchset ( cvs diff -u -r 1.83.2.29 -r 1.83.2.30 src/mimeview.c; ) > 1.0.1cvs7.2.patchset ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/pluginwindow.c; ) > 1.0.1cvs7.3.patchset +( cvs diff -u -r 1.83.2.30 -r 1.83.2.31 src/mimeview.c; cvs diff -u -r 1.36.2.23 -r 1.36.2.24 src/common/utils.c; ) > 1.0.1cvs8.1.patchset diff --git a/configure.ac b/configure.ac index 7e1628f84..2a0554988 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,9 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=7 +EXTRA_VERSION=8 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.3 +EXTRA_GTK2_VERSION=.1 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/common/utils.c b/src/common/utils.c index aaefe2115..e5befebcb 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1079,7 +1079,7 @@ void subst_chars(gchar *str, gchar *orig, gchar subst) void subst_for_filename(gchar *str) { - subst_chars(str, " \t\r\n\"'/\\", '_'); + subst_chars(str, "\t\r\n\\/*", '_'); } void subst_for_shellsafe_filename(gchar *str) diff --git a/src/mimeview.c b/src/mimeview.c index 8186fbc85..f1c8c8432 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -991,12 +991,12 @@ gchar *mimeview_get_filename_for_part(MimeInfo *partinfo, filename = g_strdup(get_part_name(partinfo)); if (!filename || !*filename) filename = g_strdup_printf("noname.%d", number); - subst_for_shellsafe_filename(filename); + + subst_for_filename(filename); fullname = g_strconcat (basedir, G_DIR_SEPARATOR_S, (filename[0] == G_DIR_SEPARATOR) ? &filename[1] : filename, NULL); - subst_chars(fullname, "/\\", G_DIR_SEPARATOR); g_free(filename); return fullname; @@ -1114,7 +1114,7 @@ static void mimeview_save_as(MimeView *mimeview) gchar *filepath = NULL; gchar *filedir = NULL; MimeInfo *partinfo; - const gchar *partname = NULL; + gchar *partname = NULL; if (!mimeview->opened) return; if (!mimeview->file) return; @@ -1129,16 +1129,21 @@ static void mimeview_save_as(MimeView *mimeview) } g_return_if_fail(partinfo != NULL); - if ((partname = get_part_name(partinfo)) == NULL) { + if (get_part_name(partinfo) == NULL) { return; } - + partname = g_strdup(get_part_name(partinfo)); + + subst_for_filename(partname); + if (prefs_common.attach_save_dir) filepath = g_strconcat(prefs_common.attach_save_dir, G_DIR_SEPARATOR_S, partname, NULL); else filepath = g_strdup(partname); + g_free(partname); + filename = filesel_select_file_save(_("Save as"), filepath); if (!filename) { g_free(filepath); -- 2.25.1