aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-10-28 17:25:03 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-10-28 17:25:03 +0800
commitb89a9ae09da810024655a87e5c466c2b171a47b4 (patch)
tree34548f0419b32a35aafa7ba423f20b36f2635c38 /mail
parentf43bc7ed11621ab41bbae861c81d4ddb8b5bb0ab (diff)
downloadgsoc2013-evolution-b89a9ae09da810024655a87e5c466c2b171a47b4.tar
gsoc2013-evolution-b89a9ae09da810024655a87e5c466c2b171a47b4.tar.gz
gsoc2013-evolution-b89a9ae09da810024655a87e5c466c2b171a47b4.tar.bz2
gsoc2013-evolution-b89a9ae09da810024655a87e5c466c2b171a47b4.tar.lz
gsoc2013-evolution-b89a9ae09da810024655a87e5c466c2b171a47b4.tar.xz
gsoc2013-evolution-b89a9ae09da810024655a87e5c466c2b171a47b4.tar.zst
gsoc2013-evolution-b89a9ae09da810024655a87e5c466c2b171a47b4.zip
Fix a regression caused by the Forward button feature.
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-reader.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index a81352ce12..ff7cd9fd47 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2363,18 +2363,6 @@ e_mail_reader_init (EMailReader *reader)
web_view = E_WEB_VIEW (EM_FORMAT_HTML (html_display)->html);
- gtk_action_group_add_actions (
- action_group, mail_reader_entries,
- G_N_ELEMENTS (mail_reader_entries), reader);
- e_action_group_add_popup_actions (
- action_group, mail_reader_popup_entries,
- G_N_ELEMENTS (mail_reader_popup_entries));
- gtk_action_group_add_toggle_actions (
- action_group, mail_reader_toggle_entries,
- G_N_ELEMENTS (mail_reader_toggle_entries), reader);
-
- mail_reader_init_charset_actions (reader);
-
/* The "mail-forward" action is special: it uses a GtkMenuToolButton
* for its toolbar item type. So we have to create it separately. */
@@ -2392,6 +2380,20 @@ e_mail_reader_init (EMailReader *reader)
gtk_action_group_add_action_with_accel (
action_group, GTK_ACTION (menu_tool_action), "<Control>f");
+ /* Add the other actions the normal way. */
+
+ gtk_action_group_add_actions (
+ action_group, mail_reader_entries,
+ G_N_ELEMENTS (mail_reader_entries), reader);
+ e_action_group_add_popup_actions (
+ action_group, mail_reader_popup_entries,
+ G_N_ELEMENTS (mail_reader_popup_entries));
+ gtk_action_group_add_toggle_actions (
+ action_group, mail_reader_toggle_entries,
+ G_N_ELEMENTS (mail_reader_toggle_entries), reader);
+
+ mail_reader_init_charset_actions (reader);
+
/* Bind GObject properties to GConf keys. */
bridge = gconf_bridge_get ();