#include <tny-camel-transport-account.h>
#include <tny-camel-imap-store-account.h>
#include <tny-camel-pop-store-account.h>
+
#include <modest-runtime.h>
#include <modest-marshal.h>
#include <modest-protocol-info.h>
#include <tny-gtk-lockable.h>
#include <camel/camel.h>
+#ifdef MODEST_PLATFORM_MAEMO
+#include <tny-maemo-conic-device.h>
+#endif
+
/* 'private'/'protected' functions */
static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass);
//static void modest_tny_account_store_init (ModestTnyAccountStore *obj);
GSList *cursor = accounts;
while (cursor) {
- g_object_unref (G_OBJECT(cursor->data));
if (G_IS_OBJECT(cursor->data)) { /* check twice... */
const gchar *id = tny_account_get_id(TNY_ACCOUNT(cursor->data));
- modest_runtime_verify_object_death(cursor->data,id);
+ modest_runtime_verify_object_last_ref(cursor->data,id);
}
+ g_object_unref (G_OBJECT(cursor->data));
cursor = cursor->next;
}
g_slist_free (accounts);
/* FIXME: make this more finegrained; changes do not really affect _all_
* accounts, and some do not affect tny accounts at all (such as 'last_update')
*/
- account_list_free (priv->store_accounts);
- priv->store_accounts = NULL;
+ if (priv->store_accounts) {
+ account_list_free (priv->store_accounts);
+ priv->store_accounts = NULL;
+ }
- account_list_free (priv->transport_accounts);
- priv->transport_accounts = NULL;
+ if (priv->transport_accounts) {
+ account_list_free (priv->transport_accounts);
+ priv->transport_accounts = NULL;
+ }
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
account);
if (priv->session) {
camel_object_unref (CAMEL_OBJECT(priv->session));
- modest_runtime_verify_object_death(priv->session, "");
priv->session = NULL;
}
static GSList*
get_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
{
- ModestTnyAccountStorePrivate *priv;
- GSList *account_names, *cursor;
+ ModestTnyAccountStorePrivate *priv = NULL;
+ GSList *account_names = NULL, *cursor = NULL;
GSList *accounts = NULL;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- account_names = modest_account_mgr_account_names (priv->account_mgr);
+ account_names = modest_account_mgr_account_names (priv->account_mgr,
+ TRUE /* including disabled accounts */);
for (cursor = account_names; cursor; cursor = cursor->next) {
}
-
-static void
-modest_tny_account_store_add_store_account (TnyAccountStore *self,
- TnyStoreAccount *account)
-{
- /* we should not need this...*/
- g_printerr ("modest: add_store_account_func not implemented\n");
-}
-
-
-static void
-modest_tny_account_store_add_transport_account (TnyAccountStore *self,
- TnyTransportAccount *account)
-{
- /* we should not need this...*/
- g_printerr ("modest: add_transport_account_func not implemented\n");
-}
-
-
-
static void
modest_tny_account_store_init (gpointer g, gpointer iface_data)
{
klass->get_accounts_func =
modest_tny_account_store_get_accounts;
- klass->add_transport_account_func =
- modest_tny_account_store_add_transport_account;
- klass->add_store_account_func =
- modest_tny_account_store_add_store_account;
klass->get_cache_dir_func =
modest_tny_account_store_get_cache_dir;
klass->get_device_func =
return account;
}
-
TnyAccount*
modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self,
const gchar *account_name,
else if (account_data->transport_account)
id = account_data->transport_account->account_name;
- if (id)
- account = modest_tny_account_store_get_tny_account_by_id (self, id);
+ if (!id)
+ g_printerr ("modest: could not get an id for account %s\n",
+ account_name);
+ else
+ account = modest_tny_account_store_get_tny_account_by_id (self, id);
+
if (!account)
g_printerr ("modest: could not get tny %s account for %s (id=%s)\n",
type == TNY_ACCOUNT_TYPE_STORE? "store" : "transport",
modest_account_mgr_free_account_data (priv->account_mgr, account_data);
return account;
}
+
+static TnyAccount* get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, const gchar *account_name)
+{
+ /* Get the current connection: */
+ TnyDevice *device = modest_runtime_get_device ();
+
+ if (!tny_device_is_online (device))
+ return NULL;
+
+#ifdef MODEST_PLATFORM_MAEMO
+ g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
+ TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);
+ const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
+ if (!iap_id)
+ return NULL;
+
+ ConIcIap* connection = tny_maemo_conic_device_get_iap (maemo_device, iap_id);
+ if (!connection)
+ return NULL;
+
+ const gchar *connection_name = con_ic_iap_get_name (connection);
+ if (!connection_name)
+ return NULL;
+
+ /* Get the connection-specific transport acccount, if any: */
+ ModestAccountMgr *account_manager = modest_runtime_get_account_mgr ();
+ gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager,
+ account_name, connection_name);
+
+ if (!server_account_name)
+ return NULL; /* No connection-specific SMTP server was specified for this connection. */
+
+ TnyAccount* account = modest_tny_account_store_get_tny_account_by_id (self, server_account_name);
+ g_free (server_account_name);
+
+ /* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */
+ g_object_unref (connection);
+
+ return account;
+#else
+ return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
+#endif /* MODEST_PLATFORM_MAEMO */
+}
+
+
+TnyAccount* modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self,
+ const gchar *account_name)
+{
+ /* Get the connection-specific transport acccount, if any: */
+ TnyAccount *account = get_smtp_specific_transport_account_for_open_connection (self, account_name);
+
+ /* If there is no connection-specific transport account (the common case),
+ * just get the regular transport account: */
+ if (!account) {
+ account = modest_tny_account_store_get_tny_account_by_account (self, account_name,
+ TNY_ACCOUNT_TYPE_TRANSPORT);
+ }
+
+ return account;
+}
projects / modest / blobdiff