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);
}
+
+static void
+manager_new_account (ModestAccountMgr *modest_acc_mgr, gchar *name, gpointer data)
+{
+ g_print ("new account signal %s\n", name);
+}
+void
+manager_remove_account (ModestAccountMgr *modest_acc_mgr,gchar *name, gpointer data)
+{
+ g_print ("remove account signal %s\n", name);
+}
+void
+manager_change_account (ModestAccountMgr *modest_acc_mgr, gchar *accountname,
+ gchar *key, gchar* value, gpointer data)
+{
+ g_print ("account change signal: account: %s key: %s value: %s\n", accountname, key, value);
+}
+
GObject*
modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr)
{
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));
-
+
+ g_object_ref(G_OBJECT(modest_acc_mgr));
+ 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;
}
+
+#warning todo: disconnect on destruction
+ g_signal_connect (G_OBJECT (modest_acc_mgr), "account-add",
+ G_CALLBACK(manager_new_account), NULL);
+ g_signal_connect (G_OBJECT (modest_acc_mgr), "account-remove",
+ G_CALLBACK(manager_remove_account), NULL);
+ g_signal_connect (G_OBJECT (modest_acc_mgr), "account-change",
+ G_CALLBACK(manager_change_account), 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;
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);
-
+ 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;
}
ModestTnyAccountStore *account_store;
ModestTnyAccountStorePrivate *priv;
- const gchar* account_name;
+ const gchar *account_name;
const gchar *hostname, *username, *proto;
g_return_val_if_fail (self, FALSE);
}
-
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)
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;
- 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);
+ if (!priv->store_accounts) {
+ accounts =
+ modest_account_mgr_server_account_names (priv->modest_acc_mgr,
+ NULL,
+ MODEST_PROTO_TYPE_STORE,
+ NULL, FALSE);
- tny_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE);
- g_slist_free (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;
+ priv->store_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE);
+ 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);
+ priv->transport_accounts = tny_accounts_from_server_accounts (self, accounts, FALSE);
+ 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;
}
}
-
TnySessionCamel*
tny_account_store_get_session (TnyAccountStore *self)
{
}
-
/**
* 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)
{
- ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+ ModestTnyAccountStorePrivate *priv;
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
return priv->device;
}
-
static void
modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data)
{
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