priv->session = NULL;
priv->device = NULL;
- priv->outbox_of_transport =
- g_hash_table_new_full (g_direct_hash,
- g_direct_equal,
- NULL,
- NULL);
+ priv->outbox_of_transport = g_hash_table_new_full (g_direct_hash,
+ g_direct_equal,
+ NULL,
+ NULL);
/* An in-memory store of passwords,
* for passwords that are not remembered in the configuration,
foreach_account_disconnect (gpointer data,
gpointer user_data)
{
- tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL);
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL, NULL);
}
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
-gboolean volume_path_is_mounted (const gchar* path)
+gboolean
+volume_path_is_mounted (const gchar* path)
{
g_return_val_if_fail (path, FALSE);
global OUTBOX hosted in the local account */
add_existing_accounts (MODEST_TNY_ACCOUNT_STORE (obj));
-
- /* Create the memory card account if the card is mounted: */
+ /* FIXME: I'm doing this (adding an "if (FALSE)"because this
+ stuff is not working properly and could cause SIGSEVs, for
+ example one send queue will be created for each connection
+ specific SMTP server, so when tinymail asks for the outbox
+ 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)
+ /* Add connection-specific transport accounts */
+ add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj));
/* This is a singleton, so it does not need to be unrefed. */
if (volume_path_is_mounted (MODEST_MCC1_VOLUMEPATH)) {
-static void
-log_alert_error (const GError *err)
-{
- if (err)
- g_warning ("%s: %d, message=%s", __FUNCTION__, err->domain, err->message);
-}
-
-
static gboolean
-modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyAlertType type,
- gboolean question, const GError *error)
+modest_tny_account_store_alert (TnyAccountStore *self,
+ TnyAccount *account,
+ TnyAlertType type,
+ gboolean question,
+ const GError *error)
{
- ModestTransportStoreProtocol proto;
+ ModestTransportStoreProtocol proto =
+ MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
const gchar* server_name = NULL;
gchar *prompt = NULL;
gboolean retval;
-
+
+
+ g_return_val_if_fail (account, FALSE);
g_return_val_if_fail (error, FALSE);
- log_alert_error (error);
if ((error->domain != TNY_ACCOUNT_ERROR) && (error->domain != TNY_ACCOUNT_STORE_ERROR))
return FALSE;
/* Get the server name: */
- if (account && TNY_IS_ACCOUNT (account))
- server_name = tny_account_get_hostname (account);
- if (!server_name) {
- g_warning ("%s: cannot get server name", __FUNCTION__);
- return FALSE;
- }
+ server_name = tny_account_get_hostname (account);
if (account) {
const gchar *proto_name = tny_account_get_proto (account);
server_name);
break;
default:
- g_warning ("%s: should not be reached (%d)", __FUNCTION__, proto);
- return FALSE;
+ g_return_val_if_reached (FALSE);
}
break;
break;
case TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE:
- /* TODO: This needs a logical ID and/or some specified way to ask the
- * different certificate questions: */
- prompt = g_strdup_printf(
- _("Certificate Problem:\n%s"),
- error->message);
+ /* We'll show the proper dialog later */
break;
case TNY_ACCOUNT_ERROR_TRY_CONNECT:
/* 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:
- /* This debug output is useful. Please keep it uncommented until
- * we have fixed the problems in this function: */
- g_debug ("%s: %d, message=%s",__FUNCTION__,
- error->domain, error->message);
-
- /* TODO: Remove the internal error message for the real release.
- * This is just so the testers can give us more information: */
- /* However, I haven't seen this for a few weeks, so maybe the users
- * will never see it. murrayc. */
- /* prompt = _("Modest account not yet fully configured."); */
- prompt = g_strdup_printf(
- "%s\n (Internal error message, often very misleading):\n%s",
- _("Incorrect Account Settings"),
- error->message);
-
- /* Note: If the password was wrong then get_password() would be called again,
- * instead of this vfunc being called. */
- break;
-
+ case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT:
+ return FALSE;
default:
- g_warning ("%s: Unhandled GError code: %d, message=%s",
- __FUNCTION__, error->code, error->message);
- prompt = NULL;
- break;
+ g_return_val_if_reached (FALSE);
}
- if (!prompt)
- return FALSE;
+
+ if (error->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE)
+ retval = modest_platform_run_certificate_conformation_dialog (server_name,
+ error->message);
else
retval = modest_platform_run_alert_dialog (prompt, question);
- g_free (prompt);
+ if (prompt)
+ g_free (prompt);
return retval;
}
return account;
}
+
+static void
+add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self,
+ const gchar *account_name,
+ TnyAccount *transport_account)
+{
+ TnyList *folders = NULL;
+ TnyIterator *iter_folders = NULL;
+ TnyAccount *local_account = NULL, *account_outbox = NULL;
+ TnyFolder *per_account_outbox = NULL;
+ ModestTnyAccountStorePrivate *priv = NULL;
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ /* Create per account local outbox */
+ account_outbox =
+ modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr,
+ account_name,
+ priv->session);
+ tny_list_append (priv->store_accounts_outboxes, G_OBJECT (account_outbox));
+
+ /* 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);
+
+ iter_folders = tny_list_create_iterator (folders);
+ per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders));
+ g_object_unref (iter_folders);
+ g_object_unref (folders);
+ g_object_unref (account_outbox);
+
+ /* Add the outbox of the new per-account-local-outbox account
+ to the global local merged OUTBOX of the local folders
+ account */
+ local_account = modest_tny_account_store_get_local_folders_account (self);
+ modest_tny_local_folders_account_add_folder_to_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account),
+ per_account_outbox);
+ /* Add the pair to the hash table */
+ g_hash_table_insert (priv->outbox_of_transport,
+ transport_account,
+ per_account_outbox);
+
+ g_object_unref (local_account);
+ g_object_unref (per_account_outbox);
+}
+
+
/*
* This function will be used for both adding new accounts and for the
* initialization. In the initialization we do not want to emit
/* Add to the list, and notify the observers */
if (transport_account) {
- TnyAccount *account_outbox = NULL, *local_account = NULL;
- TnyFolder *per_account_outbox = NULL;
- TnyList *folders;
- TnyIterator *iter_folders;
-
/* Add account to the list */
tny_list_append (priv->transport_accounts, G_OBJECT (transport_account));
+ g_assert (TNY_IS_ACCOUNT (transport_account));
- /* Add connection-specific transport accounts */
- add_connection_specific_transport_accounts (self);
-
- /* Create per account local outbox */
- account_outbox =
- modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr,
- account,
- priv->session);
- tny_list_append (priv->store_accounts_outboxes, G_OBJECT (account_outbox));
-
- /* Get the outbox folder */
- folders = tny_simple_list_new ();
- tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox),
- folders, NULL, NULL);
- if (tny_list_get_length (folders) != 1)
- g_warning ("%s: there should be only one outbox folder, but 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);
- g_object_unref (folders);
- g_object_unref (account_outbox);
-
- /* Add the outbox of the new per-account-local-outbox
- account to the global local merged OUTBOX of the
- local folders account */
- local_account = modest_tny_account_store_get_local_folders_account (MODEST_TNY_ACCOUNT_STORE (self));
- modest_tny_local_folders_account_add_folder_to_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account),
- per_account_outbox);
- /* Add the pair to the hash table */
- g_hash_table_insert (priv->outbox_of_transport,
- transport_account,
- per_account_outbox);
-
- /* Notify that the local folders account chaned */
- if (notify)
- g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account);
+ /* Create a new pseudo-account with an outbox for this
+ transport account and add it to the global outbox
+ in the local account */
+ add_outbox_from_transport_account_to_global_outbox (self, account, transport_account);
- g_object_unref (local_account);
- g_object_unref (per_account_outbox);
+ if (notify) {
+ TnyAccount *local_account = NULL;
- /* Notify the observers */
- if (notify)
+ /* Notify that the local account changed */
+ local_account = modest_tny_account_store_get_local_folders_account (self);
+ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account);
+ g_object_unref (local_account);
+
+ /* Notify the observers about the new account */
g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, transport_account);
+ }
+
g_object_unref (transport_account);
}
}
GError *err = NULL;
list_specifics = modest_conf_get_list (conf,
- MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
- MODEST_CONF_VALUE_STRING, &err);
+ MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, &err);
if (err) {
g_printerr ("modest: %s: error getting list: %s\n.", __FUNCTION__, err->message);
g_error_free (err);
(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);
projects / modest / blobdiff