#include <string.h>
#include <modest-marshal.h>
#include <modest-runtime.h>
+#include <modest-defs.h>
#include <modest-account-mgr.h>
#include <modest-account-mgr-priv.h>
#include <modest-account-mgr-helpers.h>
MODEST_ACCOUNT_MGR_GET_PRIVATE (obj);
if (priv->notification_id_accounts) {
- /* TODO: forget dirs */
-
g_hash_table_destroy (priv->notification_id_accounts);
+ priv->notification_id_accounts = NULL;
}
if (priv->modest_conf) {
priv->account_key_hash = NULL;
}
+ if (priv->busy_accounts) {
+ g_slist_foreach (priv->busy_accounts, (GFunc) g_free, NULL);
+ g_slist_free (priv->busy_accounts);
+ priv->busy_accounts = NULL;
+ }
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
* but let's check again just in case */
if (!display_name ||
modest_account_mgr_account_with_display_name_exists (self, display_name)) {
- return FALSE;
+ display_name = _("mcen_ia_emailsetup_defaultname");
}
/* Increment the non-user visible name if necessary,
guint portnumber,
const gchar *username,
const gchar *password,
- ModestTransportStoreProtocol proto,
- ModestConnectionProtocol security,
- ModestAuthProtocol auth)
+ ModestProtocolType proto,
+ ModestProtocolType security,
+ ModestProtocolType auth)
{
ModestAccountMgrPrivate *priv;
const gchar *key;
gboolean ok = TRUE;
GError *err = NULL;
+ ModestProtocolRegistry *protocol_registry;
g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
-
+
+ protocol_registry = modest_runtime_get_protocol_registry ();
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
/* hostname */
/* proto */
key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_PROTO, TRUE);
ok = modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_transport_store_protocol_name(proto),
+ modest_protocol_get_name (modest_protocol_registry_get_protocol_by_type (protocol_registry, proto)),
&err);
if (err) {
g_printerr ("modest: failed to set %s: %s\n", key, err->message);
/* auth mechanism */
key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_AUTH_MECH, TRUE);
ok = modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_auth_protocol_name (auth),
+ modest_protocol_get_name (modest_protocol_registry_get_protocol_by_type (protocol_registry, auth)),
&err);
if (err) {
g_printerr ("modest: failed to set %s: %s\n", key, err->message);
gboolean
modest_account_mgr_add_server_account_uri (ModestAccountMgr * self,
const gchar *name,
- ModestTransportStoreProtocol proto,
+ ModestProtocolType proto,
const gchar *uri)
{
ModestAccountMgrPrivate *priv;
const gchar *key;
gboolean ok;
+ ModestProtocolRegistry *protocol_registry;
g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (uri, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+ protocol_registry = modest_runtime_get_protocol_registry ();
/* proto */
key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_PROTO, TRUE);
ok = modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_transport_store_protocol_name(proto),
+ modest_protocol_get_name (modest_protocol_registry_get_protocol_by_type (protocol_registry, proto)),
NULL);
if (!ok) {
g_printerr ("modest: error getting list '%s': %s\n", keyname,
err->message);
g_error_free (err);
- retval = FALSE;
+ retval = NULL;
}
return retval;
}
return found;
}
+static gboolean
+server_accounts_equal (ModestServerAccountSettings *s1,
+ ModestServerAccountSettings *s2)
+{
+ const gchar *str1, *str2;
+
+ if (modest_server_account_settings_get_protocol (s1) !=
+ modest_server_account_settings_get_protocol (s2))
+ return FALSE;
+
+ str1 = modest_server_account_settings_get_username (s1);
+ str2 = modest_server_account_settings_get_username (s2);
+ if (str1 && str2 && (str1 != str2) &&
+ strcmp (str1, str2) != 0)
+ return FALSE;
+
+ str1 = modest_server_account_settings_get_hostname (s1);
+ str2 = modest_server_account_settings_get_hostname (s2);
+ if (str1 && str2 && (str1 != str2) &&
+ strcmp (str1, str2) != 0)
+ return FALSE;
+
+ if (modest_server_account_settings_get_port (s1) !=
+ modest_server_account_settings_get_port (s2))
+ return FALSE;
+
+ return TRUE;
+}
+
+gboolean
+modest_account_mgr_check_already_configured_account (ModestAccountMgr *self,
+ ModestAccountSettings *settings)
+{
+ GSList *account_names = NULL;
+ GSList *cursor = NULL;
+ ModestServerAccountSettings *server_settings;
+
+ cursor = account_names = modest_account_mgr_account_names (self,
+ TRUE /* enabled accounts, because disabled accounts are not user visible. */);
+
+ gboolean found = FALSE;
+
+ server_settings = modest_account_settings_get_store_settings (settings);
+ if (!server_settings) {
+ g_printerr ("modest: couldn't get store settings from settings");
+ modest_account_mgr_free_account_names (account_names);
+ return FALSE;
+ }
+
+ /* Look at each non-server account to check their display names; */
+ while (cursor && !found) {
+ const gchar *account_name;
+ ModestAccountSettings *from_mgr_settings;
+ ModestServerAccountSettings *from_mgr_server_settings;
+
+ account_name = (gchar*)cursor->data;
+ from_mgr_settings = modest_account_mgr_load_account_settings (self, account_name);
+ if (!settings) {
+ g_printerr ("modest: failed to get account data for %s\n", account_name);
+ continue;
+ }
+
+ from_mgr_server_settings = modest_account_settings_get_store_settings (from_mgr_settings);
+ if (server_settings) {
+ if (server_accounts_equal (from_mgr_server_settings, server_settings)) {
+ found = TRUE;
+ }
+ g_object_unref (from_mgr_server_settings);
+ } else {
+ g_printerr ("modest: couldn't get store settings from account %s", account_name);
+ }
+ g_object_unref (from_mgr_settings);
+ cursor = cursor->next;
+ }
+
+ g_object_unref (server_settings);
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
+
+ return found;
+}
+
modest_account_mgr_notify_account_update (ModestAccountMgr* self,
const gchar *server_account_name)
{
- ModestTransportStoreProtocol proto;
+ ModestProtocolType proto;
ModestAccountMgrPrivate* priv;
+ ModestProtocolRegistry *protocol_registry;
gchar *proto_name = NULL;
g_return_if_fail (self);
g_return_if_fail (server_account_name);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+ protocol_registry = modest_runtime_get_protocol_registry ();
/* Get protocol */
proto_name = modest_account_mgr_get_string (self, server_account_name,
MODEST_ACCOUNT_PROTO, TRUE);
if (!proto_name) {
- g_free (proto_name);
g_return_if_reached ();
+ return;
}
- proto = modest_protocol_info_get_transport_store_protocol (proto_name);
+ proto = modest_protocol_get_type_id (modest_protocol_registry_get_protocol_by_name (protocol_registry,
+ MODEST_PROTOCOL_REGISTRY_TRANSPORT_STORE_PROTOCOLS,
+ proto_name));
g_free (proto_name);
/* there is some update in the account, so we can't
g_signal_emit (G_OBJECT(self),
signals[ACCOUNT_CHANGED_SIGNAL], 0,
server_account_name,
- (modest_protocol_info_protocol_is_store (proto)) ?
+ (modest_protocol_registry_protocol_type_has_tag (protocol_registry, proto, MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS)) ?
TNY_ACCOUNT_TYPE_STORE :
TNY_ACCOUNT_TYPE_TRANSPORT);
}
g_printerr ("modest: failed to get '%s': %s\n",
MODEST_CONF_DEFAULT_ACCOUNT, err->message);
g_error_free (err);
- g_free (account);
return NULL;
}
const gchar *account_name,
const gchar *display_name)
{
+ gboolean notify = TRUE;
+
+ if (!modest_account_mgr_get_display_name (self, account_name))
+ notify = FALSE;
+
modest_account_mgr_set_string (self,
account_name,
MODEST_ACCOUNT_DISPLAY_NAME,
FALSE /* not server account */);
/* Notify about the change in the display name */
- g_signal_emit (self, signals[DISPLAY_NAME_CHANGED_SIGNAL], 0, account_name);
+ if (notify)
+ g_signal_emit (self, signals[DISPLAY_NAME_CHANGED_SIGNAL], 0, account_name);
}
projects / modest / blobdiff