X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=070f3a2aa52648f2a992cd4e0aee2ddc6d520939;hb=f3a205f8da67bf8d29b652c6deca0f872e48c051;hp=2ea2cb5479c2658e539590adaa43af80fec2d5f3;hpb=3382c12d1e642af8871ca0a8b95676254f19e574;p=modest diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index 2ea2cb5..070f3a2 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -74,21 +74,24 @@ modest_tny_account_get_special_folder (TnyAccount *account, if (special_type == TNY_FOLDER_TYPE_OUTBOX) { const gchar *modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - g_assert (modest_account_name); - - gchar *account_id = g_strdup_printf ( - MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", - modest_account_name); - local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(), - MODEST_TNY_ACCOUNT_STORE_QUERY_ID, - account_id); - if (!local_account) { - g_printerr ("modest: %s: modest_tny_account_store_get_tny_account_by(ID) returned NULL for %s\n", __FUNCTION__, account_id); - return NULL; + if (modest_account_name) { + gchar *account_id = g_strdup_printf ( + MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", + modest_account_name); + + local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(), + MODEST_TNY_ACCOUNT_STORE_QUERY_ID, + account_id); + if (!local_account) { + g_printerr ("modest: %s: modest_tny_account_store_get_tny_account_by(ID) returned NULL for %s\n", __FUNCTION__, account_id); + return NULL; + } + + g_free (account_id); + } else { + g_warning ("%s: modest_account_name was NULL.", __FUNCTION__); } - - 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 (modest_runtime_get_account_store(), @@ -126,12 +129,15 @@ modest_tny_account_get_special_folder (TnyAccount *account, while (!tny_iterator_is_done (iter)) { TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter)); - if (modest_tny_folder_get_local_folder_type (folder) == special_type) { - special_folder = folder; - break; - } + if (folder) { + if (modest_tny_folder_get_local_or_mmc_folder_type (folder) == special_type) { + special_folder = folder; + break; /* Leaving a ref for the special_folder return value. */ + } - g_object_unref (G_OBJECT(folder)); + g_object_unref (G_OBJECT(folder)); + } + tny_iterator_next (iter); } @@ -167,12 +173,10 @@ on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, g * because tinymail does not guarantee that this signal handler will be called * in the main thread. */ - /* TODO: Commented out (and setting offline instead), because this causes hangs, probably related to + /* TODO: Commented out, because this causes hangs, probably related to * our use of mainloops: * modest_platform_connect_and_wait (NULL); */ - TnyDevice *device = modest_runtime_get_device (); - tny_device_force_offline (device); } else if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) { printf ("DEBUG: %s: Connection broken. Forcing TnyDevice offline.\n", __FUNCTION__); @@ -487,19 +491,20 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar modest_account_mgr_free_account_data (account_mgr, account_data); return NULL; } - + + + /* This name is what shows up in the folder view -- so for some POP/IMAP/... server + * account, we set its name to the account of which it is part. */ + + if (account_data->display_name) + tny_account_set_name (tny_account, account_data->display_name); + tny_account_set_forget_pass_func (tny_account, forget_pass_func ? forget_pass_func : forget_pass_dummy); tny_account_set_pass_func (tny_account, get_pass_func ? get_pass_func: get_pass_dummy); - /* This name is what shows up in the folder view -- so for some POP/IMAP/... server - * account, we set its name to the account of which it is part. */ - - if (account_data->display_name) - tny_account_set_name (tny_account, account_data->display_name); - modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name); modest_account_mgr_free_account_data (account_mgr, account_data); @@ -731,6 +736,8 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac return NULL; } + printf ("DEBUG: %s: Setting session for account: session=%p\n", + __FUNCTION__, session); tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session); /* Make sure that the paths exists on-disk so that TnyCamelStoreAccount can @@ -781,9 +788,12 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac typedef gint (*TnyStatsFunc) (TnyFolderStats *stats); +#define TASK_GET_ALL_COUNT 0 +#define TASK_GET_LOCAL_SIZE 1 +#define TASK_GET_FOLDER_COUNT 2 typedef struct _RecurseFoldersHelper { - TnyStatsFunc function; + gint task; guint sum; guint folders; } RecurseFoldersHelper; @@ -802,23 +812,22 @@ recurse_folders (TnyFolderStore *store, helper->folders += tny_list_get_length (folders); while (!tny_iterator_is_done (iter)) { - TnyFolderStats *stats; TnyFolder *folder; folder = TNY_FOLDER (tny_iterator_get_current (iter)); - stats = tny_folder_get_stats (folder); + if (folder) { + if (helper->task == TASK_GET_ALL_COUNT) + helper->sum += tny_folder_get_all_count (folder); - if (stats) { - /* initially, we sometimes get -1 from tinymail; ignore that */ - if (helper->function && helper->function (stats) > 0) - helper->sum += helper->function (stats); + if (helper->task == TASK_GET_LOCAL_SIZE) + helper->sum += tny_folder_get_local_size (folder); - if (TNY_IS_FOLDER_STORE (folder)) { + if (TNY_IS_FOLDER_STORE (folder)) recurse_folders (TNY_FOLDER_STORE (folder), query, helper); - } - g_object_unref (stats); - } - g_object_unref (folder); + + g_object_unref (folder); + } + tny_iterator_next (iter); } g_object_unref (G_OBJECT (iter)); @@ -835,7 +844,7 @@ modest_tny_folder_store_get_folder_count (TnyFolderStore *self) /* Create helper */ helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = NULL; + helper->task = TASK_GET_FOLDER_COUNT; helper->sum = 0; helper->folders = 0; @@ -858,7 +867,7 @@ modest_tny_folder_store_get_message_count (TnyFolderStore *self) /* Create helper */ helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = (TnyStatsFunc) tny_folder_stats_get_all_count; + helper->task = TASK_GET_ALL_COUNT; helper->sum = 0; recurse_folders (self, NULL, helper); @@ -880,7 +889,7 @@ modest_tny_folder_store_get_local_size (TnyFolderStore *self) /* Create helper */ helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = (TnyStatsFunc) tny_folder_stats_get_local_size; + helper->task = TASK_GET_LOCAL_SIZE; helper->sum = 0; recurse_folders (self, NULL, helper);