aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMichael Zucci <zucchi@src.gnome.org>2001-10-17 04:51:32 +0800
committerMichael Zucci <zucchi@src.gnome.org>2001-10-17 04:51:32 +0800
commit7abc9f6ba2e03dfed3be01bc4f2376506ed9aae6 (patch)
tree1fd1501cc8495d1bdb11de50860455047928d518 /mail
parenta009ea9f2d21e7d851fe0952a75e2183cf1ea74d (diff)
downloadgsoc2013-evolution-7abc9f6ba2e03dfed3be01bc4f2376506ed9aae6.tar.gz
gsoc2013-evolution-7abc9f6ba2e03dfed3be01bc4f2376506ed9aae6.tar.zst
gsoc2013-evolution-7abc9f6ba2e03dfed3be01bc4f2376506ed9aae6.zip
folder-browser.c: (folder_browser_set_message_preview): Return do nothing
folder-browser.c: (folder_browser_set_message_preview): Return do nothing if we're destroyed (message_list == NULL). (folder_browser_search_query_changed): " (folder_browser_toggle_preview): " (folder_browser_toggle_threads): " (folder_browser_toggle_hide_deleted): " (folder_browser_set_message_display_style): " (folder_browser_charset_changed): " All for #12613. svn path=/trunk/; revision=13703
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/folder-browser.c22
2 files changed, 24 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4b8eb79b34..74ef4d4191 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -30,6 +30,14 @@
(folder_changed_main): Remove old async event handling stuff.
(FOLDER_BROWSER_LOCK/UNLOCK): Removed.
(FolderBrowserPrivate): Removed too, sigh.
+ (folder_browser_set_message_preview): Return do nothing if we're
+ destroyed (message_list == NULL).
+ (folder_browser_search_query_changed): "
+ (folder_browser_toggle_preview): "
+ (folder_browser_toggle_threads): "
+ (folder_browser_toggle_hide_deleted): "
+ (folder_browser_set_message_display_style): "
+ (folder_browser_charset_changed): " All for #12613.
* mail-mt.c (mail_async_event_new, mail_async_event_emit,
mail_async_event_destroy): New functions to handle async events.
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 455542808f..8e9b7807f7 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1000,7 +1000,8 @@ static gboolean do_message_selected(FolderBrowser *fb);
void
folder_browser_set_message_preview (FolderBrowser *folder_browser, gboolean show_message_preview)
{
- if (folder_browser->preview_shown == show_message_preview)
+ if (folder_browser->preview_shown == show_message_preview
+ || folder_browser->message_list == NULL)
return;
folder_browser->preview_shown = show_message_preview;
@@ -1101,6 +1102,9 @@ static void
folder_browser_search_query_changed (ESearchBar *esb, FolderBrowser *fb)
{
char *search_word;
+
+ if (fb->message_list == NULL)
+ return;
d(printf("query changed\n"));
@@ -1124,7 +1128,8 @@ folder_browser_toggle_preview (BonoboUIComponent *component,
{
FolderBrowser *fb = user_data;
- if (type != Bonobo_UIComponent_STATE_CHANGED)
+ if (type != Bonobo_UIComponent_STATE_CHANGED
+ || fb->message_list == NULL)
return;
mail_config_set_show_preview (fb->uri, atoi (state));
@@ -1140,7 +1145,8 @@ folder_browser_toggle_threads (BonoboUIComponent *component,
{
FolderBrowser *fb = user_data;
- if (type != Bonobo_UIComponent_STATE_CHANGED)
+ if (type != Bonobo_UIComponent_STATE_CHANGED
+ || fb->message_list == NULL)
return;
mail_config_set_thread_list (fb->uri, atoi (state));
@@ -1156,7 +1162,8 @@ folder_browser_toggle_hide_deleted (BonoboUIComponent *component,
{
FolderBrowser *fb = user_data;
- if (type != Bonobo_UIComponent_STATE_CHANGED)
+ if (type != Bonobo_UIComponent_STATE_CHANGED
+ || fb->message_list == NULL)
return;
if (!(fb->folder && (fb->folder->folder_flags & CAMEL_FOLDER_IS_TRASH)))
@@ -1175,7 +1182,9 @@ folder_browser_set_message_display_style (BonoboUIComponent *component
FolderBrowser *fb = user_data;
int i;
- if (type != Bonobo_UIComponent_STATE_CHANGED || atoi(state) == 0)
+ if (type != Bonobo_UIComponent_STATE_CHANGED
+ || atoi(state) == 0
+ || fb->message_list == NULL)
return;
for (i = 0; i < MAIL_CONFIG_DISPLAY_MAX; i++) {
@@ -1200,7 +1209,8 @@ folder_browser_charset_changed (BonoboUIComponent *component,
FolderBrowser *fb = FOLDER_BROWSER (user_data);
const char *charset;
- if (type != Bonobo_UIComponent_STATE_CHANGED)
+ if (type != Bonobo_UIComponent_STATE_CHANGED
+ || fb->message_list == NULL)
return;
if (atoi (state)) {