X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=2bd6b3e94c3948c8e8cb2ef23c70c68ad2f3a564;hp=da7f1f13b032280fdaca562a4c95080a1a889ffc;hb=01db4e94dcf1e9818000eb08c90bc3b09c3a5071;hpb=2f90f09d0a4913f415ebe33a0e3d5fe3ce586d57

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index da7f1f1..2bd6b3e 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -75,7 +75,27 @@ gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* na
 	
 	return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SIGNATURE, FALSE);
 }
+
+
+ModestTransportStoreProtocol modest_account_mgr_get_store_protocol (ModestAccountMgr *self, const gchar* name)
+{
+	ModestTransportStoreProtocol result = MODEST_PROTOCOL_STORE_POP; /* Arbitrary default */
 	
+	gchar *server_account_name = modest_account_mgr_get_string (self, name,
+							MODEST_ACCOUNT_STORE_ACCOUNT,
+							FALSE);
+	if (server_account_name) {
+		ModestServerAccountData* server_data = 
+			modest_account_mgr_get_server_account_data (self, server_account_name);
+		result = server_data->proto;
+			
+		modest_account_mgr_free_server_account_data (self, server_data);
+		
+		g_free (server_account_name);
+	}
+	
+	return result;
+}
 
 gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self, 
 	const gchar* account_name,
@@ -258,6 +278,29 @@ modest_server_account_set_password (ModestAccountMgr *self, const gchar* account
 	modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PASSWORD, 
 				       password, TRUE /* server account */);
 }
+
+	
+gchar*
+modest_server_account_get_password (ModestAccountMgr *self, const gchar* account_name)
+{
+	return modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_PASSWORD, 
+		TRUE /* server account */);	
+}
+
+gboolean
+modest_server_account_get_has_password (ModestAccountMgr *self, const gchar* account_name)
+{
+	gboolean result = FALSE;
+	gchar *password = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_PASSWORD, 
+		TRUE /* server account */);
+	if (password && strlen (password)) {
+		result = TRUE;
+	}
+	
+	g_free (password);
+	return result;
+}
+			 
 	
 gchar*
 modest_server_account_get_hostname (ModestAccountMgr *self, const gchar* account_name)
@@ -550,9 +593,7 @@ modest_account_mgr_set_default_account  (ModestAccountMgr *self, const gchar* ac
 	
 	conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
 
-	return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT,
-				       account, NULL);
-
+	return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, account, NULL);
 }
 
 gboolean
@@ -573,35 +614,56 @@ gint on_accounts_list_sort_by_title(gconstpointer a, gconstpointer b)
  	return g_utf8_collate((const gchar*)a, (const gchar*)b);
 }
 
-
-static void
-free_element (gpointer data, gpointer user_data)
+/** Get the first one, alphabetically, by title. */
+gchar* 
+modest_account_mgr_get_first_account_name (ModestAccountMgr *self)
 {
-	g_free (data);
-}
-
-gboolean
-modest_account_mgr_set_first_account_as_default  (ModestAccountMgr *self)
-{
-	gboolean result = FALSE;
+	const gchar* account_name = NULL;
 	GSList *account_names = modest_account_mgr_account_names (self, TRUE /* only enabled */);
 
 	/* Return TRUE if there is no account */
 	if (!account_names)
-		return TRUE;
-		
+		return NULL;
+
 	/* Get the first one, alphabetically, by title: */
-	GSList* list_sorted = g_slist_sort (account_names, 
-		on_accounts_list_sort_by_title);
-	if(list_sorted) {
-		const gchar* account_name = (const gchar*)list_sorted->data;
-		if (account_name) 
-			result = modest_account_mgr_set_default_account (self, account_name);
+	/* gchar *old_default = modest_account_mgr_get_default_account (self); */
+	GSList* list_sorted = g_slist_sort (account_names, on_accounts_list_sort_by_title);
+
+	GSList* iter = list_sorted;
+	gboolean found = FALSE;
+	while (iter && !found) {
+		account_name = (const gchar*)list_sorted->data;
+
+		if (account_name)
+			found = TRUE;
+
+		if (!found)
+			iter = g_slist_next (iter);
 	}
+
+	gchar* result = NULL;
+	if (account_name)
+		result = g_strdup (account_name);
+		
+	modest_account_mgr_free_account_names (account_names);
+	account_names = NULL;
+
+	return result;
+}
+
+gboolean
+modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
+{
+	gboolean result = FALSE;
 	
-	g_slist_foreach (account_names, free_element, NULL);
-	g_slist_free (account_names);
-	
+	gchar* account_name = modest_account_mgr_get_first_account_name(self);
+	if (account_name) {
+		result = modest_account_mgr_set_default_account (self, account_name);
+		g_free (account_name);
+	}
+	else
+		result = TRUE; /* If there are no accounts then it's not a failure. */
+
 	return result;
 }