+2007-07-02 Murray Cumming <murrayc@murrayc.com>
+
+ * src/modest-tny-account.h:
+ * src/modest-tny-account.c:
+ (modest_tny_account_new_from_server_account),
+ (modest_tny_account_new_from_server_account_name),
+ (modest_tny_account_new_from_account): Added a TnyCamelSession parameter,
+ because this must now be set before setting the proto. This is usd in
+ modest_tny_account_new_from_server_account(). It avoids a (maybe harmless)
+ warning in camel_session_get_service() caused by
+ tny_camel_transport_account_prepare().
+
+ * src/modest-tny-account-store.c: (get_server_accounts): Pass the new
+ session parameter.
+
2007-06-30 Johannes Schmid <johannes.schmid@openismus.com>
* src/maemo/modest-connection-specific-smtp-edit-window.c:
/**
* modest_tny_account_new_from_server_account:
* @account_mgr: a valid account mgr instance
- * @account_name: the server account name for which to create a corresponding tny account
+ * @session: A valid TnySessionCamel instance.
+ * @account_data: the server account for which to create a corresponding tny account
* @type: the type of account to create (TNY_ACCOUNT_TYPE_STORE or TNY_ACCOUNT_TYPE_TRANSPORT)
*
* get a tnyaccount corresponding to the server_accounts (store or transport) for this account.
*/
static TnyAccount*
modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
+ TnySessionCamel *session,
ModestServerAccountData *account_data)
{
gchar *url = NULL;
g_return_val_if_fail (account_mgr, NULL);
+ g_return_val_if_fail (session, NULL);
g_return_val_if_fail (account_data, NULL);
/* sanity checks */
}
tny_account_set_id (tny_account, account_data->account_name);
+ /* This must be set quite early, or other set() functions will fail. */
+ tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session);
+
/* Handle connection requests:
* This (badly-named) signal will be called when we try to use an offline account. */
g_signal_connect (G_OBJECT (tny_account), "connection-status-changed",
TnyAccount*
modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
- const gchar *server_account_name)
+ TnySessionCamel *session,
+ const gchar *server_account_name)
{
ModestServerAccountData *account_data =
modest_account_mgr_get_server_account_data (account_mgr,
return NULL;
TnyAccount *result = modest_tny_account_new_from_server_account (
- account_mgr, account_data);
+ account_mgr, session, account_data);
modest_account_mgr_free_server_account_data (account_mgr, account_data);
return NULL;
}
- tny_account = modest_tny_account_new_from_server_account (account_mgr, server_data);
+ tny_account = modest_tny_account_new_from_server_account (account_mgr, session, server_data);
if (!tny_account) {
g_printerr ("modest: failed to create tny account for %s (%s)\n",
account_data->account_name, server_data->account_name);
return NULL;
}
- tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
tny_account_set_forget_pass_func (tny_account,
forget_pass_func ? forget_pass_func : forget_pass_dummy);
tny_account_set_pass_func (tny_account,
/**
* modest_tny_account_new_from_server_account_name:
* @account_mgr: a valid account mgr instance
+ * @session: a valid TnySessionCamel instance.
* @server_account_name: the name of a server account in the configuration system.
*
* Returns: a new TnyAccount or NULL in case of error.
*/
TnyAccount*
modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
- const gchar* server_account_name);
+ TnySessionCamel *session, const gchar* server_account_name);
/**
* modest_tny_account_get_special_folder: