projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* add missing include for time.h
[modest]
/
src
/
modest-tny-account-store.c
diff --git
a/src/modest-tny-account-store.c
b/src/modest-tny-account-store.c
index
d2cbab4
..
254c775
100644
(file)
--- a/
src/modest-tny-account-store.c
+++ b/
src/modest-tny-account-store.c
@@
-85,7
+85,7
@@
modest_tny_account_store_get_type (void)
my_type = g_type_register_static (TNY_TYPE_ACCOUNT_STORE,
"ModestTnyAccountStore", &my_info, 0);
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;
&iface_info);
}
return my_type;
@@
-221,8
+221,6
@@
get_password (TnyAccountIface *account, const gchar *prompt)
ModestTnyAccountStorePrivate *priv;
gchar *val;
ModestTnyAccountStorePrivate *priv;
gchar *val;
- g_message (__FUNCTION__);
-
g_return_val_if_fail (account, NULL);
key = tny_account_iface_get_id (account);
g_return_val_if_fail (account, NULL);
key = tny_account_iface_get_id (account);
@@
-341,7
+339,8
@@
tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
TNY_ACCOUNT_STORE_IFACE(self));
/* id */
tny_account_iface_set_id (tny_account, key);
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);
/* proto */
val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
MODEST_ACCOUNT_PROTO, NULL);
@@
-354,7
+353,6
@@
tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
return NULL;
}
return NULL;
}
-
/* hostname */
val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
MODEST_ACCOUNT_HOSTNAME,
/* hostname */
val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
MODEST_ACCOUNT_HOSTNAME,
@@
-429,12
+427,9
@@
modest_tny_account_store_get_store_accounts (TnyAccountStoreIface *iface)
MODEST_PROTO_TYPE_STORE,
NULL, FALSE);
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);
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
/*
* FIXME: after gconf notification support is added,
* we can simply return priv->store_account
@@
-502,9
+497,6
@@
tny_account_store_get_session (TnyAccountStore *self)
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(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;
}
return priv->tny_session_camel;
}
@@
-541,7
+533,9
@@
modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
static const TnyDeviceIface*
modest_tny_account_store_get_device (TnyAccountStoreIface *self)
{
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;
}
return priv->device;
}