#include <string.h>
-#include <tny-account-store-iface.h>
#include <tny-account-iface.h>
#include <tny-account-store-iface.h>
-
-#include <tny-account-iface.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>
#include <tny-transport-account.h>
/* list my signals */
enum {
- /* MY_SIGNAL_1, */
- /* MY_SIGNAL_2, */
+ PASSWORD_REQUESTED_SIGNAL,
LAST_SIGNAL
};
typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
struct _ModestTnyAccountStorePrivate {
- ModestAccountMgr *modest_acc_mgr;
+
+ GList *store_accounts;
+ GList *transport_accounts;
+ gchar *cache_dir;
+
+ TnySessionCamel *tny_session_camel;
+ TnyDeviceIface *device;
+
+ ModestAccountMgr *modest_acc_mgr;
};
#define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_TNY_ACCOUNT_STORE, \
/* globals */
static GObjectClass *parent_class = NULL;
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
+static guint signals[LAST_SIGNAL] = {0};
GType
modest_tny_account_store_get_type (void)
1, /* n_preallocs */
(GInstanceInitFunc) modest_tny_account_store_init,
};
-
+
static const GInterfaceInfo iface_info = {
- (GInterfaceInitFunc) modest_tny_account_store_iface_init,
+ (GInterfaceInitFunc) modest_tny_account_store_iface_init,
NULL, /* interface_finalize */
NULL /* interface_data */
};
+ /* hack hack */
+ my_type = g_type_register_static (TNY_TYPE_ACCOUNT_STORE,
+ "ModestTnyAccountStore", &my_info, 0);
- my_type = g_type_register_static (G_TYPE_OBJECT,
- "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;
}
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_tny_account_store_finalize;
- g_type_class_add_private (gobject_class, sizeof(ModestTnyAccountStorePrivate));
-
- /* signal definitions go here, e.g.: */
-/* signals[MY_SIGNAL_1] = */
-/* g_signal_new ("my_signal_1",....); */
-/* signals[MY_SIGNAL_2] = */
-/* g_signal_new ("my_signal_2",....); */
-/* etc. */
+ g_type_class_add_private (gobject_class,
+ sizeof(ModestTnyAccountStorePrivate));
+
+ signals[PASSWORD_REQUESTED_SIGNAL] =
+ g_signal_new ("password_requested",
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET(ModestTnyAccountStoreClass,password_requested),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
}
static void
{
ModestTnyAccountStorePrivate *priv =
MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
-
+
priv->modest_acc_mgr = NULL;
+ priv->device = NULL;
+
+ priv->store_accounts = NULL;
+ priv->transport_accounts = NULL;
+ priv->cache_dir = NULL;
+
+ priv->tny_session_camel = NULL;
}
+
+static void
+free_gobject (GObject *obj, gpointer user_data)
+{
+ if (obj)
+ g_object_unref (obj);
+}
+
+
+static GList*
+free_gobject_list (GList *list)
+{
+ if (list) {
+ g_list_foreach (list, (GFunc)free_gobject, NULL);
+ g_list_free (list);
+ }
+ 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;
+ }
+
+ if (priv->device) {
+ g_object_unref (G_OBJECT(priv->device));
+ priv->device = 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*
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->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;
+ }
+
return obj;
}
-
-/* FIXME: tinymail needs to change here */
-/* a gpointer arg to get_password should be enough */
static gchar*
get_password (TnyAccountIface *account, const gchar *prompt)
{
- g_warning ("%s: %s", __FUNCTION__, prompt);
- return g_strdup("djcb123");
+ const gchar *key;
+ const TnyAccountStoreIface *account_store;
+ ModestTnyAccountStore *self;
+ ModestTnyAccountStorePrivate *priv;
+ gchar *val;
+
+ g_return_val_if_fail (account, NULL);
+
+ key = tny_account_iface_get_id (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);
+
+ 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;
}
add_account (TnyAccountStoreIface *self, TnyAccountIface *account)
{
TnyAccountIface *account_iface;
- ModestTnyAccountStore *account_store;
+ ModestTnyAccountStore *account_store;
ModestTnyAccountStorePrivate *priv;
- const gchar* account_name;
+ const gchar* account_name;
const gchar *hostname, *username, *proto;
- g_warning (__FUNCTION__);
-
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");
-
static TnyAccountIface*
tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
gboolean is_store)
else
tny_account = TNY_ACCOUNT_IFACE(tny_transport_account_new ());
- tny_account_iface_set_account_store (tny_account,
+ if (!tny_account) {
+ g_warning ("failed to create new tny %s account",
+ is_store ? "store" : "transport");
+ return NULL;
+ }
+
+ tny_account_iface_set_account_store (TNY_ACCOUNT_IFACE(tny_account),
TNY_ACCOUNT_STORE_IFACE(self));
/* id */
tny_account_iface_set_id (tny_account, key);
+ /* proto */
+ val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
+ MODEST_ACCOUNT_PROTO, NULL);
+ if (val) {
+ tny_account_iface_set_proto (tny_account, val);
+ g_free (val);
+ } else {
+ g_warning ("protocol not defined for %s", key);
+ g_object_unref (G_OBJECT(tny_account));
+ return NULL;
+ }
+
+
/* hostname */
- val = modest_account_mgr_get_account_string (priv->modest_acc_mgr, key,
- MODEST_ACCOUNT_HOSTNAME, NULL);
- g_warning (val);
- tny_account_iface_set_hostname (tny_account, val);
- g_free (val);
+ val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
+ MODEST_ACCOUNT_HOSTNAME,
+ NULL);
+ if (val) {
+ tny_account_iface_set_hostname (tny_account, val);
+ g_free (val);
+ }
- /* username */
- val = modest_account_mgr_get_account_string (priv->modest_acc_mgr, key,
- MODEST_ACCOUNT_USERNAME, NULL);
- g_warning (val);
- tny_account_iface_set_user (tny_account, val);
- g_free (val);
- /* proto */
- val = modest_account_mgr_get_account_string (priv->modest_acc_mgr, key,
- MODEST_ACCOUNT_PROTO, NULL);
- g_warning (val);
- tny_account_iface_set_proto (tny_account, val);
- g_free (val);
+ /* username */
+ val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
+ MODEST_ACCOUNT_USERNAME,
+ NULL);
+ if (val) {
+ tny_account_iface_set_user (tny_account, val);
+ g_free (val);
+ }
- g_warning ("set_pass");
- 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_pass_func (tny_account, get_password);
+ tny_account_iface_set_forget_pass_func (tny_account, forget_password);
return tny_account;
}
{
GSList *cursor = accounts;
GList *tny_accounts = NULL;
-
+
g_return_val_if_fail (self, NULL);
-
+
while (cursor) {
TnyAccountIface *tny_account;
- tny_account = tny_account_from_key (self, (gchar*)cursor->data, is_store);
+ gchar *key = cursor->data;
+ tny_account = tny_account_from_key (self, (gchar*)cursor->data,
+ is_store);
if (!tny_account) {
g_warning ("could not create tnyaccount for %s",
(gchar*)cursor->data);
} else {
- g_warning ("added %s",(gchar*)cursor->data);
tny_accounts =
g_list_append (tny_accounts, tny_account);
}
-
static const GList*
modest_tny_account_store_get_store_accounts (TnyAccountStoreIface *iface)
{
ModestTnyAccountStorePrivate *priv;
GSList *accounts, *cursor;
GList *tny_accounts;
-
+
g_return_val_if_fail (iface, NULL);
- g_warning ("i'm being called: %s", __FUNCTION__);
-
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_warning ("accounts: %d", g_slist_length (accounts));
tny_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE);
g_slist_free (accounts);
- g_warning ("store accounts: %d", g_list_length (tny_accounts));
- return tny_accounts; /* FIXME: who will free this? */
+ /*
+ * 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;
+
+ return tny_accounts;
}
-
+
static const GList*
ModestTnyAccountStorePrivate *priv;
GSList *accounts, *cursor;
GList *tny_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,
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? */
}
-
+
+
+ModestAccountMgr
+*modest_tny_account_store_get_accout_mgr(ModestTnyAccountStore *self)
+{
+ ModestTnyAccountStorePrivate *priv;
+ g_return_val_if_fail (self, NULL);
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ return priv->modest_acc_mgr;
+}
+
+
+
+TnySessionCamel*
+tny_account_store_get_session (TnyAccountStore *self)
+{
+ ModestTnyAccountStorePrivate *priv;
+ g_return_val_if_fail (self, NULL);
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ return priv->tny_session_camel;
+}
+
+
/**
* modest_tny_account_store_get_cache_dir:
* @self: self a TnyAccountStoreIface instance
- *
+ *
* returns the pathname of the cache directory
*
- * Returns: a newly allocated string with the value of the pathname
+ * Returns: a string with the value of the pathname
* to the cache directory or NULL if the environment variable $HOME is
- * not set,
- * pointer has to be freed by caller
+ * not set. string should _not_ be freed by caller
*/
static const gchar*
modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
{
-gchar *cache_dir;
+ ModestTnyAccountStorePrivate *priv;
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- if (g_getenv("HOME") != NULL)
- cache_dir = g_strconcat(g_getenv("HOME"), "/.modest/cache/", NULL);
- else
- cache_dir = NULL;
+ gchar *cache_dir;
+
+ if (!priv->cache_dir) {
+ if (g_getenv("HOME") != NULL)
+ priv->cache_dir = g_strconcat(g_getenv("HOME"),
+ "/.modest/cache/", NULL);
+ }
+ return priv->cache_dir;
+}
- return cache_dir;
+
+
+static const TnyDeviceIface*
+modest_tny_account_store_get_device (TnyAccountStoreIface *self)
+{
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+ return priv->device;
}
TnyAccountStoreIfaceClass *klass;
g_return_if_fail (g_iface);
-
+
klass = (TnyAccountStoreIfaceClass *)g_iface;
klass->add_store_account_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;
-}
+ modest_tny_account_store_get_cache_dir;
+ klass->get_device_func =
+ modest_tny_account_store_get_device;
+}
projects / modest / blobdiff