From: Jose Dapena Paz <jdapena@igalia.com>
Date: Wed, 25 Feb 2009 09:33:05 +0000 (+0000)
Subject: Drop new message in accounts window app menu
X-Git-Tag: git_migration_finished~486
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=6e705c69ddf4d255d5403497e43c737d30b272b3

Drop new message in accounts window app menu

pmo-trunk-r7672
---

diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c
index 474553a..3e40bc9 100644
--- a/src/hildon2/modest-accounts-window.c
+++ b/src/hildon2/modest-accounts-window.c
@@ -232,6 +232,9 @@ modest_accounts_window_new (void)
 	GdkPixbuf *window_icon;
 	GdkPixbuf *new_message_pixbuf;
 	GtkWidget *action_area_box;
+	guint accel_key;
+	GdkModifierType accel_mods;
+	GtkAccelGroup *accel_group;
 
 	self  = MODEST_ACCOUNTS_WINDOW(g_object_new(MODEST_TYPE_ACCOUNTS_WINDOW, NULL));
 	priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self);
@@ -256,7 +259,6 @@ modest_accounts_window_new (void)
 	gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0);
 	gtk_widget_show_all (priv->new_message_button);
 	hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->account_view), TRUE);
-	
 
 	setup_menu (self);
 
@@ -300,6 +302,11 @@ modest_accounts_window_new (void)
 
 	row_count_changed (self);
 
+	accel_group = gtk_accel_group_new ();
+	gtk_accelerator_parse ("<Control>n", &accel_key, &accel_mods);
+	gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group,
+				    accel_key, accel_mods, 0);
+	gtk_window_add_accel_group (GTK_WINDOW (self), accel_group);
 
 	return MODEST_WINDOW(self);
 }
@@ -340,9 +347,6 @@ setup_menu (ModestAccountsWindow *self)
 	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_settings), 
 					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
-					   APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
-					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
 }