2004-10-29 [colin] 0.9.12cvs136.1

	* src/common/utils.c
		Sync with HEAD (don't use '=' in mime boundary)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 8c2e107148ce7833e8f5292bb1ab26f8265e14d8..b9986491f8986b28bca18493e4d67e960f4eccf4 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-10-29 [colin]     0.9.12cvs136.1
+
+       * src/common/utils.c
+               Sync with HEAD (don't use '=' in mime boundary)
+

 2004-10-29 [paul]      0.9.12cvs135.1
 
        * configure.ac
 2004-10-29 [paul]      0.9.12cvs135.1
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 3c0fe7d25512448db133a1f7c7039474beee24b2..19fd183135919c5618481d07ca1072f92c6f605d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -210,3 +210,4 @@
 ( cvs diff -u -r 1.61.2.13 -r 1.61.2.14 src/account.c; cvs diff -u -r 1.60.2.12 -r 1.60.2.13 src/addressbook.c; cvs diff -u -r 1.5.10.4 -r 1.5.10.5 src/addrgather.c; cvs diff -u -r 1.6 -r 1.7 src/addrharvest.c; cvs diff -u -r 1.65.2.16 -r 1.65.2.17 src/codeconv.c; cvs diff -u -r 1.382.2.56 -r 1.382.2.57 src/compose.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/customheader.c; cvs diff -u -r 1.14.2.3 -r 1.14.2.4 src/editaddress.c; cvs diff -u -r 1.11.2.3 -r 1.11.2.4 src/editgroup.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/enriched.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/expldifdlg.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/exporthtml.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/exportldif.c; cvs diff -u -r 1.213.2.18 -r 1.213.2.19 src/folder.c; cvs diff -u -r 1.26.2.5 -r 1.26.2.6 src/foldersel.c; cvs diff -u -r 1.207.2.19 -r 1.207.2.20 src/folderview.c; cvs diff -u -r 1.14.2.5 -r 1.14.2.6 src/grouplistdialog.c; cvs diff -u -r 1.12.2.2 -r 1.12.2.3 src/html.c; cvs diff -u -r 1.179.2.9 -r 1.179.2.10 src/imap.c; cvs diff -u -r 1.18.2.3 -r 1.18.2.4 src/jpilot.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/ldapserver.c; cvs diff -u -r 1.12 -r 1.13 src/ldif.c; cvs diff -u -r 1.83.2.22 -r 1.83.2.23 src/mimeview.c; cvs diff -u -r 1.101.2.6 -r 1.101.2.7 src/news.c; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/news_gtk.c; cvs diff -u -r 1.56.2.26 -r 1.56.2.27 src/pop.c; cvs diff -u -r 1.16.2.4 -r 1.16.2.5 src/prefs_display_header.c; cvs diff -u -r 1.10.2.7 -r 1.10.2.8 src/prefs_gtk.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_msg_colors.c; cvs diff -u -r 1.30.2.4 -r 1.30.2.5 src/prefs_toolbar.c; cvs diff -u -r 1.47.2.10 -r 1.47.2.11 src/procheader.c; cvs diff -u -r 1.49.2.11 -r 1.49.2.12 src/procmime.c; cvs diff -u -r 1.395.2.36 -r 1.395.2.37 src/summaryview.c; cvs diff -u -r 1.96.2.24 -r 1.96.2.25 src/textview.c; cvs diff -u -r 1.43.2.10 -r 1.43.2.11 src/toolbar.c; cvs diff -u -r 1.14.2.1 -r 1.14.2.2 src/vcard.c; cvs diff -u -r 1.1 -r 1.2 src/common/mgutils.c; cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/common/nntp.c; cvs diff -u -r 1.11.2.4 -r 1.11.2.5 src/common/smtp.c; cvs diff -u -r 1.2.4.1 -r 1.2.4.2 src/common/template.c; cvs diff -u -r 1.36.2.10 -r 1.36.2.11 src/common/utils.c; cvs diff -u -r 1.1 -r 1.2 src/common/xmlprops.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/sgpgme.c; ) > 0.9.12cvs132.3.patchset
 ( cvs diff -u -r 1.654.2.243 -r 1.654.2.244 configure.ac; cvs diff -u -r 1.115.2.21 -r 1.115.2.22 src/main.c; cvs diff -u -r 1.49.2.12 -r 1.49.2.13 src/procmime.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs134.1.patchset
 ( cvs diff -u -r 1.654.2.244 -r 1.654.2.245 configure.ac; cvs diff -u -r 0 -r 1 doc/src/rfc2231.txt; cvs diff -u -r 1.49.2.13 -r 1.49.2.14 src/procmime.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/common/quoted-printable.c; cvs diff -u -r 1.36.2.11 -r 1.36.2.12 src/common/utils.c; cvs diff -u -r 1.20.2.8 -r 1.20.2.9 src/common/utils.h; ) > 0.9.12cvs135.1.patchset
 ( cvs diff -u -r 1.61.2.13 -r 1.61.2.14 src/account.c; cvs diff -u -r 1.60.2.12 -r 1.60.2.13 src/addressbook.c; cvs diff -u -r 1.5.10.4 -r 1.5.10.5 src/addrgather.c; cvs diff -u -r 1.6 -r 1.7 src/addrharvest.c; cvs diff -u -r 1.65.2.16 -r 1.65.2.17 src/codeconv.c; cvs diff -u -r 1.382.2.56 -r 1.382.2.57 src/compose.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/customheader.c; cvs diff -u -r 1.14.2.3 -r 1.14.2.4 src/editaddress.c; cvs diff -u -r 1.11.2.3 -r 1.11.2.4 src/editgroup.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/enriched.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/expldifdlg.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/exporthtml.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/exportldif.c; cvs diff -u -r 1.213.2.18 -r 1.213.2.19 src/folder.c; cvs diff -u -r 1.26.2.5 -r 1.26.2.6 src/foldersel.c; cvs diff -u -r 1.207.2.19 -r 1.207.2.20 src/folderview.c; cvs diff -u -r 1.14.2.5 -r 1.14.2.6 src/grouplistdialog.c; cvs diff -u -r 1.12.2.2 -r 1.12.2.3 src/html.c; cvs diff -u -r 1.179.2.9 -r 1.179.2.10 src/imap.c; cvs diff -u -r 1.18.2.3 -r 1.18.2.4 src/jpilot.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/ldapserver.c; cvs diff -u -r 1.12 -r 1.13 src/ldif.c; cvs diff -u -r 1.83.2.22 -r 1.83.2.23 src/mimeview.c; cvs diff -u -r 1.101.2.6 -r 1.101.2.7 src/news.c; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/news_gtk.c; cvs diff -u -r 1.56.2.26 -r 1.56.2.27 src/pop.c; cvs diff -u -r 1.16.2.4 -r 1.16.2.5 src/prefs_display_header.c; cvs diff -u -r 1.10.2.7 -r 1.10.2.8 src/prefs_gtk.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_msg_colors.c; cvs diff -u -r 1.30.2.4 -r 1.30.2.5 src/prefs_toolbar.c; cvs diff -u -r 1.47.2.10 -r 1.47.2.11 src/procheader.c; cvs diff -u -r 1.49.2.11 -r 1.49.2.12 src/procmime.c; cvs diff -u -r 1.395.2.36 -r 1.395.2.37 src/summaryview.c; cvs diff -u -r 1.96.2.24 -r 1.96.2.25 src/textview.c; cvs diff -u -r 1.43.2.10 -r 1.43.2.11 src/toolbar.c; cvs diff -u -r 1.14.2.1 -r 1.14.2.2 src/vcard.c; cvs diff -u -r 1.1 -r 1.2 src/common/mgutils.c; cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/common/nntp.c; cvs diff -u -r 1.11.2.4 -r 1.11.2.5 src/common/smtp.c; cvs diff -u -r 1.2.4.1 -r 1.2.4.2 src/common/template.c; cvs diff -u -r 1.36.2.10 -r 1.36.2.11 src/common/utils.c; cvs diff -u -r 1.1 -r 1.2 src/common/xmlprops.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/sgpgme.c; ) > 0.9.12cvs132.3.patchset
 ( cvs diff -u -r 1.654.2.243 -r 1.654.2.244 configure.ac; cvs diff -u -r 1.115.2.21 -r 1.115.2.22 src/main.c; cvs diff -u -r 1.49.2.12 -r 1.49.2.13 src/procmime.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs134.1.patchset
 ( cvs diff -u -r 1.654.2.244 -r 1.654.2.245 configure.ac; cvs diff -u -r 0 -r 1 doc/src/rfc2231.txt; cvs diff -u -r 1.49.2.13 -r 1.49.2.14 src/procmime.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/common/quoted-printable.c; cvs diff -u -r 1.36.2.11 -r 1.36.2.12 src/common/utils.c; cvs diff -u -r 1.20.2.8 -r 1.20.2.9 src/common/utils.h; ) > 0.9.12cvs135.1.patchset

+( cvs diff -u -r 1.36.2.12 -r 1.36.2.13 src/common/utils.c; ) > 0.9.12cvs136.1.patchset

diff --git a/configure.ac b/configure.ac
index ca44f6778466f88013f875ae2e308da512a40056..d5886521d2a4a11753c565431c95d86f3ce03740 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=135
+EXTRA_VERSION=136

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/common/utils.c b/src/common/utils.c
index ac31cd1e46f4529e82aab9038cd8005b9e5cbf67..fe559e91cb32ffc79b6ef27c850995d75539dcab 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -2872,7 +2872,7 @@ gchar *generate_mime_boundary(const gchar *prefix)
        subst_char(buf_date, ',', '_');
        subst_char(buf_date, ':', '_');
 
        subst_char(buf_date, ',', '_');
        subst_char(buf_date, ':', '_');
 

-       return g_strdup_printf("%s=_%s_%s", prefix ? prefix : "Multipart",
+       return g_strdup_printf("%s_%s_%s", prefix ? prefix : "Multipart",

                               buf_date, buf_uniq);
 }
 
                               buf_date, buf_uniq);
 }