X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=ac14b62c93d59d1603a54c61a33ac2bd5084aad7;hp=b7d12710fb3b2c13caa29a8b12596ac72ae94207;hb=d9bf0c403f9783c14dff05b4046d9aa57ee76a3d;hpb=53ede89ac00d6116a9fda93c78b00d56b036b36c diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index b7d1271..ac14b62 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 @@ -50,18 +50,20 @@ #include #include #include -#include -#include #include +#include #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" #include #include #include +#include "modest-ui-actions.h" #ifdef MODEST_PLATFORM_MAEMO #include +#include +#include #endif #include @@ -106,6 +108,10 @@ static void modest_tny_account_store_forget_password_in_memory (ModestTnyAcco static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self); +static void connection_status_changed (TnyAccount *account, + TnyConnectionStatus status, + gpointer data); + /* list my signals */ enum { ACCOUNT_CHANGED_SIGNAL, @@ -120,7 +126,9 @@ typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { gchar *cache_dir; GHashTable *password_hash; +#ifdef MODEST_PLATFORM_MAEMO GHashTable *account_settings_dialog_hash; +#endif ModestAccountMgr *account_mgr; TnySessionCamel *session; TnyDevice *device; @@ -213,15 +221,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", @@ -276,11 +275,13 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) */ priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - + +#ifdef MODEST_PLATFORM_MAEMO /* A hash-map of modest account names to dialog pointers, * so we can avoid showing the account settings twice for the same modest account: */ priv->account_settings_dialog_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); +#endif /* Respond to volume mounts and unmounts, such * as the insertion/removal of the memory card: */ @@ -300,19 +301,35 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) /* disconnect the list of TnyAccounts */ static void -foreach_account_disconnect (gpointer data, - gpointer user_data) +account_disconnect (TnyAccount *account) +{ + g_return_if_fail (account && TNY_IS_ACCOUNT(account)); + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, NULL, NULL); +} + + +/* disconnect the list of TnyAccounts */ +static void +account_verify_last_ref (TnyAccount *account, const gchar *str) { - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL, NULL); + gchar *txt; + + g_return_if_fail (account && TNY_IS_ACCOUNT(account)); + + txt = g_strdup_printf ("%s: %s", str ? str : "?", tny_account_get_name(account)); + MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(G_OBJECT(account),txt); + g_free (txt); } + + static void foreach_account_append_to_list (gpointer data, gpointer user_data) { TnyList *list; - + list = TNY_LIST (user_data); tny_list_append (list, G_OBJECT (data)); } @@ -405,7 +422,7 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, if (found) { /* Remove from the list */ tny_list_remove (priv->store_accounts, G_OBJECT (mmc_account)); - + /* Notify observers */ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], @@ -461,15 +478,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, get_password, forget_password); + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account); } g_object_unref (tny_account); } @@ -480,104 +492,63 @@ on_account_changed (ModestAccountMgr *acc_mgr, g_object_unref (iter); } +#ifdef MODEST_PLATFORM_MAEMO 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 static void show_password_warning_only () { ModestWindow *main_window = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */ + /* Show an explanatory temporary banner: */ - hildon_banner_show_information ( - GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect")); + if (main_window) + modest_platform_information_banner (NULL, NULL, + _("mcen_ib_username_pw_incorrect")); + else + g_warning ("%s: %s", __FUNCTION__, _("mcen_ib_username_pw_incorrect")); } - + +#ifdef MODEST_PLATFORM_MAEMO static void 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); - - const gchar *modest_account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); + const gchar *modest_account_name; + GtkWidget *main_window; + GtkWidget *dialog; + + 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; + } + + modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); if (!modest_account_name) { g_warning ("%s: modest_tny_account_get_parent_modest_account_name_for_server_account() failed.\n", __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; - - ModestWindow *main_window = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - - gboolean created_dialog = FALSE; - if (!found || !dialog) { - dialog = modest_account_settings_dialog_new (); - modest_account_settings_dialog_set_account_name (dialog, modest_account_name); - 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: */ - hildon_banner_show_information (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: */ - modest_maemo_show_dialog_and_forget (GTK_WINDOW (main_window), GTK_DIALOG (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)); - } -} - - - -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); + modest_platform_information_banner (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect")); } +#endif /* This callback will be called by Tinymail when it needs the password * from the user or the account settings. @@ -590,12 +561,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc /* TODO: Settting cancel to FALSE does not actually cancel everything. * We still get multiple requests afterwards, so we end up showing the * same dialogs repeatedly. - */ - - printf ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); - - g_return_val_if_fail (account, NULL); - + */ const TnyAccountStore *account_store = NULL; ModestTnyAccountStore *self = NULL; ModestTnyAccountStorePrivate *priv; @@ -604,6 +570,12 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc gpointer pwd_ptr = NULL; gboolean already_asked = FALSE; + g_return_val_if_fail (account, NULL); + + MODEST_DEBUG_BLOCK( + g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); + ); + /* Initialize the output parameter: */ if (cancel) *cancel = FALSE; @@ -633,9 +605,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc server_account_name, NULL, (gpointer*)&pwd_ptr); - - printf ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked); - + MODEST_DEBUG_BLOCK( + g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked); + ); + /* If the password is not already there, try ModestConf */ if (!already_asked) { pwd = modest_account_mgr_get_server_account_password (priv->account_mgr, @@ -651,10 +624,15 @@ 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); - printf ("DEBUG: modest: %s: settings_have_password=%d\n", __FUNCTION__, settings_have_password); + MODEST_DEBUG_BLOCK( + printf ("%s: settings_have_password=%d\n", + __FUNCTION__, settings_have_password); + ); if (settings_have_password) { /* The password must be wrong, so show the account settings dialog so it can be corrected: */ +#ifdef MODEST_PLATFORM_MAEMO show_wrong_password_dialog (account); +#endif if (cancel) *cancel = TRUE; @@ -671,9 +649,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, @@ -699,10 +680,8 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc g_free (username); username = NULL; } else - *cancel = FALSE; - - /* printf(" DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */ - + if (cancel) + *cancel = FALSE; return pwd; } @@ -743,7 +722,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; @@ -785,10 +763,12 @@ modest_tny_account_store_finalize (GObject *obj) priv->password_hash = NULL; } +#ifdef MODEST_PLATFORM_MAEMO if (priv->account_settings_dialog_hash) { g_hash_table_destroy (priv->account_settings_dialog_hash); priv->account_settings_dialog_hash = NULL; } +#endif if (priv->outbox_of_transport) { g_hash_table_destroy (priv->outbox_of_transport); @@ -810,13 +790,15 @@ modest_tny_account_store_finalize (GObject *obj) /* Destroy all accounts. Disconnect all accounts before they are destroyed */ if (priv->store_accounts) { - tny_list_foreach (priv->store_accounts, foreach_account_disconnect, NULL); + tny_list_foreach (priv->store_accounts, (GFunc)account_disconnect, NULL); + tny_list_foreach (priv->store_accounts, (GFunc)account_verify_last_ref, "store"); g_object_unref (priv->store_accounts); priv->store_accounts = NULL; } - + if (priv->transport_accounts) { - tny_list_foreach (priv->transport_accounts, foreach_account_disconnect, NULL); + tny_list_foreach (priv->transport_accounts, (GFunc)account_disconnect, NULL); + tny_list_foreach (priv->transport_accounts, (GFunc)account_verify_last_ref, "transport"); g_object_unref (priv->transport_accounts); priv->transport_accounts = NULL; } @@ -830,6 +812,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); } @@ -948,7 +932,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, it will return NULL because there is no outbox folder for this specific transport accounts, and it's a must that the send queue returns an outbox */ - if (FALSE) + if (TRUE) /* Add connection-specific transport accounts */ add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj)); @@ -1017,8 +1001,8 @@ modest_tny_account_store_get_device (TnyAccountStore *self) g_return_val_if_fail (self, NULL); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - if (priv->device) + + if (priv->device) return g_object_ref (G_OBJECT(priv->device)); else return NULL; @@ -1040,7 +1024,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; @@ -1052,9 +1036,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); @@ -1070,15 +1051,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: - /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */ + 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: switch (proto) { case MODEST_PROTOCOL_STORE_POP: prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), @@ -1097,33 +1081,44 @@ modest_tny_account_store_alert (TnyAccountStore *self, } break; - case TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED: - /* This is "Secure connection failed", even though the logical - * ID has _certificate_ in the name: */ - prompt = g_strdup (_("mail_ni_ssl_certificate_error")); + case TNY_SERVICE_ERROR_AUTHENTICATE: + /* It seems that there's no better error to show with + * POP and IMAP because TNY_SERVICE_ERROR_AUTHENTICATE + * may appear if there's a timeout during auth */ + switch (proto) { + case MODEST_PROTOCOL_STORE_POP: + prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), + server_name); + break; + case MODEST_PROTOCOL_STORE_IMAP: + prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), + server_name); + break; + case MODEST_PROTOCOL_TRANSPORT_SMTP: + prompt = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), + server_name); + break; + default: + g_return_val_if_reached (FALSE); + } 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) - retval = modest_platform_run_certificate_conformation_dialog (server_name, + if (error->code == TNY_SERVICE_ERROR_CERTIFICATE) + retval = modest_platform_run_certificate_confirmation_dialog (server_name, error->message); else retval = modest_platform_run_alert_dialog (prompt, question); @@ -1144,15 +1139,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; } @@ -1180,12 +1175,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); @@ -1200,7 +1208,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; } @@ -1251,6 +1259,7 @@ modest_tny_account_store_get_tny_account_by (ModestTnyAccountStore *self, return account; } + TnyAccount* modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, const gchar *account_name, @@ -1291,7 +1300,7 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, modest_acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (tmp_account); - if (!strcmp (account_name, modest_acc_name)) { + if (account_name && modest_acc_name && !strcmp (account_name, modest_acc_name)) { found = TRUE; retval = g_object_ref (tmp_account); } @@ -1299,6 +1308,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." \ @@ -1311,21 +1321,29 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, return retval; } -static TnyAccount* -get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, - const gchar *account_name) +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 (!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); -#ifdef MODEST_PLATFORM_MAEMO - g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device)); TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device); const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device); /* printf ("DEBUG: %s: iap_id=%s\n", __FUNCTION__, iap_id); */ @@ -1336,9 +1354,9 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * 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: */ @@ -1350,7 +1368,7 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * } 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) { @@ -1370,7 +1388,7 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * return account; #else return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */ -#endif /* MODEST_PLATFORM_MAEMO */ +#endif /* MODEST_HAVE_CONIC */ } @@ -1387,7 +1405,7 @@ modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAcc /* Get the connection-specific transport acccount, if any: */ /* Note: This gives us a reference: */ TnyAccount *account = - get_smtp_specific_transport_account_for_open_connection (self, account_name); + modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (self, account_name); /* If there is no connection-specific transport account (the common case), * just get the regular transport account: */ @@ -1442,6 +1460,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); @@ -1469,6 +1488,35 @@ add_existing_accounts (ModestTnyAccountStore *self) modest_account_mgr_free_account_names (account_names); } +static void +connection_status_changed (TnyAccount *account, + TnyConnectionStatus status, + gpointer data) +{ + if (status == TNY_CONNECTION_STATUS_CONNECTED) { + const gchar *account_name; + ModestWindow *main_window; + ModestTnyAccountStorePrivate *priv = NULL; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (data); + + /* Remove this handler */ + priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, + G_OBJECT (account), + "connection_status_changed"); + + /* Set the username as succedded */ + modest_account_mgr_set_server_account_username_has_succeeded (modest_runtime_get_account_mgr (), + tny_account_get_id (account), + TRUE); + + /* Perform a send receive */ + account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); + modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, main_window); + } +} + static TnyAccount* create_tny_account (ModestTnyAccountStore *self, const gchar *name, @@ -1490,6 +1538,15 @@ create_tny_account (ModestTnyAccountStore *self, we use a new account if any */ modest_tny_account_store_forget_password_in_memory (self, tny_account_get_id (account)); + + /* Install a signal handler that will refresh the + account the first time it becomes online */ + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (account), + "connection_status_changed", + G_CALLBACK (connection_status_changed), + self); + /* Set the account store */ g_object_set_data (G_OBJECT(account), "account_store", self); } else { @@ -1523,8 +1580,11 @@ add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self, /* Get the outbox folder */ folders = tny_simple_list_new (); tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox), folders, NULL, NULL); - g_assert (tny_list_get_length (folders) == 1); - + if (tny_list_get_length (folders) != 1) { + g_warning ("%s: > 1 outbox found (%d)?!", __FUNCTION__, + tny_list_get_length (folders)); + } + iter_folders = tny_list_create_iterator (folders); per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders)); g_object_unref (iter_folders); @@ -1564,15 +1624,22 @@ insert_account (ModestTnyAccountStore *self, /* Get the server and the transport account */ store_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_STORE); - transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); + if (!store_account || !TNY_IS_ACCOUNT(store_account)) { + g_warning ("%s: failed to create store account", __FUNCTION__); + return; + } - g_assert (store_account); - g_assert (transport_account); + transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); + if (!transport_account || !TNY_IS_ACCOUNT(transport_account)) { + g_warning ("%s: failed to create transport account", __FUNCTION__); + g_object_unref (store_account); + return; + } /* Add accounts to the lists */ tny_list_append (priv->store_accounts, G_OBJECT (store_account)); tny_list_append (priv->transport_accounts, G_OBJECT (transport_account)); - + /* Create a new pseudo-account with an outbox for this transport account and add it to the global outbox in the local account */ @@ -1607,29 +1674,76 @@ on_account_inserted (ModestAccountMgr *acc_mgr, insert_account (MODEST_TNY_ACCOUNT_STORE (user_data), account, TRUE); } +/* This is the callback of the tny_camel_account_set_online called in + on_account_removed to disconnect the account */ +static void +on_account_disconnect_when_removing (TnyCamelAccount *account, + gboolean canceled, + GError *err, + gpointer user_data) +{ + ModestTnyAccountStore *self; + ModestTnyAccountStorePrivate *priv; + + self = MODEST_TNY_ACCOUNT_STORE (user_data); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + + /* Remove the connection-status-changed handler if it's still there */ + if (modest_signal_mgr_is_connected (priv->sighandlers, + G_OBJECT (account), + "connection_status_changed")) { + priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, + G_OBJECT (account), + "connection_status_changed"); + } + + /* Remove it from the list of accounts */ + if (TNY_IS_STORE_ACCOUNT (account)) + tny_list_remove (priv->store_accounts, (GObject *) account); + else + tny_list_remove (priv->transport_accounts, (GObject *) account); + + /* Notify the observers */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], + 0, 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, gpointer user_data) { TnyAccount *store_account = NULL, *transport_account = NULL; - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + ModestTnyAccountStore *self; + ModestTnyAccountStorePrivate *priv; + self = MODEST_TNY_ACCOUNT_STORE (user_data); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + /* Get the server and the transport account */ store_account = modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_STORE); transport_account = modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); - + /* If there was any problem creating the account, for example, with the configuration system this could not exist */ if (store_account) { - /* Clear the cache */ - tny_store_account_delete_cache (TNY_STORE_ACCOUNT (store_account)); - - /* Notify the observers */ - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, store_account); - g_object_unref (store_account); + /* Disconnect before deleting the cache, because the + disconnection will rewrite the cache to the + disk */ + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), FALSE, + on_account_disconnect_when_removing, self); } else { g_warning ("There is no store account for account %s\n", account); } @@ -1658,14 +1772,48 @@ on_account_removed (ModestAccountMgr *acc_mgr, g_warning ("Removing a transport account that has no outbox"); } - /* Notify the observers */ - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account); - g_object_unref (transport_account); + /* Disconnect and notify the observers. The callback will free the reference */ + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), FALSE, + on_account_disconnect_when_removing, self); } else { g_warning ("There is no transport account for account %s\n", account); } } +TnyTransportAccount * +modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAccountStore *self, + const gchar *name) +{ + ModestTnyAccountStorePrivate *priv = NULL; + TnyAccount * tny_account = NULL; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* Add the account: */ + tny_account = + modest_tny_account_new_from_server_account_name (priv->account_mgr, + priv->session, + name, + get_password, + forget_password); + if (tny_account) { + g_object_set_data (G_OBJECT(tny_account), + "account_store", + (gpointer)self); + + tny_list_append (priv->transport_accounts, G_OBJECT (tny_account)); + add_outbox_from_transport_account_to_global_outbox (self, + name, + tny_account); + + } else + g_printerr ("modest: failed to create smtp-specific account for %s\n", + name); + + return TNY_TRANSPORT_ACCOUNT (tny_account); +} + + static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self) { @@ -1694,24 +1842,11 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) iter = g_slist_next (iter); if (iter) { const gchar* transport_account_name = (const gchar*) (iter->data); - if (transport_account_name) { - TnyAccount * tny_account = NULL; - /* Add the account: */ - tny_account = - modest_tny_account_new_from_server_account_name (priv->account_mgr, - priv->session, - transport_account_name); - if (tny_account) { - g_object_set_data (G_OBJECT(tny_account), - "account_store", - (gpointer)self); - - tny_list_append (priv->transport_accounts, G_OBJECT (tny_account)); - g_object_unref (tny_account); - } else - g_printerr ("modest: failed to create smtp-specific account for %s\n", - transport_account_name); - } + TnyTransportAccount * account = NULL; + account = modest_tny_account_store_new_connection_specific_transport_account ( + self, transport_account_name); + if (account) + g_object_unref (account); } iter = g_slist_next (iter); } @@ -1749,6 +1884,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); @@ -1789,7 +1925,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; + } + +}