aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorRadek Doulik <rodo@src.gnome.org>2003-11-13 05:13:05 +0800
committerRadek Doulik <rodo@src.gnome.org>2003-11-13 05:13:05 +0800
commit8e1251fa17b522d0539a8fcfb7463ba8cef1b31a (patch)
tree9be2f3a8a184446361a8c72879947f7a6e7d8d75 /shell
parent8187001a14295b4b64cc3e973fb1ab1e551133f2 (diff)
downloadgsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.gz
gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.zst
gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.zip
merged spam filtering branch
svn path=/trunk/; revision=23302
Diffstat (limited to 'shell')
-rw-r--r--shell/e-local-storage.c1
-rw-r--r--shell/e-shortcuts.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 8ce9f87189..01009cb805 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -182,6 +182,7 @@ setup_stock_folders (ELocalStorage *local_storage)
setup_folder_as_stock (local_storage, "/Sent", _("Sent"), NULL);
setup_folder_as_stock (local_storage, "/Tasks", _("Tasks"), NULL);
setup_folder_as_stock (local_storage, "/Trash", _("Trash"), NULL);
+ setup_folder_as_stock (local_storage, "/Spam", _("Spam"), NULL);
}
static gboolean
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index 697f50fe90..2672dc251d 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -27,6 +27,7 @@
<group title="Evolution shortcuts">
<item name="Inbox" type="mail">evolution:/local/Inbox</item>
<item name="Trash" type="vtrash">evolution:/local/Trash</item>
+ <item name="Spam" type="vspam">evolution:/local/Spam</item>
<item name="Calendar" type="calendar">evolution:/local/Calendar</item>
</group>