X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=d96e8e09ab34cd3835c3f13422603e70834ad91b;hp=5ed3484765de111e5c927a60923254dea7136495;hb=bc9f170098a914b8101e17f2b84235921b46ab95;hpb=d73789ffb936127d7e0b2ddfb7bc60683df683c5 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 5ed3484..d96e8e0 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -40,7 +40,7 @@ #include #include #include - +#include "modest-text-utils.h" #include #include #include @@ -112,11 +112,7 @@ static void add_connection_specific_transport_accounts (ModestTnyAcco 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 { @@ -335,8 +331,8 @@ add_mmc_account(ModestTnyAccountStore *self, gboolean emit_insert_signal) 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)); @@ -358,6 +354,7 @@ on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor, { ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; + gchar *volume_path_uri; gchar *uri = NULL; @@ -367,10 +364,14 @@ on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor, /* 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); } @@ -382,13 +383,17 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, 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; @@ -422,6 +427,7 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, __FUNCTION__); } } + g_free (volume_path_uri); g_free (uri); } @@ -460,7 +466,7 @@ on_account_changed (ModestAccountMgr *acc_mgr, 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; @@ -475,19 +481,14 @@ on_account_changed (ModestAccountMgr *acc_mgr, } 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); } @@ -574,10 +575,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc __FUNCTION__, server_account_name ? server_account_name : ""); 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 @@ -590,7 +591,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc 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, @@ -626,7 +627,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc 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)); @@ -647,18 +651,18 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc 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 = @@ -666,7 +670,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc 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); @@ -851,7 +855,7 @@ volume_path_is_mounted (const gchar* path) * 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); } @@ -951,7 +955,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, 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. */); } @@ -1113,12 +1117,13 @@ modest_tny_account_store_alert (TnyAccountStore *self, 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; @@ -1377,17 +1382,17 @@ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection 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? */ @@ -1491,34 +1496,6 @@ add_existing_accounts (ModestTnyAccountStore *self) 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, @@ -1527,7 +1504,7 @@ create_tny_account (ModestTnyAccountStore *self, { TnyAccount *account = NULL; ModestTnyAccountStorePrivate *priv = NULL; - + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); account = modest_tny_account_new_from_account (priv->account_mgr, @@ -1541,18 +1518,6 @@ create_tny_account (ModestTnyAccountStore *self, 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 { @@ -1706,27 +1671,10 @@ insert_account (ModestTnyAccountStore *self, 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 @@ -1762,15 +1710,6 @@ on_account_disconnect_when_removing (TnyCamelAccount *account, 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)); @@ -1973,6 +1912,12 @@ modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAcc 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) @@ -1989,6 +1934,7 @@ 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 @@ -2007,6 +1953,10 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) } iter = g_slist_next (iter); } + + /* Free the list */ + g_slist_foreach (list_specifics, foreach_free_string, NULL); + g_slist_free (list_specifics); } static void @@ -2025,6 +1975,7 @@ remove_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 @@ -2046,6 +1997,10 @@ remove_connection_specific_transport_accounts (ModestTnyAccountStore *self) } iter = g_slist_next (iter); } + + /* Free the list */ + g_slist_foreach (list_specifics, foreach_free_string, NULL); + g_slist_free (list_specifics); } @@ -2231,3 +2186,25 @@ modest_tny_account_store_set_send_mail_blocked (ModestTnyAccountStore *self, 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; +}