Integrating support for addressbook 4.0

[modest] / src / gnome / modest-main-window.c

diff --git a/src/gnome/modest-main-window.c b/src/gnome/modest-main-window.c
index e38e983..f9ec0ed 100644 (file)
--- a/src/gnome/modest-main-window.c
+++ b/src/gnome/modest-main-window.c
@@ -132,7 +132,7 @@ static const GtkActionEntry modest_folder_view_action_entries [] = {
        { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL,  G_CALLBACK (modest_ui_actions_on_paste)},
        { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) },
        { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_search_messages) },
-       { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) },
+       { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_csm_help) },
 };
 
 static const GtkActionEntry modest_header_view_action_entries [] = {
@@ -415,12 +415,6 @@ connect_signals (ModestMainWindow *self)
        g_signal_connect (G_OBJECT(priv->msg_preview), "recpt-activated",
                          G_CALLBACK(modest_ui_actions_on_msg_recpt_activated), self);
 
-       /* Account store */
-       /* Emmitted by our TnyAccountStore::get_password_func() implementation,
-        * This is not a normal part of tinymail: */
-       g_signal_connect (G_OBJECT (modest_runtime_get_account_store()), "password_requested",
-                         G_CALLBACK (modest_ui_actions_on_password_requested), self);
-       
        /* Device */
        g_signal_connect (G_OBJECT(priv->online_toggle), "toggled",
                          G_CALLBACK(on_online_toggle_toggled), self);