2004-10-21 [colin] 0.9.12cvs131.1

	* ChangeLog.claws
	* src/compose.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index cb5299c744fd731e503a290203775ab7d3c17750..5a6ba1c663e508af0a8de4659397ee637c104a70 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-10-21 [colin]     0.9.12cvs131.1
+
+       * ChangeLog.claws
+       * src/compose.c
+               Sync with HEAD
+
 2004-10-21 [paul]      0.9.12cvs130.2
 
        * src/prefs_folder_item.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c9ec3964f9690fc7067f557e8f887684036267ae..403c5dea2f80522a6ac4140c5d86b55fe050390e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2004-10-21 [colin]     0.9.12cvs131
+
+       * src/compose.c
+               Replace "unknown" attachments by "application/octet-stream"
+               Be a bit more defensive when using strchr
+
+2004-10-20 [paul]
+
+       * po/ru.po
+               updated by Pavlo Bohmat
+
 2004-10-19 [christoph] 0.9.12cvs130
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 46bc9c744c9574a4ffcad29847b47214fb2ccd53..3bc32de88904da4bd6cf61b43a939d8a0636544a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -203,3 +203,4 @@
 ( cvs diff -u -r 1.22.2.1 -r 1.22.2.2 src/addrbook.c; cvs diff -u -r 1.15.2.1 -r 1.15.2.2 src/addrcache.c; cvs diff -u -r 1.60.2.11 -r 1.60.2.12 src/addressbook.c; cvs diff -u -r 1.65.2.15 -r 1.65.2.16 src/codeconv.c; cvs diff -u -r 1.382.2.51 -r 1.382.2.52 src/compose.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/customheader.c; cvs diff -u -r 1.14.2.2 -r 1.14.2.3 src/editaddress.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/editgroup.c; cvs diff -u -r 1.5 -r 1.6 src/exporthtml.c; cvs diff -u -r 1.213.2.17 -r 1.213.2.18 src/folder.c; cvs diff -u -r 1.207.2.18 -r 1.207.2.19 src/folderview.c; cvs diff -u -r 1.179.2.8 -r 1.179.2.9 src/imap.c; cvs diff -u -r 1.18.2.2 -r 1.18.2.3 src/jpilot.c; cvs diff -u -r 1.115.2.20 -r 1.115.2.21 src/main.c; cvs diff -u -r 1.25.2.4 -r 1.25.2.5 src/matcher_parser_parse.y; cvs diff -u -r 1.28.2.1 -r 1.28.2.2 src/mbox.c; cvs diff -u -r 1.56.2.25 -r 1.56.2.26 src/pop.c; cvs diff -u -r 1.105.2.9 -r 1.105.2.10 src/prefs_account.c; cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/prefs_gtk.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_msg_colors.c; cvs diff -u -r 1.47.2.9 -r 1.47.2.10 src/procheader.c; cvs diff -u -r 1.49.2.10 -r 1.49.2.11 src/procmime.c; cvs diff -u -r 1.17.2.5 -r 1.17.2.6 src/procmime.h; cvs diff -u -r 1.150.2.10 -r 1.150.2.11 src/procmsg.c; cvs diff -u -r 1.395.2.35 -r 1.395.2.36 src/summaryview.c; cvs diff -u -r 1.96.2.22 -r 1.96.2.23 src/textview.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/base64.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/partial_download.c; cvs diff -u -r 1.13.2.9 -r 1.13.2.10 src/common/socket.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/common/sylpheed.c; cvs diff -u -r 1.36.2.8 -r 1.36.2.9 src/common/utils.c; cvs diff -u -r 1.20.2.7 -r 1.20.2.8 src/common/utils.h; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/quicksearch.c; cvs diff -u -r 1.13.2.3 -r 1.13.2.4 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.3 -r 1.4 src/plugins/clamav/clamav_plugin.h; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/passphrase.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/prefs_gpg.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.18.2.3 -r 1.18.2.4 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.5 -r 1.23.2.6 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c; ) > 0.9.12cvs128.1.patchset
 ( cvs diff -u -r 1.2504.2.24 -r 1.2504.2.25 ChangeLog.claws; cvs diff -u -r 1.382.2.52 -r 1.382.2.53 src/compose.c; cvs diff -u -r 1.36.2.9 -r 1.36.2.10 src/common/utils.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/menu.c; ) > 0.9.12cvs130.1.patchset
 ( cvs diff -u -r 1.52.2.6 -r 1.52.2.7 src/prefs_folder_item.c; ) > 0.9.12cvs130.2.patchset
+( cvs diff -u -r 1.2504.2.25 -r 1.2504.2.26 ChangeLog.claws; cvs diff -u -r 1.382.2.53 -r 1.382.2.54 src/compose.c; ) > 0.9.12cvs131.1.patchset

diff --git a/configure.ac b/configure.ac
index 0d62e552b38d53bfadc140692bdb9f3d864b067c..147642cb3f5fafa2769cbb6c82e02d17bbd068b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=130
+EXTRA_VERSION=131
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+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/compose.c b/src/compose.c
index 943a3c41873f2e237beba496bd3ab35a7ec0d5c3..e9f71d55f55a18b107a1d9c35d927918a4348b6c 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2246,6 +2246,12 @@ static void compose_attach_append(Compose *compose, const gchar *file,
                        ainfo->encoding = ENC_BASE64;
                ainfo->name = g_strdup(g_basename(filename ? filename : file)); 
        }
+
+       if (!strcmp(ainfo->content_type, "unknown")) {
+               g_free(ainfo->content_type);
+               ainfo->content_type = g_strdup("application/octet-stream");
+       }
+
        ainfo->size = size;
 
        text[COL_MIMETYPE] = ainfo->content_type;
@@ -3939,6 +3945,12 @@ static void compose_add_attachments(Compose *compose, MimeInfo *parent)
                mimepart->length = statbuf.st_size;
 
                type = g_strdup(ainfo->content_type);
+
+               if (!strchr(type, '/')) {
+                       g_free(type);
+                       type = g_strdup("application/octet-stream");
+               }
+
                subtype = strchr(type, '/') + 1;
                *(subtype - 1) = '\0';
                mimepart->type = procmime_get_media_type(type);