X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgnome%2Fmodest-main-window.c;h=cf2bed425179621747ad6cdfa2512002f97df61c;hb=b69345f02a040bdf9148f53f81f1e2d16c7379f3;hp=e38e9839a72de3423b8c2ea718bc5825f9c0f14b;hpb=19268972c11b8c0db2becf9ea7c91f2a7e6e1f90;p=modest

diff --git a/src/gnome/modest-main-window.c b/src/gnome/modest-main-window.c
index e38e983..cf2bed4 100644
--- a/src/gnome/modest-main-window.c
+++ b/src/gnome/modest-main-window.c
@@ -45,7 +45,7 @@
 #include "modest-main-window-ui.h"
 #include "modest-main-window-ui-dimming.h"
 #include "modest-account-mgr.h"
-#include "modest-conf.h"
+#include "modest-defs.h"
 #include <modest-tny-msg.h>
 #include "modest-mail-operation.h"
 #include "modest-icon-names.h"
@@ -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);
@@ -902,6 +896,8 @@ save_state (ModestWindow *window)
 				   MODEST_CONF_MAIN_WINDOW_KEY);
 	modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), 
 				   MODEST_CONF_MAIN_PANED_KEY);
+	modest_widget_memory_save (conf, G_OBJECT(priv->msg_paned), 
+				   MODEST_CONF_MSG_PANED_KEY);
 	modest_widget_memory_save (conf, G_OBJECT(priv->folder_view), 
 				   MODEST_CONF_FOLDER_VIEW_KEY);
 }