diff options
| author | Jeffrey Stedfast <fejJ@ximian.com> | 2001-12-15 04:06:51 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-12-15 04:06:51 +0800 |
| commit | 551901216ecf731bf44ded1cc2c61b60d3ef708f (patch) | |
| tree | f925a529bf286af858c51c6e966a82eb8353a9d2 /mail/mail-format.c | |
| parent | 900078b3119c8061c5e416d6ef3441a7700c7fdb (diff) | |
| download | gsoc2013-evolution-551901216ecf731bf44ded1cc2c61b60d3ef708f.tar.gz gsoc2013-evolution-551901216ecf731bf44ded1cc2c61b60d3ef708f.tar.zst gsoc2013-evolution-551901216ecf731bf44ded1cc2c61b60d3ef708f.zip | |
Connect to the destroy signal on the popup dialog.
2001-12-12 Jeffrey Stedfast <fejJ@ximian.com>
* mail-config.c (mail_config_check_service): Connect to the
destroy signal on the popup dialog.
2001-12-12 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c (handle_text_plain): Make sure i != num_specials
after we check for any special text markers. Fixes bug #12265.
svn path=/trunk/; revision=15085
Diffstat (limited to 'mail/mail-format.c')
| -rw-r--r-- | mail/mail-format.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail/mail-format.c b/mail/mail-format.c index 68b51e8265..74ffc99a22 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1146,7 +1146,8 @@ struct { { "begin ", try_uudecoding }, { "(This file must be converted with BinHex 4.0)\n", try_inline_binhex } }; -#define NSPECIALS (sizeof (text_specials) / sizeof (*text_specials)) + +static int num_specials = (sizeof (text_specials) / sizeof (text_specials[0])); static void write_one_text_plain_chunk (const char *text, int len, GtkHTML *html, GtkHTMLStream *stream, gboolean printing) @@ -1200,12 +1201,12 @@ handle_text_plain (CamelMimePart *part, const char *mime_type, p = text; while (p && check_specials) { /* Look for special cases. */ - for (i = 0; i < NSPECIALS; i++) { + for (i = 0; i < num_specials; i++) { start = strstr (p, text_specials[i].start); if (start && (start == p || start[-1] == '\n')) break; } - if (!start) + if (i == num_specials) break; /* Deal with special case */ |