diff options
| author | Radek Doulik <rodo@src.gnome.org> | 2002-11-20 02:42:41 +0800 |
|---|---|---|
| committer | Radek Doulik <rodo@src.gnome.org> | 2002-11-20 02:42:41 +0800 |
| commit | ccbfa5da0395e08ce672a0546c513cf970c29fb6 (patch) | |
| tree | df2ad305f7ef54ecf568468ce754b1ce69f2d5ab | |
| parent | 3a49f0dd089a4a9fc1dd199a3f1e843e514afb8a (diff) | |
| download | gsoc2013-evolution-ccbfa5da0395e08ce672a0546c513cf970c29fb6.tar gsoc2013-evolution-ccbfa5da0395e08ce672a0546c513cf970c29fb6.tar.gz gsoc2013-evolution-ccbfa5da0395e08ce672a0546c513cf970c29fb6.tar.bz2 gsoc2013-evolution-ccbfa5da0395e08ce672a0546c513cf970c29fb6.tar.lz gsoc2013-evolution-ccbfa5da0395e08ce672a0546c513cf970c29fb6.tar.xz gsoc2013-evolution-ccbfa5da0395e08ce672a0546c513cf970c29fb6.tar.zst gsoc2013-evolution-ccbfa5da0395e08ce672a0546c513cf970c29fb6.zip | |
applied plain_signature_fix.patch
svn path=/trunk/; revision=18841
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/camel-mime-filter-tohtml.c | 2 | ||||
| -rw-r--r-- | camel/camel-mime-filter-tohtml.h | 1 | ||||
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 2 | ||||
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-composer-prefs.c | 2 |
7 files changed, 19 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 8a9a8c9a9c..f219e9da21 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2002-11-19 Radek Doulik <rodo@ximian.com> + + * camel-mime-filter-tohtml.c (html_convert): added + CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT flag + 2002-11-18 Rodney Dawes <dobey@ximian.com> * tests/*/Makefile.am: Removed $(GNOME_LIBDIR) and $(GNOMEUI_LIBS) diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c index 0f7fbfebf3..db84b7f9fe 100644 --- a/camel/camel-mime-filter-tohtml.c +++ b/camel/camel-mime-filter-tohtml.c @@ -211,7 +211,7 @@ writeln (CamelMimeFilter *filter, const char *in, const char *inend, char *outpt } /* otherwise, FALL THROUGH */ default: - if (!(u >= 0x20 && u < 0x80)) { + if (!(u >= 0x20 && u < 0x80) && !(html->flags & CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT)) { if (html->flags & CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT) *outptr++ = '?'; else diff --git a/camel/camel-mime-filter-tohtml.h b/camel/camel-mime-filter-tohtml.h index d8c6e47f41..0dff90d651 100644 --- a/camel/camel-mime-filter-tohtml.h +++ b/camel/camel-mime-filter-tohtml.h @@ -43,6 +43,7 @@ extern "C" { #define CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES (1 << 5) #define CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT (1 << 6) #define CAMEL_MIME_FILTER_TOHTML_CITE (1 << 7) +#define CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT (1 << 8) typedef struct _CamelMimeFilterToHTMLClass CamelMimeFilterToHTMLClass; typedef struct _CamelMimeFilterToHTML CamelMimeFilterToHTML; diff --git a/composer/ChangeLog b/composer/ChangeLog index 53ad7cf34b..459eeadcf4 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2002-11-19 Radek Doulik <rodo@ximian.com> + + * e-msg-composer.c (e_msg_composer_get_sig_file_content): use + CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT flag + 2002-11-19 Not Zed <NotZed@Ximian.com> * e-msg-composer-attachment-bar.c (add_from_file): dont unref diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index ee8887a140..3df26f5449 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -851,7 +851,7 @@ e_msg_composer_get_sig_file_content (const char *sigfile, gboolean in_html) return NULL; } - return get_file_content (NULL, sigfile, !in_html, 0, FALSE); + return get_file_content (NULL, sigfile, !in_html, CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, FALSE); } static void diff --git a/mail/ChangeLog b/mail/ChangeLog index 6524cae25b..2926993c3f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2002-11-19 Radek Doulik <rodo@ximian.com> + + * mail-composer-prefs.c (sig_load_preview): use + gtk_html_begin_content to specify utf-8 + 2002-11-19 Not Zed <NotZed@Ximian.com> * importers/evolution-mbox-importer.c (mail_importer_module_init): diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c index ba65f31a54..6482678093 100644 --- a/mail/mail-composer-prefs.c +++ b/mail/mail-composer-prefs.c @@ -191,7 +191,7 @@ sig_load_preview (MailComposerPrefs *prefs, MailConfigSignature *sig) int len; len = strlen (str); - stream = gtk_html_begin (GTK_HTML (prefs->sig_preview)); + stream = gtk_html_begin_content (GTK_HTML (prefs->sig_preview), "text/html; charset=utf-8"); gtk_html_write (GTK_HTML (prefs->sig_preview), stream, "<PRE>", 5); if (len) gtk_html_write (GTK_HTML (prefs->sig_preview), stream, str, len); |