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",
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);
}
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));
}
#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,
/* 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,
gboolean found = FALSE;
TnyAccount *retval = NULL;
+ g_return_val_if_fail (accounts && TNY_IS_LIST(accounts), NULL);
+
iter = tny_list_create_iterator (accounts);
while (!tny_iterator_is_done (iter) && !found) {
TnyAccount *tmp_account = NULL;
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);
-#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); */
return account;
#else
return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_HAVE_CONIC */
}
/* 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);
/* 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));
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);
/* 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;