X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=ac77bfc87fe95f537f1cda5cde3c05983cdbf2b7;hp=1c3021b19cc3da8f0ae80f40718b20750d46fb28;hb=518e2f866b4ddaa35443cef48c874a358be0851f;hpb=46f5f01a6cf826f2a76914f770daea7c87b9e7d7 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 1c3021b..ac77bfc 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -30,10 +30,10 @@ #include #include +#include #include #include #include -#include #include #include #include @@ -216,15 +216,6 @@ modest_tny_account_store_base_init (gpointer g_class) NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT); - -/* signals[TNY_ACCOUNT_STORE_CONNECTING_FINISHED] = */ -/* g_signal_new ("connecting_finished", */ -/* TNY_TYPE_ACCOUNT_STORE, */ -/* G_SIGNAL_RUN_FIRST, */ -/* G_STRUCT_OFFSET (TnyAccountStoreIface, connecting_finished), */ -/* NULL, NULL, */ -/* g_cclosure_marshal_VOID__VOID, */ -/* G_TYPE_NONE, 0); */ signals[PASSWORD_REQUESTED_SIGNAL] = g_signal_new ("password_requested", @@ -482,15 +473,10 @@ on_account_changed (ModestAccountMgr *acc_mgr, TnyAccount *tny_account; tny_account = TNY_ACCOUNT (tny_iterator_get_current (iter)); if (tny_account) { - TnyConnectionStatus conn_status = tny_account_get_connection_status (tny_account); - - if (conn_status != TNY_CONNECTION_STATUS_RECONNECTING && - conn_status != TNY_CONNECTION_STATUS_INIT) { - if (!strcmp (tny_account_get_id (tny_account), account_name)) { - found = TRUE; - modest_tny_account_update_from_account (tny_account); - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account); - } + if (!strcmp (tny_account_get_id (tny_account), account_name)) { + found = TRUE; + modest_tny_account_update_from_account (tny_account); + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account); } g_object_unref (tny_account); } @@ -568,8 +554,11 @@ show_wrong_password_dialog (TnyAccount *account) gboolean created_dialog = FALSE; if (!found || !dialog) { + ModestAccountSettings *settings; dialog = modest_account_settings_dialog_new (); - modest_account_settings_dialog_set_account_name (dialog, modest_account_name); + settings = modest_account_mgr_load_account_settings (priv->account_mgr, modest_account_name); + modest_account_settings_dialog_set_account (dialog, settings); + g_object_unref (settings); modest_account_settings_dialog_switch_to_user_info (dialog); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog)); @@ -602,20 +591,6 @@ show_wrong_password_dialog (TnyAccount *account) } #endif - -static void -request_password_and_wait (ModestTnyAccountStore *account_store, - const gchar* server_account_id, - gchar **username, - gchar **password, - gboolean *cancel, - gboolean *remember) -{ - g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0, - server_account_id, /* server_account_name */ - username, password, cancel, remember); -} - /* This callback will be called by Tinymail when it needs the password * from the user or the account settings. * It can also call forget_password() before calling this, @@ -639,7 +614,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc g_return_val_if_fail (account, NULL); MODEST_DEBUG_BLOCK( - g_debug ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); + g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); ); /* Initialize the output parameter: */ @@ -672,7 +647,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc NULL, (gpointer*)&pwd_ptr); MODEST_DEBUG_BLOCK( - g_debug ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked); + g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked); ); /* If the password is not already there, try ModestConf */ @@ -691,7 +666,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc const gboolean settings_have_password = modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name); MODEST_DEBUG_BLOCK( - printf ("DEBUG: modest: %s: settings_have_password=%d\n", + printf ("%s: settings_have_password=%d\n", __FUNCTION__, settings_have_password); ); if (settings_have_password) { @@ -715,9 +690,12 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc /* Show an info banner, before we show the protected password dialog: */ show_password_warning_only(); } - - request_password_and_wait (self, account_id, + + /* Request password */ + g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0, + account_id, /* server_account_name */ &username, &pwd, cancel, &remember); + if (!*cancel) { /* The password will be returned as the result, @@ -785,7 +763,6 @@ modest_tny_account_store_forget_already_asked (ModestTnyAccountStore *self, TnyA static void forget_password (TnyAccount *account) { - printf ("DEBUG: %s\n", __FUNCTION__); ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; const TnyAccountStore *account_store; @@ -1086,7 +1063,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyAlertType type, gboolean question, - const GError *error) + GError *error) { ModestTransportStoreProtocol proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; @@ -1098,9 +1075,6 @@ modest_tny_account_store_alert (TnyAccountStore *self, g_return_val_if_fail (account, FALSE); g_return_val_if_fail (error, FALSE); - if ((error->domain != TNY_ACCOUNT_ERROR) && (error->domain != TNY_ACCOUNT_STORE_ERROR)) - return FALSE; - /* Get the server name: */ server_name = tny_account_get_hostname (account); @@ -1116,14 +1090,18 @@ modest_tny_account_store_alert (TnyAccountStore *self, } switch (error->code) { - case TNY_ACCOUNT_STORE_ERROR_CANCEL_ALERT: - case TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL: + case TNY_SYSTEM_ERROR_CANCEL: /* Don't show waste the user's time by showing him a dialog telling * him that he has just cancelled something: */ return TRUE; - case TNY_ACCOUNT_ERROR_TRY_CONNECT_HOST_LOOKUP_FAILED: - case TNY_ACCOUNT_ERROR_TRY_CONNECT_SERVICE_UNAVAILABLE: + case TNY_SERVICE_ERROR_PROTOCOL: + /* Like a BAD from IMAP (protocol error) */ + case TNY_SERVICE_ERROR_LOST_CONNECTION: + /* Lost the connection with the service */ + case TNY_SERVICE_ERROR_UNAVAILABLE: + /* You must be working online for this operation */ + case TNY_SERVICE_ERROR_CONNECT: /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */ switch (proto) { case MODEST_PROTOCOL_STORE_POP: @@ -1143,32 +1121,27 @@ modest_tny_account_store_alert (TnyAccountStore *self, } break; - case TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED: + case TNY_SERVICE_ERROR_AUTHENTICATE: /* This is "Secure connection failed", even though the logical * ID has _certificate_ in the name: */ prompt = g_strdup (_("mail_ni_ssl_certificate_error")); break; - case TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE: + case TNY_SERVICE_ERROR_CERTIFICATE: /* We'll show the proper dialog later */ break; - - case TNY_ACCOUNT_ERROR_TRY_CONNECT: - /* The tinymail camel implementation just sends us this for almost - * everything, so we have to guess at the cause. - * It could be a wrong password, or inability to resolve a hostname, - * or lack of network, or incorrect authentication method, or something entirely different: */ - /* TODO: Fix camel to provide specific error codes, and then use the - * specific dialog messages from Chapter 12 of the UI spec. - */ - case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: + + case TNY_SYSTEM_ERROR_MEMORY: + /* Can't allocate memory for this operation */ + + case TNY_SERVICE_ERROR_UNKNOWN: return FALSE; default: g_return_val_if_reached (FALSE); } - if (error->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE) + if (error->code == TNY_SERVICE_ERROR_CERTIFICATE) retval = modest_platform_run_certificate_confirmation_dialog (server_name, error->message); else @@ -1190,15 +1163,15 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data) klass = (TnyAccountStoreIface *)g; - klass->get_accounts_func = + klass->get_accounts = modest_tny_account_store_get_accounts; - klass->get_cache_dir_func = + klass->get_cache_dir = modest_tny_account_store_get_cache_dir; - klass->get_device_func = + klass->get_device = modest_tny_account_store_get_device; - klass->alert_func = + klass->alert = modest_tny_account_store_alert; - klass->find_account_func = + klass->find_account = modest_tny_account_store_find_account_by_url; } @@ -1226,12 +1199,25 @@ get_tny_account_by (TnyList *accounts, gboolean found = FALSE; TnyAccount *retval = NULL; + g_return_val_if_fail (TNY_IS_LIST(accounts), NULL); + + if (tny_list_get_length(accounts) == 0) { + g_warning ("%s: account list is empty", __FUNCTION__); + return NULL; + } + iter = tny_list_create_iterator (accounts); while (!tny_iterator_is_done (iter) && !found) { TnyAccount *tmp_account = NULL; const gchar *val = NULL; tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter)); + if (!TNY_IS_ACCOUNT(tmp_account)) { + g_warning ("%s: not a valid account", __FUNCTION__); + tmp_account = NULL; + break; + } + switch (type) { case MODEST_TNY_ACCOUNT_STORE_QUERY_ID: val = tny_account_get_id (tmp_account); @@ -1246,7 +1232,7 @@ get_tny_account_by (TnyList *accounts, retval = g_object_ref (tmp_account); found = TRUE; } else { - if (strcmp (val, str) == 0) { + if (val && str && strcmp (val, str) == 0) { retval = g_object_ref (tmp_account); found = TRUE; } @@ -1346,6 +1332,7 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, g_object_unref (tmp_account); tny_iterator_next (iter); } + g_object_unref (iter); if (!found) { g_printerr ("modest: %s: could not get tny %s account for %s\n." \ @@ -1362,14 +1349,16 @@ TnyAccount* modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, const gchar *account_name) { + TnyDevice *device; + + g_return_val_if_fail (self && MODEST_IS_TNY_ACCOUNT_STORE(self), NULL); + g_return_val_if_fail (account_name, NULL); + /* Get the current connection: */ - TnyDevice *device = modest_runtime_get_device (); + device = modest_runtime_get_device (); if (!tny_device_is_online (device)) return NULL; - - g_return_val_if_fail (self, NULL); - #ifdef MODEST_HAVE_CONIC g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE (device), NULL); @@ -1384,9 +1373,9 @@ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection if (!connection) return NULL; - const gchar *connection_name = con_ic_iap_get_name (connection); - /* printf ("DEBUG: %s: connection_name=%s\n", __FUNCTION__, connection_name); */ - if (!connection_name) + const gchar *connection_id = con_ic_iap_get_id (connection); + /* printf ("DEBUG: %s: connection_id=%s\n", __FUNCTION__, connection_id); */ + if (!connection_id) return NULL; /* Get the connection-specific transport acccount, if any: */ @@ -1398,7 +1387,7 @@ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection } gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager, - connection_name); + connection_id); /* printf ("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */ if (!server_account_name) { @@ -1679,14 +1668,6 @@ on_account_disconnect_when_removing (TnyCamelAccount *account, self = MODEST_TNY_ACCOUNT_STORE (user_data); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); - if (canceled || err) { - /* The account was not cancelled */ - } else { - /* Clear the cache if it's an store account */ - if (TNY_IS_STORE_ACCOUNT (account)) - tny_store_account_delete_cache (TNY_STORE_ACCOUNT (account)); - } - /* Remove it from the list of accounts */ if (TNY_IS_STORE_ACCOUNT (account)) tny_list_remove (priv->store_accounts, (GObject *) account); @@ -1699,10 +1680,15 @@ on_account_disconnect_when_removing (TnyCamelAccount *account, /* Unref the extra reference added by get_server_account */ g_object_unref (account); + + /* Clear the cache if it's an store account */ + if (TNY_IS_STORE_ACCOUNT (account)) + tny_store_account_delete_cache (TNY_STORE_ACCOUNT (account)); } static void -on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, +on_account_removed (ModestAccountMgr *acc_mgr, + const gchar *account, gpointer user_data) { TnyAccount *store_account = NULL, *transport_account = NULL; @@ -1866,6 +1852,7 @@ modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, g_object_unref (folder); tny_iterator_next (folders_iter); } + g_object_unref (folders_iter); g_object_unref (folders); g_object_unref (account);