#include <tny-camel-transport-account.h>
#include <tny-camel-imap-store-account.h>
#include <tny-camel-pop-store-account.h>
-
+#include "modest-text-utils.h"
#include <modest-runtime.h>
#include <modest-marshal.h>
#include <modest-protocol-registry.h>
static void remove_connection_specific_transport_accounts (ModestTnyAccountStore *self);
-static void connection_status_changed (TnyAccount *account,
- TnyConnectionStatus status,
- gpointer data);
-
-static gboolean only_local_accounts (ModestTnyAccountStore *self);
+static inline gboolean only_local_accounts (ModestTnyAccountStore *self);
/* list my signals */
enum {
g_return_if_fail (priv->session);
TnyAccount *mmc_account = modest_tny_account_new_for_local_folders (priv->account_mgr,
- priv->session,
- MODEST_MCC1_VOLUMEPATH);
+ priv->session,
+ g_getenv (MODEST_MMC1_VOLUMEPATH_ENV));
/* Add to the list of store accounts */
tny_list_append (priv->store_accounts, G_OBJECT (mmc_account));
{
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
+ gchar *volume_path_uri;
gchar *uri = NULL;
/* Check whether this was the external MMC1 card: */
uri = gnome_vfs_volume_get_activation_uri (volume);
- if (uri && (!strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI))) {
+ volume_path_uri = g_strconcat (MODEST_MMC1_VOLUMEPATH_URI_PREFIX,
+ g_getenv (MODEST_MMC1_VOLUMEPATH_ENV),
+ NULL);
+ if (uri && (!strcmp (uri, volume_path_uri))) {
add_mmc_account (self, TRUE /* emit the insert signal. */);
}
-
+
+ g_free (volume_path_uri);
g_free (uri);
}
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
gchar *uri = NULL;
+ gchar *volume_path_uri;
self = MODEST_TNY_ACCOUNT_STORE(user_data);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
/* Check whether this was the external MMC1 card: */
uri = gnome_vfs_volume_get_activation_uri (volume);
- if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) {
+ volume_path_uri = g_strconcat (MODEST_MMC1_VOLUMEPATH_URI_PREFIX,
+ g_getenv (MODEST_MMC1_VOLUMEPATH_ENV),
+ NULL);
+ if (uri && (strcmp (uri, volume_path_uri) == 0)) {
TnyAccount *mmc_account = NULL;
gboolean found = FALSE;
TnyIterator *iter = NULL;
__FUNCTION__);
}
}
+ g_free (volume_path_uri);
g_free (uri);
}
account_list = (account_type == TNY_ACCOUNT_TYPE_STORE ?
priv->store_accounts :
priv->transport_accounts);
-
+
iter = tny_list_create_iterator (account_list);
while (!tny_iterator_is_done (iter) && !found) {
TnyAccount *tny_account;
}
tny_iterator_next (iter);
}
-
- if (iter)
- g_object_unref (iter);
+ g_object_unref (iter);
}
static void
show_password_warning_only (const gchar *msg)
{
- ModestWindow *main_window =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */
-
/* Show an explanatory temporary banner: */
- if (main_window)
+ if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()))
modest_platform_information_banner (NULL, NULL, msg);
}
__FUNCTION__, server_account_name ? server_account_name : "<NULL>");
if (cancel)
*cancel = TRUE;
-
+
return NULL;
}
-
+
/* This hash map stores passwords, including passwords that are not stored in gconf. */
/* Is it in the hash? if it's already there, it must be wrong... */
pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
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,
gchar *password;
password = modest_account_mgr_get_server_account_password (priv->account_mgr,
server_account_name);
- if (!password || strlen(password) == 0)
+
+ if (already_asked)
+ msg = g_strdup (_("mcen_ib_username_pw_incorrect"));
+ else if (!password || strlen(password) == 0)
msg = g_strdup_printf (_("emev_ni_ui_smtp_passwd_invalid"),
tny_account_get_name (account),
tny_account_get_hostname (account));
if (settings_have_password) {
/* The password must be wrong, so show the account settings dialog so it can be corrected: */
show_wrong_password_dialog (account);
-
+
if (cancel)
*cancel = TRUE;
-
+
return NULL;
}
-
+
/* we don't have it yet. Get the password from the user */
const gchar* account_id = tny_account_get_id (account);
gboolean remember = FALSE;
pwd = NULL;
-
+
if (already_asked) {
const gchar *msg;
gboolean username_known =
server_account_name);
/* If the login has ever succeeded then show a specific message */
if (username_known)
- msg = dgettext ("hildon-common-strings", "ecdg_ib_set_password_incorrect");
+ msg = _CS ("ecdg_ib_set_password_incorrect");
else
msg = _("mcen_ib_username_pw_incorrect");
show_password_warning_only (msg);
* GnomeVFSVolume even if the drive is not mounted: */
/*
GnomeVFSVolume *volume = gnome_vfs_volume_monitor_get_volume_for_path (monitor,
- MODEST_MCC1_VOLUMEPATH);
+ g_getenv (MODEST_MMC1_VOLUMEPATH_ENV));
if (volume) {
gnome_vfs_volume_unref(volume);
}
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)) {
+ if (volume_path_is_mounted (g_getenv (MODEST_MMC1_VOLUMEPATH_ENV))) {
/* It is mounted: */
add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */);
}
if (error->code == TNY_SERVICE_ERROR_CERTIFICATE)
retval = modest_platform_run_certificate_confirmation_dialog (server_name,
error->message);
- else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE) {
+ else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE ||
+ error->code == TNY_SERVICE_ERROR_CONNECT) {
+
modest_platform_run_information_dialog (NULL, prompt, TRUE);
/* Show the account dialog if it was wrong */
- if (error->code == TNY_SERVICE_ERROR_CONNECT ||
- error->code == TNY_SERVICE_ERROR_AUTHENTICATE)
+ if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE)
show_wrong_password_dialog (account);
retval = TRUE;
if (!server_account_name) {
return NULL; /* No connection-specific SMTP server was specified for this connection. */
}
-
+
TnyAccount* account = modest_tny_account_store_get_tny_account_by (self,
MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
server_account_name);
/* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */
- g_free (server_account_name);
+ g_free (server_account_name);
/* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */
g_object_unref (connection);
-
+
return account;
#else
return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
modest_account_mgr_free_account_names (account_names);
}
-static void
-connection_status_changed (TnyAccount *account,
- TnyConnectionStatus status,
- gpointer data)
-{
- /* We do this here and not in the connection policy because we
- don't want to do it for every account, just for the
- accounts that are interactively added when modest is
- runnning */
- 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");
-
- /* 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, TRUE, main_window);
- }
-}
-
static TnyAccount*
create_tny_account (ModestTnyAccountStore *self,
const gchar *name,
{
TnyAccount *account = NULL;
ModestTnyAccountStorePrivate *priv = NULL;
-
+
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
account = modest_tny_account_new_from_account (priv->account_mgr,
we use a new account if any */
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. Do this
- only if we're adding a new account while the
- program is running (we do not want to do this
- allways) */
- if (type == TNY_ACCOUNT_TYPE_STORE && notify)
- 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 {
info = g_slice_new0 (AddOutboxInfo);
info->account_store = self;
info->transport_account = g_object_ref (transport_account);
- tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL,
+ tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, FALSE,
add_outbox_from_transport_account_to_global_outbox_get_folders_cb, NULL, (gpointer) info);
g_object_unref (account_outbox);
}
g_object_unref (transport_account);
}
-static gboolean
+static inline gboolean
only_local_accounts (ModestTnyAccountStore *self)
{
- ModestTnyAccountStorePrivate *priv = NULL;
- gboolean only_local = TRUE;
- TnyIterator *iter;
-
- /* Check if this is the first remote account we add */
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
- iter = tny_list_create_iterator (priv->store_accounts);
-
- while (!tny_iterator_is_done (iter) && only_local) {
- TnyAccount *account = (TnyAccount *) tny_iterator_get_current (iter);
- if (modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account)))
- only_local = FALSE;
- g_object_unref (account);
- tny_iterator_next (iter);
- }
- g_object_unref (iter);
-
- return only_local;
+ return (modest_tny_account_store_get_num_remote_accounts (self) > 0) ? FALSE : TRUE;
}
static void
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");
- }
-
/* Cancel all pending operations */
tny_account_cancel (TNY_ACCOUNT (account));
return TNY_TRANSPORT_ACCOUNT (tny_account);
}
+static void
+foreach_free_string(gpointer data,
+ gpointer user_data)
+{
+ g_free (data);
+}
static void
add_connection_specific_transport_accounts (ModestTnyAccountStore *self)
if (err) {
g_error_free (err);
g_return_if_reached ();
+ return;
}
/* Look at each connection-specific transport account for the
}
iter = g_slist_next (iter);
}
+
+ /* Free the list */
+ g_slist_foreach (list_specifics, foreach_free_string, NULL);
+ g_slist_free (list_specifics);
}
static void
if (err) {
g_error_free (err);
g_return_if_reached ();
+ return;
}
/* Look at each connection-specific transport account for the
}
iter = g_slist_next (iter);
}
+
+ /* Free the list */
+ g_slist_foreach (list_specifics, foreach_free_string, NULL);
+ g_slist_free (list_specifics);
}
TnyAccount *account = TNY_ACCOUNT (tny_iterator_get_current (acc_iter));
TnyIterator *folders_iter = NULL;
- tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, NULL);
+ tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, FALSE, NULL);
folders_iter = tny_list_create_iterator (folders);
while (msg == NULL && !tny_iterator_is_done (folders_iter)) {
}
-void
+void
modest_tny_account_store_shutdown (ModestTnyAccountStore *self,
ModestTnyAccountStoreShutdownCallback callback,
gpointer userdata)
ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
/* Get references */
- num_accounts = tny_list_get_length (priv->store_accounts) +
- tny_list_get_length (priv->transport_accounts);
+ num_accounts = 0;
+ if (priv->store_accounts)
+ num_accounts += tny_list_get_length (priv->store_accounts);
+ if (priv->transport_accounts) {
+ num_accounts += tny_list_get_length (priv->transport_accounts);
+
for (i = 0 ; i < num_accounts ; i++)
g_object_ref (self);
if (priv->store_accounts) {
tny_list_foreach (priv->store_accounts, (GFunc)account_shutdown, op_data);
}
-
+
if (priv->transport_accounts) {
tny_list_foreach (priv->transport_accounts, (GFunc)account_shutdown, op_data);
}
priv->send_mail_blocked = blocked;
}
+
+static void
+count_remote_accounts (gpointer data, gpointer user_data)
+{
+ TnyFolderStore *account = TNY_FOLDER_STORE (data);
+ gint *count = (gint *) user_data;
+
+ if (modest_tny_folder_store_is_remote (account))
+ (*count)++;
+}
+
+guint
+modest_tny_account_store_get_num_remote_accounts (ModestTnyAccountStore *self)
+{
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+ gint count = 0;
+
+ /* Count remote accounts */
+ tny_list_foreach (priv->store_accounts, (GFunc) count_remote_accounts, &count);
+
+ return count;
+}
projects / modest / blobdiff