callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted jeff's patch for the subscribed hint.

Browse Source 
2005-02-04  Not Zed  <NotZed@Ximian.com>

        * em-subscribe-editor.c (sub_folderinfo_get): reverted jeff's
        patch for the subscribed hint.

        ** See bug #65329

        * em-folder-properties.c (emfp_dialog_got_folder): translate
        local-store special folders.

svn path=/trunk/; revision=28699
This commit is contained in:
Not Zed
2005-02-04 04:14:22 +00:00
committed by Michael Zucci
parent 9526b53ea4
commit f0d49c3e04
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mail/ChangeLog
View File

@ -1,5 +1,13 @@
2005-02-04 Not Zed <NotZed@Ximian.com>
* em-subscribe-editor.c (sub_folderinfo_get): reverted jeff's
patch for the subscribed hint.
** See bug #65329
* em-folder-properties.c (emfp_dialog_got_folder): translate
local-store special folders.
* mail-session.c (alert_user, do_user_message): if we aren't
waiting for cancel, then don't worry about waiting on the reply
port, otherwise we could block when we don't need to, if there is

10
mail/em-folder-properties.c
View File

@ -45,6 +45,7 @@
#include "em-folder-properties.h"
#include "em-config.h"
#include "mail-component.h"
#include "mail-ops.h"
#include "mail-mt.h"
#include "mail-vfolder.h"
@ -238,7 +239,14 @@ emfp_dialog_got_folder (char *uri, CamelFolder *folder, void *data)
camel_object_get (folder, NULL, CAMEL_FOLDER_PROPERTIES, &prop_data->properties, CAMEL_FOLDER_NAME, &prop_data->name,
CAMEL_FOLDER_TOTAL, &prop_data->total, CAMEL_FOLDER_UNREAD, &prop_data->unread, NULL);
emfp_items[EMFP_FOLDER_SECTION].label = prop_data->name;
if (folder->parent_store == mail_component_peek_local_store(NULL)
&& (!strcmp(prop_data->name, "Drafts")
|| !strcmp(prop_data->name, "Inbox")
|| !strcmp(prop_data->name, "Outbox")
|| !strcmp(prop_data->name, "Sent")))
emfp_items[EMFP_FOLDER_SECTION].label = _(prop_data->name);
else
emfp_items[EMFP_FOLDER_SECTION].label = prop_data->name;
count = g_slist_length (prop_data->properties);

2
mail/em-subscribe-editor.c
View File

@ -340,7 +340,7 @@ sub_folderinfo_get (struct _mail_msg *mm)
if (m->seq == m->sub->seq) {
camel_operation_register(mm->cancel);
m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:"", CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_INFO, &mm->ex);
m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:"", CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex);
camel_operation_unregister(mm->cancel);
}
}