Re-enable items in the ConversationEmail menu.

Using "msg" for the ConversationMessage context menu action namespace
stopped ConversationEmail's actions being found, so use "eml" instead.

* src/client/conversation-viewer/conversation-email.vala
  (ConversationEmail::ConversationEmail): Use a the "eml" namespace for
  email actions to avoid namespace collision.

* ui/conversation-email-menus.ui: Chase namespace change.
This commit is contained in:
Michael James Gratton 2016-05-13 11:31:30 +10:00
parent 0544a7b93c
commit 5c88e07af6
2 changed files with 12 additions and 12 deletions

View file

@ -203,7 +203,7 @@ public class ConversationEmail : Gtk.Box {
add_action(ACTION_VIEW_SOURCE).activate.connect(() => {
view_source(this.email);
});
insert_action_group("msg", message_actions);
insert_action_group("eml", message_actions);
Geary.RFC822.Message message;
try {

View file

@ -5,39 +5,39 @@
<section>
<item>
<attribute name="label" translatable="yes">_Reply</attribute>
<attribute name="action">msg.reply_sender</attribute>
<attribute name="action">eml.reply_sender</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Reply to _All</attribute>
<attribute name="action">msg.reply_all</attribute>
<attribute name="action">eml.reply_all</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Forward</attribute>
<attribute name="action">msg.forward</attribute>
<attribute name="action">eml.forward</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">_Mark Read</attribute>
<attribute name="action">msg.mark_read</attribute>
<attribute name="action">eml.mark_read</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Mark Unread</attribute>
<attribute name="action">msg.mark_unread</attribute>
<attribute name="action">eml.mark_unread</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Mark Unread From _Here</attribute>
<attribute name="action">msg.mark_unread_down</attribute>
<attribute name="action">eml.mark_unread_down</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">_Print...</attribute>
<attribute name="action">msg.print</attribute>
<attribute name="action">eml.print</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_View Source</attribute>
<attribute name="action">msg.view_source</attribute>
<attribute name="action">eml.view_source</attribute>
</item>
</section>
</menu>
@ -45,17 +45,17 @@
<section>
<item>
<attribute name="label" translatable="yes">_Open</attribute>
<attribute name="action">msg.open_attachments</attribute>
<attribute name="action">eml.open_attachments</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">_Save</attribute>
<attribute name="action">msg.save_attachments</attribute>
<attribute name="action">eml.save_attachments</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Save All</attribute>
<attribute name="action">msg.save_all_attachments</attribute>
<attribute name="action">eml.save_all_attachments</attribute>
</item>
</section>
</menu>