X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=aeb957f7ca9406fcd237a10658edee8f9713aa08;hp=60d6a556e6ec0280123bc4500cee6a1fb28a7270;hb=2f51f213469dc0679fd33c205a6f6aa0c20481a9;hpb=e3f312c4d0f48a21dd619ef44abbe3b915862f7e diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index 60d6a55..aeb957f 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include @@ -82,6 +83,11 @@ modest_tny_account_get_special_folder (TnyAccount *account, 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 { /* Other local folders are all in one on-disk directory: */ @@ -99,9 +105,22 @@ modest_tny_account_get_special_folder (TnyAccount *account, /* There is no need to do this _async, as these are local folders. */ /* TODO: However, this seems to fail sometimes when the network is busy, - * returning an empty list. murrayc. */ + * returning an empty list. murrayc. */ + GError *error = NULL; tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), - folders, NULL, NULL); + folders, NULL, &error); + if (error) { + g_warning ("%s: tny_folder_store_get_folders() failed:\n error=%s\n", + __FUNCTION__, error->message); + } + + if (tny_list_get_length (folders) == 0) { + gchar* url_string = tny_account_get_url_string (local_account); + g_printerr ("modest: %s: tny_folder_store_get_folders() returned an empty list for account with URL '%s'\n", + __FUNCTION__, url_string); + g_free (url_string); + } + iter = tny_list_create_iterator (folders); while (!tny_iterator_is_done (iter)) { @@ -120,9 +139,51 @@ modest_tny_account_get_special_folder (TnyAccount *account, g_object_unref (G_OBJECT (iter)); g_object_unref (G_OBJECT (local_account)); + /* + if (!special_folder) { + g_warning ("%s: Returning NULL.", __FUNCTION__); + } + */ + return special_folder; } +static void +on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, gpointer user_data) +{ + printf ("DEBUG: %s: status=%d\n", __FUNCTION__, status); + + if (status == TNY_CONNECTION_STATUS_DISCONNECTED) { + /* A tinymail network operation failed, and tinymail then noticed that + * the account is offline, because our TnyDevice is offline, + * because libconic says we are offline. + * So ask the user to go online again. + * + * Note that this signal will not be emitted if the account was offline + * when the network operation was first attempted. For those cases, + * the application must do its own explicit checks. + * + * We make sure that this UI is shown in the main thread, to avoid races, + * because tinymail does not guarantee that this signal handler will be called + * in the main thread. + */ + modest_platform_connect_and_wait (NULL); + } else if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) { + printf ("DEBUG: %s: Connection broken. Forcing TnyDevice offline.\n", + __FUNCTION__); + + /* Something went wrong during some network operation. + * Stop trying to use the network now, + * by forcing accounts into offline mode: + * + * When libconic reconnects, it will set the device back online again, + * regardless of it being forced offline before. + */ + TnyDevice *device = modest_runtime_get_device (); + tny_device_force_offline (device); + } +} + /* Camel options: */ /* These seem to be listed in @@ -166,7 +227,8 @@ modest_tny_account_get_special_folder (TnyAccount *account, /** * modest_tny_account_new_from_server_account: * @account_mgr: a valid account mgr instance - * @account_name: the server account name for which to create a corresponding tny account + * @session: A valid TnySessionCamel instance. + * @account_data: the server account for which to create a corresponding tny account * @type: the type of account to create (TNY_ACCOUNT_TYPE_STORE or TNY_ACCOUNT_TYPE_TRANSPORT) * * get a tnyaccount corresponding to the server_accounts (store or transport) for this account. @@ -176,11 +238,13 @@ modest_tny_account_get_special_folder (TnyAccount *account, */ static TnyAccount* modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, + TnySessionCamel *session, ModestServerAccountData *account_data) { gchar *url = NULL; g_return_val_if_fail (account_mgr, NULL); + g_return_val_if_fail (session, NULL); g_return_val_if_fail (account_data, NULL); /* sanity checks */ @@ -216,6 +280,14 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, } tny_account_set_id (tny_account, account_data->account_name); + /* This must be set quite early, or other set() functions will fail. */ + tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session); + + /* Handle connection requests: + * This (badly-named) signal will be called when we try to use an offline account. */ + g_signal_connect (G_OBJECT (tny_account), "connection-status-changed", + G_CALLBACK (on_connection_status_changed), NULL); + /* Proto */ const gchar* proto_name = modest_protocol_info_get_transport_store_protocol_name(account_data->proto); @@ -335,7 +407,8 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, TnyAccount* modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr, - const gchar *server_account_name) + TnySessionCamel *session, + const gchar *server_account_name) { ModestServerAccountData *account_data = modest_account_mgr_get_server_account_data (account_mgr, @@ -344,7 +417,7 @@ modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr, return NULL; TnyAccount *result = modest_tny_account_new_from_server_account ( - account_mgr, account_data); + account_mgr, session, account_data); modest_account_mgr_free_server_account_data (account_mgr, account_data); @@ -377,6 +450,7 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (account_name, NULL); + g_return_val_if_fail (session, NULL); account_data = modest_account_mgr_get_account_data (account_mgr, account_name); if (!account_data) { @@ -396,7 +470,7 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar return NULL; } - tny_account = modest_tny_account_new_from_server_account (account_mgr, server_data); + tny_account = modest_tny_account_new_from_server_account (account_mgr, session, server_data); if (!tny_account) { g_printerr ("modest: failed to create tny account for %s (%s)\n", account_data->account_name, server_data->account_name); @@ -404,7 +478,6 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar return NULL; } - tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session); tny_account_set_forget_pass_func (tny_account, forget_pass_func ? forget_pass_func : forget_pass_dummy); tny_account_set_pass_func (tny_account, @@ -530,8 +603,11 @@ void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAc TnyAccount* -modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, const gchar* location_filepath) +modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, + const gchar* location_filepath) { + + /* Make sure that the directories exist: */ modest_init_local_folders (location_filepath); @@ -540,6 +616,8 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess gchar *maildir, *url_string; g_return_val_if_fail (account_mgr, NULL); + g_return_val_if_fail (session, NULL); + if (!location_filepath) { /* A NULL filepath means that this is the special local-folders maildir @@ -625,10 +703,13 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess TnyAccount* -modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr, const gchar* account_name, TnySessionCamel *session) +modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr, + const gchar* account_name, + TnySessionCamel *session) { g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (account_name, NULL); + g_return_val_if_fail (session, NULL); /* Notice that we create a ModestTnyOutboxAccount here, * instead of just a TnyCamelStoreAccount,