#include <tny-camel-pop-store-account.h>
#include <tny-folder-stats.h>
#include <string.h>
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
#include <hildon-widgets/hildon-file-system-info.h>
#else
#include <hildon/hildon-file-system-info.h>
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) {
/* 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);
/***********************/
TnyAccount *result = modest_tny_account_new_from_server_account (
account_mgr, account_data);
-
+
modest_account_mgr_free_server_account_data (account_mgr, account_data);
return result;
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;
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;
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
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,
void modest_tny_account_set_parent_modest_account_name_for_server_account (TnyAccount *self, const gchar* parent_modest_acount_name)
{
g_object_set_data_full (G_OBJECT(self), "modest_account",
- (gpointer*) g_strdup (parent_modest_acount_name), g_free);
+ (gpointer) g_strdup (parent_modest_acount_name), g_free);
}