diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-format.c | 21 | ||||
| -rw-r--r-- | mail/mail-mt.c | 6 |
3 files changed, 12 insertions, 23 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b6af992250..62e5e42994 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,13 @@ 2001-10-30 <NotZed@Ximian.com> + * mail-mt.c: Added exception strings to some of the op logging. + + * mail-format.c (elide_quotes): Remove, uh, what was this for, its + not used anywhere? Also loops the instant it had a ", good one + trow! :) + (write_address): Remove name_arg/email_arg, these aren't used + anywhere. + * mail-mt.c (mail_msg_received): If we have a cancellation setup, destroy it immediately, to save fd's. (mail_msg_cancel): Check cancel != NULL. diff --git a/mail/mail-format.c b/mail/mail-format.c index 22831b77ba..47cf5ba960 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -785,21 +785,6 @@ write_text_header (const char *name, const char *value, int flags, GtkHTML *html g_free (encoded); } -static gchar * -elide_quotes (const gchar *str) -{ - gchar *cpy = g_strdup (str); - gchar *c = cpy; - - if (c) { - while (*c) { - if (*c != '"') - ++c; - } - } - return cpy; -} - static void write_address (MailDisplay *md, const CamelInternetAddress *addr, const char *field_name, int flags) { @@ -817,8 +802,6 @@ write_address (MailDisplay *md, const CamelInternetAddress *addr, const char *fi gchar *addr_txt, *addr_url; gboolean have_name = name && *name; gboolean have_email = email && *email; - gchar *name_arg = NULL; - gchar *email_arg = NULL; gchar *name_disp = NULL; gchar *email_disp = NULL; @@ -833,7 +816,6 @@ write_address (MailDisplay *md, const CamelInternetAddress *addr, const char *fi } if (have_email) { - email_arg = elide_quotes (email); /* should never be an issue */ email_disp = e_text_to_html (email, 0); } @@ -842,7 +824,6 @@ write_address (MailDisplay *md, const CamelInternetAddress *addr, const char *fi if (have_email || have_name) { if (!have_email) { - email_arg = g_strdup ("???"); email_disp = g_strdup ("???"); } @@ -864,8 +845,6 @@ write_address (MailDisplay *md, const CamelInternetAddress *addr, const char *fi g_free (str); } - g_free (name_arg); - g_free (email_arg); g_free (name_disp); g_free (email_disp); g_free (addr_txt); diff --git a/mail/mail-mt.c b/mail/mail-mt.c index d02eaaab60..c047d49c0a 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -187,7 +187,8 @@ void mail_msg_free(void *msg) #ifdef LOG_OPS if (log_ops) - fprintf(log, "%p: Free\n", msg); + fprintf(log, "%p: Free (exception `%s')\n", msg, + camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); #endif g_hash_table_remove(mail_msg_active_table, (void *)m->seq); pthread_cond_broadcast(&mail_msg_cond); @@ -382,7 +383,8 @@ mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) #ifdef LOG_OPS if (log_ops) - fprintf(log, "%p: Replied to GUI thread\n", m); + fprintf(log, "%p: Replied to GUI thread (exception `%s'\n", m, + camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); #endif if (m->ops->reply_msg) |