diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 | ||||
| -rw-r--r-- | mail/mail-display.c | 2 | ||||
| -rw-r--r-- | mail/mail-importer.c | 2 | ||||
| -rw-r--r-- | mail/mail-search.c | 9 |
5 files changed, 19 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 076993c3d9..5e63c299b7 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,14 @@ +2003-05-20 Jeffrey Stedfast <fejj@ximian.com> + + * mail-importer.c: Updated copyright years. + + * mail-callbacks.c (ask_confirm_for_empty_subject): Fixed the + logic a bit - if the gconf key *isn't* set, we want to return + TRUE. + + * mail-search.c (mail_search_finalise): We need to weak_unref() + the mail-display here. Fixes bug #43392. + 2003-05-21 Larry Ewing <lewing@ximian.com> * mail-config.glade: remove link hilighting option that isn't diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index c8dd8a439b..87bbc24817 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -281,7 +281,7 @@ ask_confirm_for_empty_subject (EMsgComposer *composer) gconf = gconf_client_get_default (); - if (gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/empty_subject", NULL)) + if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/empty_subject", NULL)) return TRUE; res = e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, &show_again, diff --git a/mail/mail-display.c b/mail/mail-display.c index 45b7000f69..e8d97034d8 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -302,7 +302,6 @@ mail_display_jump_to_anchor (MailDisplay *md, const char *url) static void on_link_clicked (GtkHTML *html, const char *url, MailDisplay *md) { - if (!strncasecmp (url, "mailto:", 7)) { send_to_url (url, NULL); } else if (*url == '#') { @@ -2080,7 +2079,6 @@ mail_display_destroy (GtkObject *object) g_object_unref (mail_display->html); mail_display->html = NULL; } - if (mail_display->current_message) { camel_object_unref (mail_display->current_message); diff --git a/mail/mail-importer.c b/mail/mail-importer.c index f6d73a5d30..746bf0055c 100644 --- a/mail/mail-importer.c +++ b/mail/mail-importer.c @@ -3,7 +3,7 @@ * * Authors: Iain Holmes <iain@ximian.com> * - * Copyright (C) 2001 Ximian, Inc. + * Copyright (C) 2001-2003 Ximian, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/mail/mail-search.c b/mail/mail-search.c index e79be29121..4e79cf2fd1 100644 --- a/mail/mail-search.c +++ b/mail/mail-search.c @@ -47,6 +47,7 @@ mail_search_finalise (GObject *obj) MailSearch *ms = MAIL_SEARCH (obj); g_free (ms->last_search); + g_object_weak_unref ((GObject *) ms->mail, (GWeakNotify) gtk_widget_destroy, ms); g_object_unref (ms->mail); G_OBJECT_CLASS (parent_class)->finalize (obj); @@ -57,11 +58,13 @@ mail_search_destroy (GtkObject *obj) { MailSearch *ms = (MailSearch *) obj; ESearchingTokenizer *st = mail_search_tokenizer (ms); - + if (ms->begin_handler) { - g_signal_handler_disconnect(ms->mail->html->engine->ht, ms->match_handler); - g_signal_handler_disconnect(ms->mail->html->engine->ht, ms->begin_handler); + g_signal_handler_disconnect (ms->mail->html->engine->ht, ms->begin_handler); ms->begin_handler = 0; + g_signal_handler_disconnect (ms->mail->html->engine->ht, ms->match_handler); + ms->match_handler = 0; + e_searching_tokenizer_set_primary_search_string (st, NULL); mail_search_redisplay_message (ms); } |