aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2000-11-02 06:32:59 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-11-02 06:32:59 +0800
commitde58cbf8be4d351193d43525cec73950dcda6edf (patch)
treefa033d09906290846467e4c6703e38b057664004 /composer
parent57f02847d87a5adb7b443ef06d8bca945f0cae38 (diff)
downloadgsoc2013-evolution-de58cbf8be4d351193d43525cec73950dcda6edf.tar
gsoc2013-evolution-de58cbf8be4d351193d43525cec73950dcda6edf.tar.gz
gsoc2013-evolution-de58cbf8be4d351193d43525cec73950dcda6edf.tar.bz2
gsoc2013-evolution-de58cbf8be4d351193d43525cec73950dcda6edf.tar.lz
gsoc2013-evolution-de58cbf8be4d351193d43525cec73950dcda6edf.tar.xz
gsoc2013-evolution-de58cbf8be4d351193d43525cec73950dcda6edf.tar.zst
gsoc2013-evolution-de58cbf8be4d351193d43525cec73950dcda6edf.zip
Fix the CTE kludge, calculate the best mime transfer encoding for the mime
2000-11-01 Jeffrey Stedfast <fejj@helixcode.com> * e-msg-composer-attachment-bar.c (attach_to_multipart): Fix the CTE kludge, calculate the best mime transfer encoding for the mime part and use that. Include e-msg-composer-select-file.h svn path=/trunk/; revision=6325
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-attachment-bar.c74
2 files changed, 65 insertions, 15 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 73f4074572..b8991e1a98 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-01 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * e-msg-composer-attachment-bar.c (attach_to_multipart): Fix the
+ CTE kludge, calculate the best mime transfer encoding for the mime
+ part and use that. Include e-msg-composer-select-file.h
+
2000-10-31 Radek Doulik <rodo@helixcode.com>
* e-msg-composer.c (prepare_engine): new function, tries prepare
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 357045ce06..93aaf30900 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -29,6 +29,7 @@
#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
#include "e-msg-composer.h"
+#include "e-msg-composer-select-file.h"
#include "e-msg-composer-attachment.h"
#include "e-msg-composer-attachment-bar.h"
@@ -220,7 +221,7 @@ update (EMsgComposerAttachmentBar *bar)
image = TRUE;
else
image = FALSE;
-
+
if (image && attachment->pixbuf_cache == NULL) {
CamelDataWrapper *wrapper;
CamelStream *mstream;
@@ -389,13 +390,13 @@ add_from_user (EMsgComposerAttachmentBar *bar)
{
EMsgComposer *composer;
char *file_name;
-
+
composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
-
+
file_name = e_msg_composer_select_file (composer, _("Attach a file"));
-
+
add_from_file (bar, file_name);
-
+
g_free (file_name);
}
@@ -655,27 +656,70 @@ e_msg_composer_attachment_bar_new (GtkAdjustment *adj)
return GTK_WIDGET (new);
}
-
+/* FIXME: is_8bit() and best_encoding() should really be shared
+ between e-msg-composer.c and this file. */
+static gboolean
+is_8bit (const guchar *text)
+{
+ guchar *c;
+
+ for (c = (guchar *) text; *c; c++)
+ if (*c > (guchar) 127)
+ return TRUE;
+
+ return FALSE;
+}
+
+static int
+best_encoding (const guchar *text)
+{
+ guchar *ch;
+ int count = 0;
+ int total;
+
+ for (ch = (guchar *) text; *ch; ch++)
+ if (*ch > (guchar) 127)
+ count++;
+
+ total = (int) (ch - text);
+
+ if ((float) count <= total * 0.17)
+ return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
+ else
+ return CAMEL_MIME_PART_ENCODING_BASE64;
+}
+
static void
attach_to_multipart (CamelMultipart *multipart,
EMsgComposerAttachment *attachment)
{
GMimeContentField *content_type;
-
+
content_type = camel_mime_part_get_content_type (attachment->body);
-
- /* Kludge a bit on CTE. For now, we set QP for text and B64
- * for all else except message (which must be 7bit, 8bit, or
- * binary). FIXME.
- */
+
if (!g_strcasecmp (content_type->type, "text")) {
- camel_mime_part_set_encoding (attachment->body,
- CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE);
+ CamelStream *stream;
+ GByteArray *array;
+ guchar *text;
+
+ array = g_byte_array_new ();
+ stream = camel_stream_mem_new_with_byte_array (array);
+ camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (attachment->body), stream);
+ camel_object_unref (CAMEL_OBJECT (stream));
+ g_byte_array_append (array, "", 1);
+ text = array->data;
+
+ if (is_8bit (text))
+ camel_mime_part_set_encoding (attachment->body, best_encoding (text));
+ else
+ camel_mime_part_set_encoding (attachment->body, CAMEL_MIME_PART_ENCODING_7BIT);
+
+ g_byte_array_free (array, TRUE);
} else if (g_strcasecmp (content_type->type, "message") != 0) {
camel_mime_part_set_encoding (attachment->body,
CAMEL_MIME_PART_ENCODING_BASE64);
}
-
+
camel_multipart_add_part (multipart, attachment->body);
}