X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=a2f4b654bddffda9cb64a0ccfb05481cd0c561c2;hb=5065a8831bafc9d6e1d9d2d5f6083f99b810a4ea;hp=c3c6614a6932d6ed30bd80b7e8f7ad936f2da8aa;hpb=82a238a17717bc6270221ae6d8c0eb87a0085361;p=modest

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index c3c6614..a2f4b65 100644
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -79,13 +79,15 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 			MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", 
 			modest_account_name);
 		
-		local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
-									account_id);
+		local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
+									     MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+									     account_id);
 		g_free (account_id);
 	} else {
 		/* Other local folders are all in one on-disk directory: */
-		local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
-										MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
+		local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
+									     MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+									     MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
 	}
 	
 	if (!local_account) {
@@ -322,7 +324,7 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
 	/* FIXME: for debugging. 
 	 * Let's keep this because it is very useful for debugging. */
 	url = tny_account_get_url_string (TNY_ACCOUNT(tny_account));
- 	printf ("DEBUG %s:\n  account-url: %s\n", __FUNCTION__, url);
+    printf ("DEBUG %s:\n  account-url: %s\n", __FUNCTION__, url);
 	g_free (url);
 	/***********************/
 	
@@ -429,7 +431,7 @@ on_modest_file_system_info(HildonFileSystemInfoHandle *handle,
 	TnyAccount *account = TNY_ACCOUNT (data);
 	
 	if (error) {
-		printf ("  DEBUG: %s: error=%s\n", __FUNCTION__, error->message);
+/* 		printf ("  DEBUG: %s: error=%s\n", __FUNCTION__, error->message); */
 	}
 	
 	const gchar *display_name = NULL;
@@ -448,8 +450,7 @@ TnyAccount*
 modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, const gchar* location_filepath)
 {
 	/* Make sure that the directories exist: */
-	if (location_filepath == NULL) /* Only for the special local folders account, not for the memory card. */
-		modest_init_local_folders ();
+	modest_init_local_folders (location_filepath);
 
 	TnyStoreAccount *tny_account;
 	CamelURL *url;
@@ -485,7 +486,7 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
 	url_string = camel_url_to_string (url, 0);
 	
 	tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
-	printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string);
+/* 	printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string); */
 
 	/* TODO: Use a more generic way of identifying memory card paths, 
 	 * and of marking accounts as memory card accounts, maybe
@@ -580,7 +581,7 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
 	camel_url_free (url);
 	
 	tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
-	printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string);
+/* 	printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string); */
 	g_free (url_string);
 
 	/* This text should never been seen,