diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/message-list.c | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 5b502ecf33..5a29bf07fe 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2001-11-02 Christopher James Lahey <clahey@ximian.com> + + * message-list.c (ml_tree_value_at): Use GINT_TO_POINTER here for + platforms where simply casting an int to void * won't work. + (build_flat_diff, main_folder_changed): Call + e_tree_model_pre_change here. + 2001-11-02 <NotZed@Ximian.com> * message-browser.c (message_browser_message_list_built): diff --git a/mail/message-list.c b/mail/message-list.c index bcc6c22ea6..bfa27783cb 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -839,7 +839,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) child = e_tree_model_node_get_first_child(etm, path); if (child && !e_tree_node_is_expanded(message_list->tree, path) && (msg_info->flags & CAMEL_MESSAGE_SEEN)) { - return (void *)subtree_unread(message_list, child); + return GINT_TO_POINTER (subtree_unread (message_list, child)); } return GINT_TO_POINTER (!(msg_info->flags & CAMEL_MESSAGE_SEEN)); @@ -1795,8 +1795,10 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes) d(printf("Changing messages to view:\n")); for (i = 0; i < changes->uid_changed->len; i++) { ETreePath *node = g_hash_table_lookup (ml->uid_nodemap, changes->uid_changed->pdata[i]); - if (node) + if (node) { + e_tree_model_pre_change (ml->model); e_tree_model_node_data_changed (ml->model, node); + } } #ifdef TIMEIT @@ -1856,8 +1858,10 @@ main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data) if (changes->uid_added->len == 0 && changes->uid_removed->len == 0 && changes->uid_changed->len < 100) { for (i = 0; i < changes->uid_changed->len; i++) { ETreePath node = g_hash_table_lookup (ml->uid_nodemap, changes->uid_changed->pdata[i]); - if (node) + if (node) { + e_tree_model_pre_change (ml->model); e_tree_model_node_data_changed (ml->model, node); + } } camel_folder_change_info_free (changes); |