From 4b2eddbec72f5e72166bcc7ee3dfd1f1d68c28e8 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 23 Jun 2004 08:08:40 +0000 Subject: ** See #54030. 2004-06-23 Not Zed ** See #54030. * e-searching-tokenizer.c (e_searching_tokenizer_match_count): only return a count if we're using the primary search string. * em-format-html-display.c (efhd_search_response): set the primary search string to NULL instead of resetting it. (efhd_update_search): dont noop if we have a null search text, just set an empty search. * e-searching-tokenizer.c (e_searching_tokenizer_reset): remove this, revert jeff's fixes for 54030. this is incomplete and so doesn't work either (search text stays remembered and secondary search text lost too). ** See #60523. * em-folder-view.c (emfv_finalise): unhook the folder changed before destroying the async thing, and move it all to destroy event anyway. (emfv_destroy): as above. svn path=/trunk/; revision=26472 --- mail/em-folder-view.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'mail/em-folder-view.c') diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index b5222f7b6c..71e24a3d40 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -203,16 +203,6 @@ emfv_finalise(GObject *o) EMFolderView *emfv = (EMFolderView *)o; struct _EMFolderViewPrivate *p = emfv->priv; - if (emfv->async) - mail_async_event_destroy(emfv->async); - - if (emfv->folder) { - if (p->folder_changed_id) - camel_object_remove_event(emfv->folder, p->folder_changed_id); - camel_object_unref(emfv->folder); - g_free(emfv->folder_uri); - } - g_slist_free(emfv->ui_files); g_slist_free(emfv->enable_map); @@ -240,6 +230,20 @@ emfv_destroy (GtkObject *o) g_object_unref(gconf); } + if (emfv->folder) { + if (p->folder_changed_id) + camel_object_remove_event(emfv->folder, p->folder_changed_id); + camel_object_unref(emfv->folder); + g_free(emfv->folder_uri); + emfv->folder = NULL; + emfv->folder_uri = NULL; + } + + if (emfv->async) { + mail_async_event_destroy(emfv->async); + emfv->async = NULL; + } + if (p->invisible) { g_object_unref(p->invisible); p->invisible = NULL; -- cgit v1.2.3