#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>
gchar *cache_dir;
TnySessionCamel *tny_session_camel;
+ TnyDeviceIface *device;
ModestAccountMgr *modest_acc_mgr;
};
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;
MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
priv->modest_acc_mgr = NULL;
+ priv->device = NULL;
priv->store_accounts = NULL;
priv->transport_accounts = NULL;
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);
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_warning ("Cannot create TnySessionCamel instance");
g_object_unref (obj);
return NULL;
}
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;
ModestTnyAccountStorePrivate *priv;
gchar *val;
- g_message (__FUNCTION__);
-
g_return_val_if_fail (account, NULL);
key = tny_account_iface_get_id (account);
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)
- {
- /* 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);
-
+ 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;
+ return val;
}
}
-
static void
modest_tny_account_store_add_store_account (TnyAccountStoreIface *self,
TnyStoreAccountIface *account)
}
-
static void
modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self,
TnyTransportAccountIface *account)
}
-
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,
MODEST_ACCOUNT_PROTO, NULL);
return NULL;
}
-
/* hostname */
val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
MODEST_ACCOUNT_HOSTNAME,
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 const GList*
modest_tny_account_store_get_store_accounts (TnyAccountStoreIface *iface)
{
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
- GSList *accounts, *cursor;
+ GSList *accounts;
GList *tny_accounts;
g_return_val_if_fail (iface, 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
}
-
static const GList*
modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface)
{
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
- GSList *accounts, *cursor;
+ GSList *accounts;
GList *tny_accounts;
g_return_val_if_fail (iface, 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;
-
}
projects / modest / blobdiff