2007-11-19 [colin] 3.1.0cvs6

	* src/compose.c
		Make strings a bit better when attaching
		from mailto: URIs

diff --git a/ChangeLog b/ChangeLog
index a3f4f1b94923ae98b64139dd4e22842f74de9f8d..484f366dbf4990b8d4498ba54640b0f6e1c95281 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-19 [colin]     3.1.0cvs6
+
+       * src/compose.c
+               Make strings a bit better when attaching
+               from mailto: URIs
+
 2007-11-19 [colin]     3.1.0cvs5
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index 336194fc807693aad60bf4174b9628d096b03e7f..11bf0e2d3df8791519cb055741ed0d015ed1598b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3063,3 +3063,4 @@
 ( cvs diff -u -r 1.60.2.105 -r 1.60.2.106 src/addressbook.c;  cvs diff -u -r 1.18.2.11 -r 1.18.2.12 src/addressbook.h;  cvs diff -u -r 1.14.2.44 -r 1.14.2.45 src/editaddress.c;  cvs diff -u -r 1.11.2.17 -r 1.11.2.18 src/editgroup.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/addrduplicates.c;  ) > 3.1.0cvs3.patchset
 ( cvs diff -u -r 1.382.2.422 -r 1.382.2.423 src/compose.c;  cvs diff -u -r 1.50.2.44 -r 1.50.2.45 src/compose.h;  ) > 3.1.0cvs4.patchset
 ( cvs diff -u -r 1.36.2.125 -r 1.36.2.126 src/common/utils.c;  ) > 3.1.0cvs5.patchset
+( cvs diff -u -r 1.382.2.423 -r 1.382.2.424 src/compose.c;  ) > 3.1.0cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 1c0e5f6b15d415581ab159ef6167f599d9752406..7c3fcd4c94ff4e498bd15f340787d3168ebc246e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index eb27cb5697fe093e6a54083f0f7b4cb8bc55872c..8e1789eeec56e0ab330887f347a3433fbe0bbc97 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2430,19 +2430,31 @@ static void compose_entries_set(Compose *compose, const gchar *mailto)
        }
 
        if (attach) {
-               gint i = 0;
+               gint i = 0, att = 0;
+               gchar *warn_files = NULL;
                while (attach[i] != NULL) {
                        gchar *utf8_filename = conv_filename_to_utf8(attach[i]);
                        if (utf8_filename) {
                                if (compose_attach_append(compose, attach[i], utf8_filename, NULL)) {
-                                       alertpanel_notice(_("The file '%s' has been attached."), utf8_filename);
-                               } 
+                                       gchar *tmp = g_strdup_printf("%s%s\n",
+                                                       warn_files?warn_files:"",
+                                                       utf8_filename);
+                                       g_free(warn_files);
+                                       warn_files = tmp;
+                                       att++;
+                               }
                                g_free(utf8_filename);
                        } else {
                                alertpanel_error(_("Couldn't attach a file (charset conversion failed)."));
                        }
                        i++;
                }
+               if (warn_files) {
+                       alertpanel_notice(ngettext(
+                       "The following file has been attached: \n%s",
+                       "The following files have been attached: \n%s", att), warn_files);
+                       g_free(warn_files);
+               }
        }
        g_free(to);
        g_free(cc);