X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgnome%2Fmodest-main-window.c;h=875620473a6dc521fd2f28638d6f9cfee9de12a5;hb=c62e34be3e5b43d9cf0213222653c8ca5da82d93;hp=475a097c07fa55fa36c3739689c59c5538f34b96;hpb=9d8738876f984ae854b0b3634f12f9fd426480e8;p=modest

diff --git a/src/gnome/modest-main-window.c b/src/gnome/modest-main-window.c
index 475a097..8756204 100644
--- a/src/gnome/modest-main-window.c
+++ b/src/gnome/modest-main-window.c
@@ -308,8 +308,10 @@ save_sizes (ModestMainWindow *self)
 
 
 static void
-on_connection_changed (TnyDevice *device, gboolean online, ModestMainWindow *self)
+on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self)
 {
+	const gboolean online = TRUE;
+
 	GtkWidget *icon;
 	const gchar *icon_name;
 	ModestMainWindowPrivate *priv;
@@ -332,7 +334,7 @@ on_connection_changed (TnyDevice *device, gboolean online, ModestMainWindow *sel
 	
 	/* If Modest has became online and the header view has a
 	   header selected then show it */
-	/* FIXME: there is a race condition if some account needs to
+	/* TODO: FIXME: there is a race condition if some account needs to
 	   ask the user for a password */
 
 /* 	if (online) { */
@@ -417,12 +419,14 @@ connect_signals (ModestMainWindow *self)
 			  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(modest_runtime_get_device()), "connection_changed",
-			  G_CALLBACK(on_connection_changed), self);
+	g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), "connecting-finished",
+			  G_CALLBACK(on_account_store_connecting_finished), self);
 	g_signal_connect (G_OBJECT(priv->online_toggle), "toggled",
 			  G_CALLBACK(on_online_toggle_toggled), self);
 
@@ -720,6 +724,7 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
 
 static void
 get_msg_callback (TnyFolder *folder, 
+		  gboolean cancelled,
 		  TnyMsg *msg, 
 		  GError **err, 
 		  gpointer user_data)
@@ -750,8 +755,6 @@ on_header_selected (ModestHeaderView *header_view,
 
 	folder = tny_header_get_folder (header);
 
-	g_print ("SI");
-
 	/* FIXME: do not use this directly. Use a mail operation
 	   instead in order to get progress info */
 	tny_folder_get_msg_async (folder,