From 1b8003c1768fa6a0d33a91f0637fc99fe0801ae8 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 21 Jul 2005 04:15:21 +0000 Subject: if we get a null default, then set "" on the entry. (emae_option_entry): 2005-07-21 Not Zed * em-account-editor.c (emae_option_entry): if we get a null default, then set "" on the entry. (emae_option_entry): set the default value on the url if it doesn't exist already. 2005-07-20 Not Zed * mail-send-recv.c (refresh_folders_desc, refresh_folders_get) (refresh_folders_got, refresh_folders_free, get_folders) (receive_update_got_folderinfo, receive_update_got_store): refresh all the folders manually and directly. * mail-folder-cache.c (setup_folder): propagate even -1 unread counts, they get ignored later. * em-composer-utils.c (emu_handle_receipt_message) (em_utils_handle_receipt): use getmessagex too, so we can always clear any error. * em-folder-view.c (emfv_message_selected_timeout) (emfv_list_done_message_selected): use getmessagex and do something meaninful with the error. * mail-ops.c (mail_get_messagex): added new get message which returns an exception. 2005-07-19 Not Zed * mail-tools.c (mail_tool_uri_to_folder): dont get the service connected, it will connect if it needs to. * mail-ops.c (get_folderinfo_get): * em-folder-utils.c (emft_copy_folders__copy) (emfu_delete_folders): * em-folder-tree.c (emft_get_folder_info__get): Always request subscribed folders, if the backend doesn't implement it it will ignore it. 2005-07-13 Not Zed * mail-send-recv.c (mail_autoreceive_init, auto_online): listen to session online events, and if we are online, trigger an auto-receive of all auto-check accounts. 2005-07-11 Not Zed * mail-send-recv.c (auto_account_commit): force an update immediately if we're setting up the timeout to start with. * em-folder-tree-model.c (em_folder_tree_model_set_unread_count): noop if the unread count < 0. (em_folder_tree_model_set_folder_info): only set the unread count if we actually have one. * em-folder-tree.c (emft_tree_row_expanded): get the folder list 'fast'. * mail-ops.c (get_folderinfo_get): get the folder list 'fast'. svn path=/trunk/; revision=29822 --- mail/em-folder-tree-model.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mail/em-folder-tree-model.c') diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 266928eb5c..1a622cc9eb 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -443,7 +443,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite /* HACK: if we have the folder, and its the outbox folder, we need the total count, not unread */ /* This is duplicated in mail-folder-cache too, should perhaps be functionised */ - unread = fi->unread == -1 ? 0 : fi->unread; + unread = fi->unread; if (mail_note_get_folder_from_uri(fi->uri, &folder) && folder) { if (folder == mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX)) { int total; @@ -482,11 +482,13 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite COL_POINTER_CAMEL_STORE, si->store, COL_STRING_FULL_NAME, fi->full_name, COL_STRING_URI, fi->uri, - COL_UINT_UNREAD, unread, COL_UINT_FLAGS, flags, COL_BOOL_IS_STORE, FALSE, COL_BOOL_LOAD_SUBDIRS, load, -1); + + if (unread != ~0) + gtk_tree_store_set ((GtkTreeStore *) model, iter, COL_UINT_UNREAD, unread, -1); if (load) { /* create a placeholder node for our subfolders... */ @@ -1103,7 +1105,7 @@ em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *sto u(printf("set unread count %p '%s' %d\n", store, full, unread)); if (unread < 0) - unread = 0; + return; if (!(si = g_hash_table_lookup (model->store_hash, store))) { u(printf(" can't find store\n")); -- cgit