X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=e0cd50b751bcb1fc9bc7055110b43968ce6223e4;hp=1a5324e37be721b13b9de014a69867c5cbec61bb;hb=54d35f158a8ffa5a3bc4c13aeceff3b61070afab;hpb=7929406e046ed92142ff337bd9161e6a16e1d04e diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 1a5324e..e0cd50b 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 @@ -491,16 +491,13 @@ on_account_changed (ModestAccountMgr *acc_mgr, static void on_account_settings_hide (GtkWidget *widget, gpointer user_data) { - TnyAccount *account = (TnyAccount*)user_data; - /* This is easier than using a struct for the user_data: */ ModestTnyAccountStore *self = modest_runtime_get_account_store(); ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - const gchar *modest_account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); - if (modest_account_name) - g_hash_table_remove (priv->account_settings_dialog_hash, modest_account_name); + gchar *account_name = (gchar *) user_data; + if (account_name) + g_hash_table_remove (priv->account_settings_dialog_hash, account_name); } #endif @@ -524,12 +521,12 @@ show_wrong_password_dialog (TnyAccount *account) { /* This is easier than using a struct for the user_data: */ ModestTnyAccountStore *self = modest_runtime_get_account_store(); - ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - ModestWindow *main_window; const gchar *modest_account_name; + GtkWidget *main_window; + GtkWidget *dialog; - main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), - FALSE); /* don't create */ + main_window = (GtkWidget *) modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), + FALSE); /* don't create */ if (!main_window) { g_warning ("%s: password was wrong; ignoring because no main window", __FUNCTION__); return; @@ -541,53 +538,10 @@ show_wrong_password_dialog (TnyAccount *account) __FUNCTION__); } - /* Check whether this window is already open, - * for instance because of a previous get_password() call: - */ - gpointer dialog_as_gpointer = NULL; - gboolean found = FALSE; - if (priv->account_settings_dialog_hash) { - found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash, - modest_account_name, NULL, (gpointer*)&dialog_as_gpointer); - } - ModestAccountSettingsDialog *dialog = dialog_as_gpointer; - - gboolean created_dialog = FALSE; - if (!found || !dialog) { - ModestAccountSettings *settings; - dialog = modest_account_settings_dialog_new (); - 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)); - - g_hash_table_insert (priv->account_settings_dialog_hash, g_strdup (modest_account_name), dialog); - - created_dialog = TRUE; - } - + dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name); + modest_account_settings_dialog_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog)); /* Show an explanatory temporary banner: */ modest_platform_information_banner (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect")); - - if (created_dialog) { - /* Forget it when it closes: */ - g_signal_connect_object (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide), - account, 0); - - /* Show it and delete it when it closes: */ - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (main_window)); - g_signal_connect_swapped (dialog, - "response", - G_CALLBACK (gtk_widget_destroy), - dialog); - gtk_widget_show (GTK_WIDGET (dialog)); - } - else { - /* Just show it instead of showing it and deleting it when it closes, - * though it is probably open already: */ - gtk_window_present (GTK_WINDOW (dialog)); - } } #endif @@ -614,7 +568,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: */ @@ -647,7 +601,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 */ @@ -666,7 +620,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) { @@ -763,7 +717,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; @@ -854,6 +807,8 @@ modest_tny_account_store_finalize (GObject *obj) camel_object_unref (CAMEL_OBJECT(priv->session)); priv->session = NULL; } + + camel_shutdown (); G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -1064,7 +1019,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; @@ -1076,9 +1031,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); @@ -1094,14 +1046,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: @@ -1121,32 +1077,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 @@ -1168,15 +1119,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; } @@ -1204,12 +1155,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); @@ -1224,7 +1188,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; } @@ -1324,6 +1288,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." \ @@ -1337,17 +1302,24 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, } TnyAccount* -modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, - const gchar *account_name) +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 (!device) { + g_warning ("%s: could not get device", __FUNCTION__); + return NULL; + } + 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); @@ -1362,9 +1334,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: */ @@ -1376,7 +1348,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) { @@ -1468,6 +1440,7 @@ modest_tny_account_store_get_mmc_folders_account (ModestTnyAccountStore *self) { g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL); + /* New reference */ return modest_tny_account_store_get_tny_account_by (self, MODEST_TNY_ACCOUNT_STORE_QUERY_ID, MODEST_MMC_ACCOUNT_ID); @@ -1657,14 +1630,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); @@ -1677,10 +1642,18 @@ on_account_disconnect_when_removing (TnyCamelAccount *account, /* Unref the extra reference added by get_server_account */ g_object_unref (account); + + /* Cancel all pending operations */ + tny_account_cancel (TNY_ACCOUNT (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; @@ -1844,6 +1817,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); @@ -1884,7 +1858,49 @@ modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccou g_object_unref (account); tny_iterator_next (acc_iter); } - g_object_unref(acc_iter); + + /* New reference */ return header_acc; } + +GtkWidget * +modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *self, + const gchar *account_name) +{ + ModestTnyAccountStorePrivate *priv; + gpointer dialog_as_gpointer = NULL; + gboolean found; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash, + account_name, NULL, (gpointer*)&dialog_as_gpointer); + + if (found) + return (GtkWidget *) dialog_as_gpointer; + else { + ModestAccountSettings *settings; + GtkWidget *dialog; + dialog = (GtkWidget *) modest_account_settings_dialog_new (); + settings = modest_account_mgr_load_account_settings (priv->account_mgr, account_name); + modest_account_settings_dialog_set_account (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog), settings); + g_object_unref (settings); + modest_account_settings_dialog_switch_to_user_info (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog)); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog)); + + g_hash_table_insert (priv->account_settings_dialog_hash, g_strdup (account_name), dialog); + + g_signal_connect (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide), + g_strdup (account_name)); + + /* Show it and delete it when it closes: */ + g_signal_connect_swapped (dialog, + "response", + G_CALLBACK (gtk_widget_destroy), + dialog); + gtk_widget_show (GTK_WIDGET (dialog)); + + return dialog; + } + +}