X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=9ed5db905974f89798d0e37383911c3ef19717ca;hp=ac7dd11f5b81090c5afc92f5bf14d12123f97366;hb=eec4b19f682dc36d0dcafd63b6058b979a98a1fc;hpb=175e5926e0194a8211b846a4eec403a5bdb4afd4 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index ac7dd11..9ed5db9 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -50,9 +50,8 @@ #include #include #include -#include -#include #include +#include #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" @@ -62,6 +61,8 @@ #ifdef MODEST_PLATFORM_MAEMO #include +#include +#include #endif #include @@ -120,7 +121,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 +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", @@ -276,11 +270,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 +296,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) { - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL, NULL); + 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) +{ + 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 +417,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 +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); } @@ -480,6 +487,7 @@ 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) { @@ -494,6 +502,7 @@ on_account_settings_hide (GtkWidget *widget, gpointer user_data) if (modest_account_name) g_hash_table_remove (priv->account_settings_dialog_hash, modest_account_name); } +#endif static void show_password_warning_only () @@ -503,13 +512,13 @@ show_password_warning_only () /* Show an explanatory temporary banner: */ if (main_window) - hildon_banner_show_information ( - GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect")); + modest_platform_information_banner (GTK_WIDGET(main_window), 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) { @@ -556,7 +565,7 @@ show_wrong_password_dialog (TnyAccount *account) } /* Show an explanatory temporary banner: */ - hildon_banner_show_information (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect")); + modest_platform_information_banner (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect")); if (created_dialog) { /* Forget it when it closes: */ @@ -564,7 +573,12 @@ show_wrong_password_dialog (TnyAccount *account) account, 0); /* Show it and delete it when it closes: */ - modest_maemo_show_dialog_and_forget (GTK_WINDOW (main_window), GTK_DIALOG (dialog)); + 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, @@ -572,21 +586,7 @@ show_wrong_password_dialog (TnyAccount *account) 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); -} +#endif /* This callback will be called by Tinymail when it needs the password * from the user or the account settings. @@ -599,12 +599,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; @@ -613,6 +608,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 ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); + ); + /* Initialize the output parameter: */ if (cancel) *cancel = FALSE; @@ -642,9 +643,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 ("DEBUG: modest: %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, @@ -660,10 +662,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 ("DEBUG: modest: %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; @@ -680,9 +687,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, @@ -708,10 +718,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; } @@ -794,10 +802,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); @@ -819,13 +829,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; } @@ -957,7 +969,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)); @@ -1026,8 +1038,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; @@ -1260,6 +1272,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, @@ -1300,7 +1313,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); } @@ -1320,9 +1333,9 @@ 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) { /* Get the current connection: */ TnyDevice *device = modest_runtime_get_device (); @@ -1333,8 +1346,9 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * g_return_val_if_fail (self, NULL); -#ifdef MODEST_PLATFORM_MAEMO - g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device)); +#ifdef MODEST_HAVE_CONIC + g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE (device), NULL); + 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); */ @@ -1379,7 +1393,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 */ } @@ -1396,7 +1410,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: */ @@ -1532,8 +1546,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); @@ -1573,15 +1590,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 */ @@ -1616,29 +1640,67 @@ 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_removed (ModestAccountMgr *acc_mgr, - const gchar *account, +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); + + 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); + 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); +} + +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); } @@ -1667,14 +1729,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) { @@ -1703,24 +1799,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); }