X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=3d70bb0221c5e72a0d81b0dc72d2e494fa1b1ec1;hp=273ef8b43129b3b45409115bebbeed435d7c7694;hb=976c05744180efac28a9dc421acefcff18659d67;hpb=f09035e1dad15d43d7d6135db599813e40693384 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 273ef8b..3d70bb0 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -39,6 +39,7 @@ #include #include #include + #include #include #include @@ -52,6 +53,10 @@ #include #include +#ifdef MODEST_PLATFORM_MAEMO +#include +#endif + /* 'private'/'protected' functions */ static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass); //static void modest_tny_account_store_init (ModestTnyAccountStore *obj); @@ -181,11 +186,11 @@ account_list_free (GSList *accounts) 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); @@ -225,11 +230,15 @@ on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean se /* 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); @@ -342,7 +351,7 @@ modest_tny_account_store_finalize (GObject *obj) ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj); ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS; + //gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS; g_free (priv->cache_dir); priv->cache_dir = NULL; @@ -371,9 +380,6 @@ modest_tny_account_store_finalize (GObject *obj) if (priv->session) { camel_object_unref (CAMEL_OBJECT(priv->session)); - if (debug && CAMEL_IS_OBJECT(priv->session)) - g_warning ("%s:%d: TnyCamelSession still holds a refcount of %d", - __FILE__,__LINE__,CAMEL_OBJECT(priv->session)->ref_count); priv->session = NULL; } @@ -386,7 +392,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) GObject *obj; ModestTnyAccountStorePrivate *priv; - TnyList *list; + TnyList *list; g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (device, NULL); @@ -394,22 +400,20 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL)); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); - priv->account_mgr = account_mgr; - g_object_ref (G_OBJECT(priv->account_mgr)); - - priv->device = device; - g_object_ref (priv->device); + priv->account_mgr = g_object_ref (G_OBJECT(account_mgr)); + priv->device = g_object_ref (device); priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj)); tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ()); /* FIXME: unref this in the end? */ - -/* /\* force a cache fill... ugly *\/ */ -/* list = TNY_LIST(tny_simple_list_new()); */ -/* tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list, */ -/* TNY_ACCOUNT_STORE_BOTH); */ -/* g_object_unref(list); */ + tny_session_camel_set_async_connecting (priv->session, TRUE); + + /* force a cache fill... ugly */ + list = TNY_LIST(tny_simple_list_new()); + tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list, + TNY_ACCOUNT_STORE_BOTH); + g_object_unref(list); /* Connect signals */ g_signal_connect (G_OBJECT(account_mgr), "account_changed", @@ -437,19 +441,22 @@ get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) } } + + /* this function fills the TnyList, and also returns a GSList of the accounts, * for caching purposes */ 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) { @@ -463,7 +470,7 @@ get_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) type, priv->session, get_password, forget_password); - if (tny_account) { /* something went wrong */ + if (tny_account) { g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)self); tny_list_prepend (list, G_OBJECT(tny_account)); @@ -482,11 +489,10 @@ get_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session); tny_list_prepend (list, G_OBJECT(tny_account)); accounts = g_slist_append (accounts, tny_account); /* cache it */ - } - + } return accounts; -} - +} + static void modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, @@ -521,10 +527,8 @@ modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, get_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); else get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); - } else { + } else g_return_if_reached (); /* incorrect req type */ - return; - } } @@ -536,9 +540,7 @@ modest_tny_account_store_get_cache_dir (TnyAccountStore *self) if (!priv->cache_dir) priv->cache_dir = g_build_filename (g_get_home_dir(), - MODEST_DIR, - MODEST_CACHE_DIR, - "cache", NULL); + MODEST_DIR, MODEST_CACHE_DIR, NULL); return priv->cache_dir; } @@ -562,6 +564,41 @@ modest_tny_account_store_get_device (TnyAccountStore *self) } +static TnyAccount* +modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar* url_string) +{ + TnyAccount *account = NULL; + ModestTnyAccountStorePrivate *priv; + GSList *cursor; + + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (url_string, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { + if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) { + account = TNY_ACCOUNT(cursor->data); + break; + } + } + + if (!account) { + for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) { + if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) { + account = TNY_ACCOUNT(cursor->data); + break; + } + } + } + + if (account) + g_object_ref (G_OBJECT(account)); + + return account; +} + + static gboolean modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, @@ -597,26 +634,6 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, } - -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) { @@ -628,16 +645,14 @@ 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 = modest_tny_account_store_get_device; klass->alert_func = modest_tny_account_store_alert; + klass->find_account_func = + modest_tny_account_store_find_account_by_url; } void @@ -651,7 +666,7 @@ modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self, TnySessionCamel* tny_account_store_get_session (TnyAccountStore *self) { - g_return_val_if_fail (self, NULL); + g_return_val_if_fail (self, NULL); return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->session; } @@ -670,7 +685,7 @@ modest_tny_account_store_get_tny_account_by_id (ModestTnyAccountStore *self, co for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data)); - if (acc_id && strcmp (acc_id, id) == 0) { + if (acc_id && strcmp (acc_id, id) == 0) { account = TNY_ACCOUNT(cursor->data); break; } @@ -691,7 +706,6 @@ modest_tny_account_store_get_tny_account_by_id (ModestTnyAccountStore *self, co return account; } - TnyAccount* modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self, const gchar *account_name, @@ -720,8 +734,12 @@ modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self 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", @@ -730,3 +748,63 @@ modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self 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; +}