X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=ebb0b067b973b8df00b1c4437f0f9d3b02bbd7f9;hp=6716c722c1409fd4010738c32f31fdf0d4eb38e6;hb=8aa90aadd7cbc84e3a345a5750cf8de57532c528;hpb=e3bbf109946ea22634150c8cce39a3ca43d184f3 diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index 6716c72..ebb0b06 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -42,7 +43,7 @@ #include #include #include -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_HILDON0_WIDGETS #include #else #include @@ -79,13 +80,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) { @@ -121,6 +124,34 @@ modest_tny_account_get_special_folder (TnyAccount *account, 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) { + /* We are trying to use the network with an account, + * but the accounts are set as offline, because our TnyDevice is offline, + * because libconic says we are offline. + * So ask the user to go online: + */ + 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 @@ -164,7 +195,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. @@ -174,11 +206,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 */ @@ -214,6 +248,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); @@ -322,16 +364,19 @@ 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); /***********************/ - + return tny_account; } 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, @@ -340,8 +385,8 @@ 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); return result; @@ -373,6 +418,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) { @@ -392,7 +438,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); @@ -400,53 +446,136 @@ 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, 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); + /* 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); + +/* + TnyAccountStore *astore = (TnyAccountStore *) modest_runtime_get_account_store (); + if (astore) { + TnyDevice *device = tny_account_store_get_device (astore); + GError *err = NULL; + g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)astore); + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (tny_account), + tny_device_is_online (device), &err); + if (err) { + g_print ("%s: tny_camel_account_set_online() failed: %s\n", __FUNCTION__, err->message); + g_error_free (err); + } + g_object_unref (device); + } +*/ return tny_account; } -/* TODO: Notify the treemodel somehow that the display name - * is now available. We should probably request this from the cell_data_func - * so we can provide a treerowreference. */ +typedef struct +{ + TnyStoreAccount *account; + + ModestTnyAccountGetMmcAccountNameCallback callback; + gpointer user_data; +} GetMmcAccountNameData; + + + + +/* Gets the memory card name: */ static void on_modest_file_system_info(HildonFileSystemInfoHandle *handle, - HildonFileSystemInfo *info, - const GError *error, gpointer data) + HildonFileSystemInfo *info, + const GError *error, gpointer data) { - TnyAccount *account = TNY_ACCOUNT (data); - + GetMmcAccountNameData *callback_data = (GetMmcAccountNameData*)data; + if (error) { - printf (" DEBUG: %s: error=%s\n", __FUNCTION__, error->message); - } + g_warning ("%s: error=%s", __FUNCTION__, error->message); + } + + TnyAccount *account = TNY_ACCOUNT (callback_data->account); + + const gchar *previous_display_name = NULL; const gchar *display_name = NULL; if (!error && info) { display_name = hildon_file_system_info_get_display_name(info); + previous_display_name = tny_account_get_name (account); } + + /* printf ("DEBUG: %s: display name=%s\n", __FUNCTION__, display_name); */ + tny_account_set_name (account, display_name); + + /* Inform the application that the name is now ready: */ + if (callback_data->callback) + (*(callback_data->callback)) (callback_data->account, + callback_data->user_data); - if (display_name) { - /* printf ("DEBUG: %s: display name=%s\n", __FUNCTION__, display_name); */ - tny_account_set_name (account, display_name); + g_object_unref (callback_data->account); + g_slice_free (GetMmcAccountNameData, callback_data); +} + +void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data) +{ + /* Just use the hard-coded path for the single memory card, + * rather than try to figure out the path to the specific card by + * looking at the maildir URI: + */ + const gchar *uri_real = MODEST_MCC1_VOLUMEPATH_URI; + + /* + gchar* uri = tny_account_get_url_string (TNY_ACCOUNT (self)); + if (!uri) + return; + + TODO: This gets the name of the folder, but we want the name of the volume. + gchar *uri_real = NULL; + const gchar* prefix = "maildir://localhost/"; + if ((strstr (uri, prefix) == uri) && (strlen(uri) > strlen(prefix)) ) + uri_real = g_strconcat ("file:///", uri + strlen (prefix), NULL); + */ + + if (uri_real) { + //This is freed in the callback: + GetMmcAccountNameData * callback_data = g_slice_new0(GetMmcAccountNameData); + callback_data->account = self; + g_object_ref (callback_data->account); /* Unrefed when we destroy the struct. */ + callback_data->callback = callback; + callback_data->user_data = user_data; + + /* TODO: gnome_vfs_volume_get_display_name() does not return + * the same string. But why not? Why does hildon needs its own + * function for this? + */ + /* printf ("DEBUG: %s Calling hildon_file_system_info_async_new() with URI=%s\n", __FUNCTION__, uri_real); */ + hildon_file_system_info_async_new(uri_real, + on_modest_file_system_info, callback_data /* user_data */); + + /* g_free (uri_real); */ } + + /* g_free (uri); */ } + 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); @@ -455,6 +584,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 @@ -484,7 +615,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 @@ -509,12 +640,11 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess g_error_free (error); error = NULL; } else if (uri) { - /* TODO: gnome_vfs_volume_get_display_name() does not return - * the same string. But why not? Why does hildon needs its own - * function for this? + /* Get the account name asynchronously: + * This might not happen soon enough, so some UI code might + * need to call this again, specifying a callback. */ - hildon_file_system_info_async_new(uri, - on_modest_file_system_info, tny_account /* user_data */); + modest_tny_account_get_mmc_account_name (tny_account, NULL, NULL); g_free (uri); uri = NULL; @@ -541,10 +671,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, @@ -579,7 +712,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, @@ -633,16 +766,17 @@ recurse_folders (TnyFolderStore *store, folder = TNY_FOLDER (tny_iterator_get_current (iter)); stats = tny_folder_get_stats (folder); - /* initially, we sometimes get -1 from tinymail; ignore that */ - if (helper->function && helper->function (stats) > 0) - helper->sum += helper->function (stats); + if (stats) { + /* initially, we sometimes get -1 from tinymail; ignore that */ + if (helper->function && helper->function (stats) > 0) + helper->sum += helper->function (stats); - if (TNY_IS_FOLDER_STORE (folder)) { - recurse_folders (TNY_FOLDER_STORE (folder), query, helper); - } - + 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 (stats); tny_iterator_next (iter); } g_object_unref (G_OBJECT (iter)); @@ -724,7 +858,9 @@ const gchar* modest_tny_account_get_parent_modest_account_name_for_server_accoun 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); } + +