diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 3 | ||||
| -rw-r--r-- | mail/message-list.c | 8 |
3 files changed, 16 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 549257c922..6d87c0fd40 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,11 @@ 2004-01-05 Jeffrey Stedfast <fejj@ximian.com> + * em-folder-browser.c (emfb_list_message_selected): Check that the + folder isn't NULL (ie. no folder is selected). Fixes bug #52207. + + * message-list.c (message_list_set_folder): Remove the + cursor-activated idle callback. + * mail-send-recv.c (build_dialog): Set the send/recv dialog to non-modal. Fixes bug #50127. diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 50ea24749c..23abdc7d93 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -450,6 +450,9 @@ emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *e { EMFolderView *emfv = (EMFolderView *) emfb; + if (emfv->folder == NULL) + return; + camel_object_meta_set (emfv->folder, "evolution:selected_uid", uid); camel_object_state_write (emfv->folder); } diff --git a/mail/message-list.c b/mail/message-list.c index 02ebc4a853..a1960d9293 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2526,6 +2526,12 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const c camel_exception_init (&ex); + /* remove the cursor activate idle handler */ + if (message_list->idle_id != 0) { + g_source_remove (message_list->idle_id); + message_list->idle_id = 0; + } + /* cancel any outstanding regeneration requests */ if (message_list->regen) { GList *l = message_list->regen; @@ -2616,7 +2622,7 @@ on_cursor_activated_idle (gpointer data) MessageList *message_list = data; ESelectionModel *esm = e_tree_get_selection_model (message_list->tree); int selected = e_selection_model_selected_count (esm); - + if (selected == 1 && message_list->cursor_uid) { d(printf ("emitting cursor changed signal, for uid %s\n", message_list->cursor_uid)); g_signal_emit (message_list, message_list_signals[MESSAGE_SELECTED], 0, message_list->cursor_uid); |