diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-25 21:14:51 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-25 21:14:51 +0800 |
commit | f49077cfb57ade9013674487a1f371da7c038709 (patch) | |
tree | 58ebabbe624409eed22ed13578eab3ed2d4d0206 /mail/e-mail-browser.c | |
parent | d3c7420fb977fe5c337f2c917839a6e982a47902 (diff) | |
parent | 9fb0290d914e63512f6e3fc719b6b0249d787656 (diff) | |
download | gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.gz gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.bz2 gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.lz gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.xz gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.zst gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.zip |
Merge branch 'gnome-2-30' into express2
Diffstat (limited to 'mail/e-mail-browser.c')
-rw-r--r-- | mail/e-mail-browser.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index aaf4f789d6..cd7ecd32fd 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -280,11 +280,10 @@ close_on_idle_cb (gpointer browser) } static void -mail_browser_message_list_built_cb (EMailBrowser *browser, MessageList *message_list) +mail_browser_message_list_built_cb (EMailBrowser *browser, + MessageList *message_list) { - g_return_if_fail (browser != NULL); g_return_if_fail (E_IS_MAIL_BROWSER (browser)); - g_return_if_fail (message_list != NULL); g_return_if_fail (IS_MESSAGE_LIST (message_list)); if (!message_list_count (message_list)) @@ -446,7 +445,8 @@ mail_browser_dispose (GObject *object) } if (priv->message_list != NULL) { - g_object_unref (priv->message_list); + /* This will cancel a regen operation. */ + gtk_widget_destroy (priv->message_list); priv->message_list = NULL; } |