diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-05-21 23:27:54 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-05-21 23:27:54 +0800 |
| commit | 051f6546155f56e5dd478c9b366aa583948431bc (patch) | |
| tree | 21cea9c0c10a6d8faaece8b2f6f4c80cea77b299 /mail/mail-search.c | |
| parent | 4a405c663477fa1adcaf6f25c9b858ddbd1db317 (diff) | |
| download | gsoc2013-evolution-051f6546155f56e5dd478c9b366aa583948431bc.tar.gz gsoc2013-evolution-051f6546155f56e5dd478c9b366aa583948431bc.tar.zst gsoc2013-evolution-051f6546155f56e5dd478c9b366aa583948431bc.zip | |
Updated copyright years.
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.
svn path=/trunk/; revision=21299
Diffstat (limited to 'mail/mail-search.c')
| -rw-r--r-- | mail/mail-search.c | 9 |
1 files changed, 6 insertions, 3 deletions
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); } |