2005-10-25 [colin] 1.9.15cvs106

	* src/mimeview.c
		Fix encoding issue in Save all and in
		overwrite-confirmation alertpanel

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f31285721814114b45f6a9d1ca19ed89b79d90b9..4ca1d8edeac18dcded92302ac06920ceab85bef4 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-10-25 [colin]     1.9.15cvs106
+
+       * src/mimeview.c
+               Fix encoding issue in Save all and in 
+               overwrite-confirmation alertpanel
+

 2005-10-25 [cleroy]    1.9.15cvs105
 
        * src/common/socket.c
 2005-10-25 [cleroy]    1.9.15cvs105
 
        * src/common/socket.c

diff --git a/PATCHSETS b/PATCHSETS
index 9cc6e1e7df60e70c21ffd90db87a797540fe8dc6..78701c68d98c7cf943970893ac5a71f4051c974d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -942,3 +942,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/handling.xml;  ) > 1.9.15cvs103.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/wizard.c;  ) > 1.9.15cvs104.patchset
 ( cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/common/socket.c;  ) > 1.9.15cvs105.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/handling.xml;  ) > 1.9.15cvs103.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/wizard.c;  ) > 1.9.15cvs104.patchset
 ( cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/common/socket.c;  ) > 1.9.15cvs105.patchset

+( cvs diff -u -r 1.83.2.49 -r 1.83.2.50 src/mimeview.c;  ) > 1.9.15cvs106.patchset

diff --git a/configure.ac b/configure.ac
index 36ba56278132ddb984face5d3f3924043d969bb8..972c49f0688cac0755cfb9e92d779f353ac235e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=105
+EXTRA_VERSION=106

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 8618d4f9eb1b6d559f8a3970d5c0c8a9b46b8ce9..57e53c7f9006c5018c64de5775bd228b7bf5354b 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1058,7 +1058,9 @@ gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
                 ? &filename[1] : filename, NULL);
 
        g_free(filename);
                 ? &filename[1] : filename, NULL);
 
        g_free(filename);

-       return fullname;
+       filename = conv_filename_from_utf8(fullname);
+       g_free(fullname);
+       return filename;

 }
 
 /**
 }
 
 /**


@@ -1079,9 +1081,16 @@ static gboolean mimeview_write_part(const gchar *filename,
        if (is_file_exist(filename)) {
                AlertValue aval;
                gchar *res;
        if (is_file_exist(filename)) {
                AlertValue aval;
                gchar *res;

+               gchar *tmp;
+               
+               if (!g_utf8_validate(filename, -1, NULL))
+                       tmp = conv_filename_to_utf8(filename);
+               else 
+                       tmp = g_strdup(filename);

                
                res = g_strdup_printf(_("Overwrite existing file '%s'?"),
                
                res = g_strdup_printf(_("Overwrite existing file '%s'?"),

-                                     filename);
+                                     tmp);
+               g_free(tmp);

                aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK, 
                                  GTK_STOCK_CANCEL, NULL);
                g_free(res);                                      
                aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK, 
                                  GTK_STOCK_CANCEL, NULL);
                g_free(res);