-/* modest-tny-account-store.c */
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
-/* insert (c)/licensing information) */
+/* modest-tny-account-store.c */
#include <string.h>
LAST_SIGNAL
};
+/* Password Status */
+enum {
+ PW_NOT_INVALID,
+ PW_INVALID
+};
+
static const gchar *transport_protocols[] = { "smtp", NULL };
typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
TnySessionCamel *tny_session_camel;
TnyDeviceIface *device;
- ModestAccountMgr *modest_acc_mgr;
+ ModestAccountMgr *modest_acc_mgr;
+ gint pw_invalid;
+ ModestTnyGetPassFunc get_pass_func;
};
#define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_TNY_ACCOUNT_STORE, \
priv->transport_accounts = NULL;
priv->cache_dir = NULL;
- priv->tny_session_camel = NULL;
+ priv->tny_session_camel = NULL;
+ /* Meaning: if not indicated otherwise, we have valid password data */
+ priv->pw_invalid = PW_NOT_INVALID;
+ priv->get_pass_func = NULL;
}
}
static gchar*
-get_password (TnyAccountIface *account, const gchar *prompt, gboolean *cancel)
-{
+get_password (TnyAccountIface *account,
+ const gchar *prompt,
+ gboolean *cancel) {
+
const gchar *key;
const TnyAccountStoreIface *account_store;
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
- gchar *val;
+ gchar *retval;
g_return_val_if_fail (account, NULL);
account_store = tny_account_iface_get_account_store(account);
self = MODEST_TNY_ACCOUNT_STORE (account_store);
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
- MODEST_ACCOUNT_PASSWORD, NULL);
- if (!val) {
- /* FIXME:
- * append the prompt to the emitted signal,
- * so the password dialog shows the prompt supplied by the caller of this function.
- */
- g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key);
- }
-
- return val;
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ if (priv->pw_invalid==PW_NOT_INVALID) {
+ retval = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr,
+ key,
+ MODEST_ACCOUNT_PASSWORD,
+ NULL);
+ } else {
+ retval = priv->get_pass_func(account, prompt, cancel);
+ if (!*cancel)
+ {
+ priv->pw_invalid=PW_NOT_INVALID;
+ modest_account_mgr_set_server_account_string(priv->modest_acc_mgr,
+ key,
+ MODEST_ACCOUNT_PASSWORD,
+ retval,
+ NULL);
+ }
+ }
+ return retval;
}
static void
-forget_password (TnyAccountIface *account)
-{
- g_warning (__FUNCTION__);
+forget_password (TnyAccountIface *account) {
+
+ ModestTnyAccountStore *self;
+ ModestTnyAccountStorePrivate *priv;
+ const TnyAccountStoreIface *account_store;
+
+ account_store = tny_account_iface_get_account_store(account);
+ self = MODEST_TNY_ACCOUNT_STORE (account_store);
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ priv->pw_invalid=PW_INVALID;
}
/* id */
tny_account_iface_set_id (tny_account, key);
tny_account_iface_set_name (tny_account, key);
-
+
/* proto */
val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
MODEST_ACCOUNT_PROTO, NULL);
}
tny_account_iface_set_pass_func (tny_account, get_password);
- tny_account_iface_set_forget_pass_func (tny_account, forget_password);
+ tny_account_iface_set_forget_pass_func (tny_account, forget_password);
return tny_account;
}
}
-static void
+static void
manager_new_account (ModestAccountMgr *modest_acc_mgr, gchar *name, gpointer data)
{
ModestTnyAccountStore *self = data;
gchar *proto;
gint i = 0;
gboolean is_store = TRUE;
-
+
g_print ("new account signal %s\n", name);
-
-
+
proto = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, name,
MODEST_ACCOUNT_PROTO, NULL);
if (!proto) {
g_printerr ("Cannot add account: unknown type.");
return;
}
-
+
while (transport_protocols [i]) {
if (!strcmp (transport_protocols [i], proto)) {
is_store = FALSE;
}
i++;
}
-
+
/* fill account lists */
if (!priv->store_accounts)
modest_tny_account_store_get_store_accounts (TNY_ACCOUNT_STORE_IFACE(self));
if (!priv->transport_accounts)
modest_tny_account_store_get_transport_accounts (TNY_ACCOUNT_STORE_IFACE(self));
-
+
if (is_store) {
new_account = tny_account_from_key (self, name, is_store);
g_mutex_lock (priv->store_lock);
priv->transport_accounts = g_list_append (priv->transport_accounts, new_account);
g_mutex_unlock (priv->transport_lock);
}
- g_signal_emit (self,
+ g_signal_emit (self,
tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNT_INSERTED], 0, new_account);
}
-static void
+static void
manager_remove_account (ModestAccountMgr *modest_acc_mgr, gchar *name, gpointer data)
{
g_print ("remove account signal %s\n", name);
}
-static void
-manager_change_account (ModestAccountMgr *modest_acc_mgr, gchar *accountname,
+static void
+manager_change_account (ModestAccountMgr *modest_acc_mgr, gchar *accountname,
gchar *key, gchar* value, gpointer data)
{
ModestTnyAccountStore *self = data;
ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
GList *iter;
TnyAccountIface *account = NULL;
-
+
g_print ("account change signal: account: %s key: %s value: %s\n", accountname, key, value);
-
+
/* fill account lists */
if (!priv->store_accounts)
modest_tny_account_store_get_store_accounts (TNY_ACCOUNT_STORE_IFACE(self));
if (!priv->transport_accounts)
modest_tny_account_store_get_transport_accounts (TNY_ACCOUNT_STORE_IFACE(self));
-
+
for (iter = priv->store_accounts; iter; iter = iter->next) {
TnyAccountIface *acc = iter->data;
if (!strcmp (tny_account_iface_get_name (acc), accountname)) {
break;
}
}
-
+
if (!account)
for (iter = priv->transport_accounts; iter; iter = iter->next) {
TnyAccountIface *acc = iter->data;
break;
}
}
-
+
if (!account) {
g_printerr ("Couldn't find account - returning without applying changes.");
return;
}
-
+
g_mutex_lock (priv->store_lock);
g_mutex_lock (priv->transport_lock);
-
+
if (!strcmp (key, MODEST_ACCOUNT_HOSTNAME))
tny_account_iface_set_hostname (account, value);
if (!strcmp (key, MODEST_ACCOUNT_USERNAME))
tny_account_iface_set_user (account, value);
-
+
g_mutex_unlock (priv->transport_lock);
g_mutex_unlock (priv->store_lock);
-
+
/* TODO: handle protocol and password changes */
-
g_signal_emit (self,
tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNTS_RELOADED], 0);
-
}
ModestTnyAccountStorePrivate *priv =
MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr),
+ g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr),
G_CALLBACK(manager_new_account), NULL);
- g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr),
+ g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr),
G_CALLBACK(manager_remove_account), NULL);
- g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr),
+ g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr),
G_CALLBACK(manager_change_account), NULL);
-
+
if (priv->modest_acc_mgr) {
g_object_unref (G_OBJECT(priv->modest_acc_mgr));
priv->modest_acc_mgr = NULL;
g_mutex_lock (priv->store_lock);
priv->store_accounts = free_gobject_list (priv->store_accounts);
g_mutex_unlock (priv->store_lock);
-
+
g_mutex_lock (priv->transport_lock);
priv->transport_accounts = free_gobject_list (priv->store_accounts);
g_mutex_unlock (priv->transport_lock);
g_mutex_free (priv->store_lock);
g_mutex_free (priv->transport_lock);
-
+
g_free (priv->cache_dir);
priv->cache_dir = NULL;
GObject*
-modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr)
-{
+modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr) {
+
GObject *obj;
ModestTnyAccountStorePrivate *priv;
obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL));
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
-
+
g_object_ref(G_OBJECT(modest_acc_mgr));
priv->modest_acc_mgr = modest_acc_mgr;
-
+
priv->store_lock = g_mutex_new ();
priv->transport_lock = g_mutex_new ();
-
+
priv->device = (TnyDeviceIface*)tny_device_new();
if (!priv->device) {
g_warning ("Cannot create Device instance");
g_object_unref (obj);
return NULL;
}
-
- g_signal_connect (G_OBJECT (modest_acc_mgr), "account-add",
+
+ g_signal_connect (G_OBJECT (modest_acc_mgr), "account-add",
G_CALLBACK(manager_new_account), obj);
- g_signal_connect (G_OBJECT (modest_acc_mgr), "account-remove",
+ g_signal_connect (G_OBJECT (modest_acc_mgr), "account-remove",
G_CALLBACK(manager_remove_account), obj);
- g_signal_connect (G_OBJECT (modest_acc_mgr), "account-change",
+ g_signal_connect (G_OBJECT (modest_acc_mgr), "account-change",
G_CALLBACK(manager_change_account), obj);
return obj;
static gboolean
-add_account (TnyAccountStoreIface *self, TnyAccountIface *account)
-{
+add_account (TnyAccountStoreIface *self, TnyAccountIface *account) {
+
TnyAccountIface *account_iface;
ModestTnyAccountStore *account_store;
ModestTnyAccountStorePrivate *priv;
priv->store_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE);
g_mutex_unlock (priv->store_lock);
g_slist_free (accounts);
- }
+ }
return priv->store_accounts;
}
self = MODEST_TNY_ACCOUNT_STORE(iface);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
+
if (!priv->transport_accounts) {
accounts =
modest_account_mgr_server_account_names (priv->modest_acc_mgr,
klass->get_device_func =
modest_tny_account_store_get_device;
}
+
+void
+modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self, ModestTnyGetPassFunc func) {
+
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ priv->get_pass_func=func;
+}
+
projects / modest / blobdiff