-/* 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>
#include <tny-store-account-iface.h>
#include <tny-transport-account-iface.h>
#include <tny-device-iface.h>
+#include <tny-device.h>
#include <tny-account-store.h>
#include <tny-store-account.h>
LAST_SIGNAL
};
+/* Password Status */
+enum {
+ PW_NOT_INVALID,
+ PW_INVALID
+};
+
+static const gchar *transport_protocols[] = { "smtp", NULL };
+
typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
struct _ModestTnyAccountStorePrivate {
+ GMutex *store_lock;
+ GMutex *transport_lock;
GList *store_accounts;
GList *transport_accounts;
gchar *cache_dir;
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, \
my_type = g_type_register_static (TNY_TYPE_ACCOUNT_STORE,
"ModestTnyAccountStore", &my_info, 0);
- g_type_add_interface_static (my_type, TNY_TYPE_ACCOUNT_STORE_IFACE,
+ g_type_add_interface_static (my_type, TNY_TYPE_ACCOUNT_STORE_IFACE,
&iface_info);
}
return my_type;
g_signal_new ("password_requested",
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET(ModestTnyAccountStoreClass,password_requested),
+ G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
priv->modest_acc_mgr = NULL;
+ priv->device = NULL;
+ priv->store_lock = NULL;
+ priv->transport_lock = NULL;
priv->store_accounts = NULL;
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;
}
return NULL;
}
-
-static void
-modest_tny_account_store_finalize (GObject *obj)
-{
- ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj);
- ModestTnyAccountStorePrivate *priv =
- MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- if (priv->modest_acc_mgr) {
- g_object_unref (G_OBJECT(priv->modest_acc_mgr));
- priv->modest_acc_mgr = NULL;
- }
-
- if (priv->tny_session_camel) {
- g_object_unref (G_OBJECT(priv->tny_session_camel));
- priv->tny_session_camel = NULL;
- }
-
- priv->store_accounts = free_gobject_list (priv->store_accounts);
- priv->transport_accounts = free_gobject_list (priv->store_accounts);
-
- g_free (priv->cache_dir);
- priv->cache_dir = NULL;
-
-
-
-}
-
-GObject*
-modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr)
-{
- GObject *obj;
- ModestTnyAccountStorePrivate *priv;
-
- g_return_val_if_fail (modest_acc_mgr, NULL);
-
- 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(priv->modest_acc_mgr = modest_acc_mgr));
-
- priv->tny_session_camel = tny_session_camel_new
- (TNY_ACCOUNT_STORE_IFACE(obj));
- if (!priv->tny_session_camel) {
- g_warning ("cannot create TnySessionCamel instance");
- g_object_unref (obj);
- return NULL;
- }
-
- return obj;
-}
-
-
static gchar*
-get_password (TnyAccountIface *account, const gchar *prompt)
-{
+get_password (TnyAccountIface *account,
+ const gchar *prompt,
+ gboolean *cancel) {
+
const gchar *key;
const TnyAccountStoreIface *account_store;
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
- gchar *val;
-
- g_message (__FUNCTION__);
+ 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 || strlen(val)==0)
- {
- g_message("Key vor Aufruf: %s", key);
- /* g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key); */
- g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key);
-
-<<<<<<< .mine
- }
-
- return val;
-=======
- return val;
->>>>>>> .r67
+ 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) {
-
-
-static gboolean
-add_account (TnyAccountStoreIface *self, TnyAccountIface *account)
-{
- TnyAccountIface *account_iface;
- ModestTnyAccountStore *account_store;
+ ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
+ const TnyAccountStoreIface *account_store;
- const gchar* account_name;
- const gchar *hostname, *username, *proto;
-
- g_return_val_if_fail (self, FALSE);
- g_return_val_if_fail (account, FALSE);
-
- account_iface = TNY_ACCOUNT_IFACE(account);
- account_store = MODEST_TNY_ACCOUNT_STORE(self);
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- account_name = tny_account_iface_get_id(account_iface);
- if (!account_name) {
- g_warning ("failed to retrieve account name");
- return FALSE;
- }
-
- hostname = tny_account_iface_get_hostname(account_iface);
- username = tny_account_iface_get_user(account_iface);
- proto = tny_account_iface_get_proto(account_iface);
-
- return modest_account_mgr_add_server_account (priv->modest_acc_mgr,
- account_name,
- hostname, username, NULL,
- proto);
-}
-
-
-
-static void
-modest_tny_account_store_add_store_account (TnyAccountStoreIface *self,
- TnyStoreAccountIface *account)
-{
- if (!add_account (self, TNY_ACCOUNT_IFACE(account)))
- g_warning ("failed to add store account");
-}
-
-
+ account_store = tny_account_iface_get_account_store(account);
+ self = MODEST_TNY_ACCOUNT_STORE (account_store);
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-static void
-modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self,
- TnyTransportAccountIface *account)
-{
- if (!add_account (self, TNY_ACCOUNT_IFACE(account)))
- g_warning ("failed to add transport account");
+ priv->pw_invalid=PW_INVALID;
}
-
static TnyAccountIface*
tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
gboolean is_store)
TNY_ACCOUNT_STORE_IFACE(self));
/* 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,
return NULL;
}
-
/* hostname */
val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
MODEST_ACCOUNT_HOSTNAME,
}
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;
}
while (cursor) {
TnyAccountIface *tny_account;
- gchar *key = cursor->data;
tny_account = tny_account_from_key (self, (gchar*)cursor->data,
is_store);
if (!tny_account) {
}
+static void
+manager_new_account (ModestAccountMgr *modest_acc_mgr, gchar *name, gpointer data)
+{
+ ModestTnyAccountStore *self = data;
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ TnyAccountIface *new_account;
+ 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;
+ break;
+ }
+ 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->store_accounts = g_list_append (priv->store_accounts, new_account);
+ g_mutex_unlock (priv->store_lock);
+ } else {
+ new_account = tny_account_from_key (self, name, is_store);
+ g_mutex_lock (priv->transport_lock);
+ priv->transport_accounts = g_list_append (priv->transport_accounts, new_account);
+ g_mutex_unlock (priv->transport_lock);
+ }
+ g_signal_emit (self,
+ tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNT_INSERTED], 0, new_account);
+}
+
+
+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,
+ 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)) {
+ account = acc;
+ break;
+ }
+ }
+
+ if (!account)
+ for (iter = priv->transport_accounts; iter; iter = iter->next) {
+ TnyAccountIface *acc = iter->data;
+ if (!strcmp (tny_account_iface_get_name (acc), accountname)) {
+ account = acc;
+ 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);
+}
+
+
+static void
+modest_tny_account_store_finalize (GObject *obj)
+{
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj);
+ ModestTnyAccountStorePrivate *priv =
+ MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ 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_CALLBACK(manager_remove_account), NULL);
+ 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;
+ }
+
+ if (priv->tny_session_camel) {
+ g_object_unref (G_OBJECT(priv->tny_session_camel));
+ priv->tny_session_camel = NULL;
+ }
+
+ if (priv->device) {
+ g_object_unref (G_OBJECT(priv->device));
+ priv->device = 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) {
+
+ GObject *obj;
+ ModestTnyAccountStorePrivate *priv;
+
+ g_return_val_if_fail (modest_acc_mgr, NULL);
+
+ 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;
+ }
+ priv->tny_session_camel = tny_session_camel_new
+ (TNY_ACCOUNT_STORE_IFACE(obj));
+ if (!priv->tny_session_camel) {
+ g_warning ("Cannot create TnySessionCamel instance");
+ g_object_unref (obj);
+ return NULL;
+ }
+
+ 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_CALLBACK(manager_remove_account), obj);
+ 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) {
+
+ TnyAccountIface *account_iface;
+ ModestTnyAccountStore *account_store;
+ ModestTnyAccountStorePrivate *priv;
+
+ const gchar *account_name;
+ const gchar *hostname, *username, *proto;
+
+ g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (account, FALSE);
+
+ account_iface = TNY_ACCOUNT_IFACE(account);
+ account_store = MODEST_TNY_ACCOUNT_STORE(self);
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ account_name = tny_account_iface_get_id(account_iface);
+ if (!account_name) {
+ g_warning ("failed to retrieve account name");
+ return FALSE;
+ }
+
+ hostname = tny_account_iface_get_hostname(account_iface);
+ username = tny_account_iface_get_user(account_iface);
+ proto = tny_account_iface_get_proto(account_iface);
+
+ return modest_account_mgr_add_server_account (priv->modest_acc_mgr,
+ account_name,
+ hostname, username, NULL,
+ proto);
+}
+
+
+static void
+modest_tny_account_store_add_store_account (TnyAccountStoreIface *self,
+ TnyStoreAccountIface *account)
+{
+ if (!add_account (self, TNY_ACCOUNT_IFACE(account)))
+ g_warning ("failed to add store account");
+}
+
+
+static void
+modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self,
+ TnyTransportAccountIface *account)
+{
+ if (!add_account (self, TNY_ACCOUNT_IFACE(account)))
+ g_warning ("failed to add transport account");
+}
+
static const GList*
modest_tny_account_store_get_store_accounts (TnyAccountStoreIface *iface)
{
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
- GSList *accounts, *cursor;
- GList *tny_accounts;
+ GSList *accounts;
g_return_val_if_fail (iface, NULL);
self = MODEST_TNY_ACCOUNT_STORE(iface);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- accounts =
- modest_account_mgr_server_account_names (priv->modest_acc_mgr,
- NULL,
- MODEST_PROTO_TYPE_STORE,
- NULL, FALSE);
-
- g_message ("accounts: %d", g_slist_length (accounts));
- tny_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE);
- g_slist_free (accounts);
- g_message ("store accounts: %d", g_list_length (tny_accounts));
-
-
- /*
- * FIXME: after gconf notification support is added,
- * we can simply return priv->store_account
- */
- priv->store_accounts = free_gobject_list (priv->store_accounts);
- priv->store_accounts = tny_accounts;
+ if (!priv->store_accounts) {
+ accounts =
+ modest_account_mgr_server_account_names (priv->modest_acc_mgr,
+ NULL,
+ MODEST_PROTO_TYPE_STORE,
+ NULL, FALSE);
+
+ g_mutex_lock (priv->store_lock);
+ priv->store_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE);
+ g_mutex_unlock (priv->store_lock);
+ g_slist_free (accounts);
+ }
- return tny_accounts;
+ return priv->store_accounts;
}
-
static const GList*
modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface)
{
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
- GSList *accounts, *cursor;
- GList *tny_accounts;
+ GSList *accounts;
g_return_val_if_fail (iface, NULL);
self = MODEST_TNY_ACCOUNT_STORE(iface);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- accounts =
- modest_account_mgr_server_account_names (priv->modest_acc_mgr,
- NULL,
- MODEST_PROTO_TYPE_TRANSPORT,
- NULL, FALSE);
- tny_accounts = tny_accounts_from_server_accounts (self, accounts, FALSE);
- g_warning ("transport accounts: %d", g_list_length (tny_accounts));
- g_slist_free (accounts);
+ if (!priv->transport_accounts) {
+ accounts =
+ modest_account_mgr_server_account_names (priv->modest_acc_mgr,
+ NULL,
+ MODEST_PROTO_TYPE_TRANSPORT,
+ NULL, FALSE);
+ g_mutex_lock (priv->transport_lock);
+ priv->transport_accounts = tny_accounts_from_server_accounts (self, accounts, FALSE);
+ g_mutex_unlock (priv->transport_lock);
+ g_slist_free (accounts);
+ }
- /*
- * FIXME: after gconf notification support is added,
- * we can simply return priv->store_account
- */
- priv->transport_accounts = free_gobject_list (priv->transport_accounts);
- priv->transport_accounts = tny_accounts;
- return tny_accounts; /* FIXME: who will free this? */
+ return priv->transport_accounts;
}
-ModestAccountMgr *modest_tny_account_store_get_accout_mgr(ModestTnyAccountStore *self)
+ModestAccountMgr
+*modest_tny_account_store_get_accout_mgr(ModestTnyAccountStore *self)
{
ModestTnyAccountStorePrivate *priv;
g_return_val_if_fail (self, NULL);
}
-
TnySessionCamel*
tny_account_store_get_session (TnyAccountStore *self)
{
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- g_message ("returning tny session camel %p",
- priv->tny_session_camel);
-
return priv->tny_session_camel;
}
-
/**
* modest_tny_account_store_get_cache_dir:
* @self: self a TnyAccountStoreIface instance
ModestTnyAccountStorePrivate *priv;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- gchar *cache_dir;
-
if (!priv->cache_dir) {
if (g_getenv("HOME") != NULL)
priv->cache_dir = g_strconcat(g_getenv("HOME"),
}
-
static const TnyDeviceIface*
modest_tny_account_store_get_device (TnyAccountStoreIface *self)
{
- return NULL; /* FIXME */
-}
+ ModestTnyAccountStorePrivate *priv;
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+ return priv->device;
+}
static void
klass = (TnyAccountStoreIfaceClass *)g_iface;
- klass->add_store_account_func =
+ klass->add_store_account_func =
modest_tny_account_store_add_store_account;
- klass->get_store_accounts_func =
+ klass->get_store_accounts_func =
modest_tny_account_store_get_store_accounts;
- klass->add_transport_account_func =
+ klass->add_transport_account_func =
modest_tny_account_store_add_transport_account;
- klass->get_transport_accounts_func =
+ klass->get_transport_accounts_func =
modest_tny_account_store_get_transport_accounts;
klass->get_cache_dir_func =
modest_tny_account_store_get_cache_dir;
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