aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-06-26 23:05:58 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-06-26 23:05:58 +0800
commitce37d56d0b42f88549e45920df29a06fdce3ce95 (patch)
treea965088e5d68e76d0143fa84bf08efd8a8956942 /ui
parentf0cf88bc99a458193f2c16a3ed346c20f6a5fd1a (diff)
downloadgsoc2013-evolution-ce37d56d0b42f88549e45920df29a06fdce3ce95.tar
gsoc2013-evolution-ce37d56d0b42f88549e45920df29a06fdce3ce95.tar.gz
gsoc2013-evolution-ce37d56d0b42f88549e45920df29a06fdce3ce95.tar.bz2
gsoc2013-evolution-ce37d56d0b42f88549e45920df29a06fdce3ce95.tar.lz
gsoc2013-evolution-ce37d56d0b42f88549e45920df29a06fdce3ce95.tar.xz
gsoc2013-evolution-ce37d56d0b42f88549e45920df29a06fdce3ce95.tar.zst
gsoc2013-evolution-ce37d56d0b42f88549e45920df29a06fdce3ce95.zip
Get the "mail-to-task" plugin working again.
This one was more challenging. It exposed some flaws in the new shell design and in EPluginUI, which is good because they're fixed now.
Diffstat (limited to 'ui')
-rw-r--r--ui/evolution-mail-reader.ui2
-rw-r--r--ui/evolution-mail.ui6
2 files changed, 5 insertions, 3 deletions
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index 1000fe5e2c..374db8f8e4 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -102,6 +102,8 @@
<menuitem action='mail-search-folder-from-recipients'/>
<menuitem action='mail-search-folder-from-mailing-list'/>
</menu>
+ <separator/>
+ <placeholder name='mail-message-actions'/>
</menu>
</placeholder>
</menubar>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index a73cfd0a18..c676cf524e 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -37,6 +37,7 @@
<menu action='mail-folder-menu'>
<menuitem action='mail-folder-new'/>
<menuitem action='mail-tools-subscriptions'/>
+ <menuitem action='mail-folder-unsubscribe'/>
<separator/>
<menuitem action='mail-folder-copy'/>
<menuitem action='mail-folder-move'/>
@@ -51,11 +52,8 @@
<menuitem action='mail-folder-refresh'/>
<menuitem action='mail-folder-delete'/>
<separator/>
- <menuitem action='mail-folder-unsubscribe'/>
- <separator/>
<menuitem action='mail-folder-properties'/>
</menu>
- <menu action='mail-message-menu'/>
</placeholder>
<menu action='search-menu'>
<placeholder name='search-actions'>
@@ -110,6 +108,8 @@
<separator/>
<menuitem action='mail-label-new'/>
</menu>
+ <separator/>
+ <placeholder name='mail-message-popup-actions'/>
</popup>
<popup name='mail-search-options'>
<menuitem action='mail-search-subject-or-sender-contains'/>