aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2005-02-04 12:14:22 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-02-04 12:14:22 +0800
commitf0d49c3e044bca5eafb11af522f65a3eaea8bb4e (patch)
tree548e7e69e9e8200c78c15d0d40d991548383a371 /mail
parent9526b53ea4fc6cd80e0de9f9c70a3c35b33e17e7 (diff)
downloadgsoc2013-evolution-f0d49c3e044bca5eafb11af522f65a3eaea8bb4e.tar
gsoc2013-evolution-f0d49c3e044bca5eafb11af522f65a3eaea8bb4e.tar.gz
gsoc2013-evolution-f0d49c3e044bca5eafb11af522f65a3eaea8bb4e.tar.bz2
gsoc2013-evolution-f0d49c3e044bca5eafb11af522f65a3eaea8bb4e.tar.lz
gsoc2013-evolution-f0d49c3e044bca5eafb11af522f65a3eaea8bb4e.tar.xz
gsoc2013-evolution-f0d49c3e044bca5eafb11af522f65a3eaea8bb4e.tar.zst
gsoc2013-evolution-f0d49c3e044bca5eafb11af522f65a3eaea8bb4e.zip
reverted jeff's patch for the subscribed hint.
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
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-folder-properties.c10
-rw-r--r--mail/em-subscribe-editor.c2
3 files changed, 18 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 51b1b34cfe..b3214b4a98 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -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
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 90c56cbfb6..e4e50b8aeb 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -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);
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 8147c397a5..92588c76f9 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -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);
}
}