X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=68bbfe977b79dbb13a911f451b12ca5457a13682;hb=52d653ba9f85cd4525c9c09ddad020ac19a3b3a9;hp=ec3dc0471d29d696a85c4a949cf7ad907293ccd6;hpb=5c10a6a7b752651d4700639f7ee3139a2476dbe0;p=modest diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index ec3dc04..68bbfe9 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -53,7 +53,7 @@ #include #include #include - +#include "modest-utils.h" #include #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" @@ -407,8 +407,8 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, g_object_unref (mmc_account); } else { - g_warning ("%s: there was no store account for the unmounted MMC", - __FUNCTION__); + g_debug ("%s: there was no store account for the unmounted MMC", + __FUNCTION__); } } g_free (volume_path_uri); @@ -469,14 +469,6 @@ on_account_changed (ModestAccountMgr *acc_mgr, } static void -show_password_warning_only (const gchar *msg) -{ - /* Show an explanatory temporary banner: */ - if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ())) - modest_platform_information_banner (NULL, NULL, msg); -} - -static void show_wrong_password_dialog (TnyAccount *account, gboolean show_banner) { @@ -557,7 +549,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc server_account_name = tny_account_get_id (account); if (!server_account_name || !self) { - g_warning ("modest: %s: could not retrieve account_store for account %s", + g_warning ("%s: could not retrieve account_store for account %s", __FUNCTION__, server_account_name ? server_account_name : ""); if (cancel) *cancel = TRUE; @@ -603,6 +595,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc if (modest_protocol_registry_protocol_type_has_tag(modest_runtime_get_protocol_registry (), protocol_type, MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS)) { gchar *username = NULL, *msg = NULL; + gboolean is_banner = FALSE; username = modest_account_mgr_get_server_account_username (priv->account_mgr, server_account_name); if (!username || strlen(username) == 0) { @@ -614,24 +607,43 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc password = modest_account_mgr_get_server_account_password (priv->account_mgr, server_account_name); - if (already_asked) - msg = g_strdup (_("mcen_ib_username_pw_incorrect")); - else if (!password || strlen(password) == 0) + if (already_asked) { + msg = g_strdup (_CS("ecdg_ib_set_password_incorrect")); + is_banner = TRUE; + } else if (!password || strlen(password) == 0) { msg = g_strdup_printf (_("emev_ni_ui_smtp_passwd_invalid"), tny_account_get_name (account), tny_account_get_hostname (account)); - else + } else { msg = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), tny_account_get_hostname (account)); + } if (password) g_free (password); } if (msg) { - modest_platform_run_information_dialog (NULL, msg, TRUE); + if (is_banner) + modest_platform_information_banner (NULL, NULL, msg); + else + modest_platform_run_information_dialog (NULL, msg, TRUE); g_free (msg); } if (username) g_free (username); + } else { + if (already_asked) { + const gchar *msg; + gboolean username_known = + modest_account_mgr_get_server_account_username_has_succeeded(priv->account_mgr, + server_account_name); + /* If the login has ever succeeded then show a specific message */ + if (username_known) + msg = _CS ("ecdg_ib_set_password_incorrect"); + else + msg = _("mcen_ib_username_pw_incorrect"); + if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ())) + modest_platform_information_banner (NULL, NULL, msg); + } } if (settings_have_password) { @@ -645,29 +657,13 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc } /* we don't have it yet. Get the password from the user */ + pwd = NULL; const gchar* account_id = tny_account_get_id (account); gboolean remember = FALSE; - pwd = NULL; - - if (already_asked) { - const gchar *msg; - gboolean username_known = - modest_account_mgr_get_server_account_username_has_succeeded(priv->account_mgr, - server_account_name); - /* If the login has ever succeeded then show a specific message */ - if (username_known) - msg = _CS ("ecdg_ib_set_password_incorrect"); - else - msg = _("mcen_ib_username_pw_incorrect"); - show_password_warning_only (msg); - } - - /* Request password */ g_signal_emit (G_OBJECT (self), signals[PASSWORD_REQUESTED_SIGNAL], 0, account_id, /* server_account_name */ &username, &pwd, cancel, &remember); - if (!*cancel) { /* The password will be returned as the result, * but we need to tell tinymail about the username too: */ @@ -1053,13 +1049,13 @@ modest_tny_account_store_alert (TnyAccountStore *self, /* NOTE: account may be NULL in some cases */ g_return_val_if_fail (error, FALSE); - + /* Get the server name: */ if (account) { server_name = tny_account_get_hostname (account); protocol_type = modest_tny_account_get_protocol_type (account); if (protocol_type == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID){ - g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__, + g_warning("%s: account with id=%s has no proto.\n", __FUNCTION__, tny_account_get_id (account)); return FALSE; } @@ -1087,7 +1083,6 @@ modest_tny_account_store_alert (TnyAccountStore *self, g_return_val_if_reached (FALSE); } break; - case TNY_SERVICE_ERROR_AUTHENTICATE: /* It seems that there's no better error to show with * POP and IMAP because TNY_SERVICE_ERROR_AUTHENTICATE @@ -1099,19 +1094,23 @@ modest_tny_account_store_alert (TnyAccountStore *self, g_return_val_if_reached (FALSE); } break; - case TNY_SERVICE_ERROR_CERTIFICATE: /* We'll show the proper dialog later */ break; case TNY_SYSTEM_ERROR_MEMORY: /* Can't allocate memory for this operation */ - - case TNY_SERVICE_ERROR_UNKNOWN: + if (modest_tny_account_store_check_disk_full_error ((ModestTnyAccountStore*)self, + NULL, error, account, NULL)) + retval = FALSE; + break; + case TNY_SERVICE_ERROR_UNKNOWN: return FALSE; default: - g_debug ("Unexpected error %d", error->code); - g_return_val_if_reached (FALSE); + /* We don't treat this as an error, but as a not handled message. Then, + * debug message, and return false */ + g_debug ("Unexpected error %d (%s)", error->code, error->message); + return FALSE; } @@ -2256,3 +2255,77 @@ modest_tny_account_store_start_send_queues (ModestTnyAccountStore *self) tny_list_foreach (tmp, (GFunc) init_send_queue, NULL); g_object_unref (tmp); } + + +gboolean +modest_tny_account_store_check_disk_full_error (ModestTnyAccountStore *self, + GtkWidget *parent_window, + GError *err, + TnyAccount *account, + const gchar *alternate) +{ + if (err == NULL) + return FALSE; + + if (modest_tny_account_store_is_disk_full_error (self, err, account)) { + gboolean is_mcc = modest_tny_account_is_memory_card_account (account); + if (is_mcc && alternate) { + modest_platform_information_banner (parent_window, NULL, alternate); + } else { + gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), ""); + modest_platform_information_banner (parent_window, NULL, msg); + g_free (msg); + } + } else if (err->code == TNY_SYSTEM_ERROR_MEMORY) + /* If the account was created in memory full + conditions then tinymail won't be able to + connect so it'll return this error code */ + modest_platform_information_banner (parent_window, + NULL, _("emev_ui_imap_inbox_select_error")); + else + return FALSE; + + return TRUE; +} + +gboolean +modest_tny_account_store_is_disk_full_error (ModestTnyAccountStore *self, + GError *error, + TnyAccount *account) +{ + gboolean enough_free_space = TRUE; + GnomeVFSURI *cache_dir_uri; + const gchar *cache_dir = NULL; + GnomeVFSFileSize free_space; + + /* Cache dir is different in case we're using an external storage (like MMC account) */ + if (account && modest_tny_account_is_memory_card_account (account)) + cache_dir = g_getenv (MODEST_MMC1_VOLUMEPATH_ENV); + + /* Get the default local cache dir */ + if (!cache_dir) + cache_dir = tny_account_store_get_cache_dir ((TnyAccountStore *) self); + + cache_dir_uri = gnome_vfs_uri_new (cache_dir); + if (cache_dir_uri) { + if (gnome_vfs_get_volume_free_space (cache_dir_uri, &free_space) == GNOME_VFS_OK) { + if (free_space < MODEST_TNY_ACCOUNT_STORE_MIN_FREE_SPACE) + enough_free_space = FALSE; + } + gnome_vfs_uri_unref (cache_dir_uri); + } + + if ((error->code == TNY_SYSTEM_ERROR_MEMORY || + /* When asking for a mail and no space left on device + tinymail returns this error */ + error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE || + /* When the folder summary could not be read or + written */ + error->code == TNY_IO_ERROR_WRITE || + error->code == TNY_IO_ERROR_READ) && + !enough_free_space) { + return TRUE; + } else { + return FALSE; + } +}