X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=5373c30929b8774bb490dd04a766886b8e9ab4d0;hp=8150223400cd31df22c1b258ba1b07a619707f1d;hb=cc5c378787a44ac2581fb1e3ef4f0b64d4ad437e;hpb=647af5c14a1d61fef9c7dda6fe4b9f1e609e0adf diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 8150223..5373c30 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -8,7 +8,9 @@ #include #include #include -//#include +#include +#include +#include #include #include @@ -33,8 +35,7 @@ static const GList* modest_tny_account_store_get_transport_accounts (TnyAccoun /* list my signals */ enum { - /* MY_SIGNAL_1, */ - /* MY_SIGNAL_2, */ + PASSWORD_REQUESTED_SIGNAL, LAST_SIGNAL }; @@ -45,7 +46,10 @@ struct _ModestTnyAccountStorePrivate { GList *transport_accounts; gchar *cache_dir; - ModestAccountMgr *modest_acc_mgr; + TnySessionCamel *tny_session_camel; + TnyDeviceIface *device; + + ModestAccountMgr *modest_acc_mgr; }; #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_TNY_ACCOUNT_STORE, \ @@ -53,8 +57,7 @@ struct _ModestTnyAccountStorePrivate { /* globals */ static GObjectClass *parent_class = NULL; -/* uncomment the following if you have defined any signals */ -/* static guint signals[LAST_SIGNAL] = {0}; */ +static guint signals[LAST_SIGNAL] = {0}; GType modest_tny_account_store_get_type (void) @@ -78,11 +81,11 @@ modest_tny_account_store_get_type (void) NULL, /* interface_finalize */ NULL /* interface_data */ }; + /* hack hack */ + my_type = g_type_register_static (TNY_TYPE_ACCOUNT_STORE, + "ModestTnyAccountStore", &my_info, 0); - my_type = g_type_register_static (G_TYPE_OBJECT, - "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; @@ -100,12 +103,14 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestTnyAccountStorePrivate)); - /* signal definitions go here, e.g.: */ -/* signals[MY_SIGNAL_1] = */ -/* g_signal_new ("my_signal_1",....); */ -/* signals[MY_SIGNAL_2] = */ -/* g_signal_new ("my_signal_2",....); */ -/* etc. */ + signals[PASSWORD_REQUESTED_SIGNAL] = + g_signal_new ("password_requested", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestTnyAccountStoreClass,password_requested), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); } static void @@ -115,10 +120,13 @@ modest_tny_account_store_init (ModestTnyAccountStore *obj) MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); priv->modest_acc_mgr = NULL; + priv->device = NULL; priv->store_accounts = NULL; priv->transport_accounts = NULL; priv->cache_dir = NULL; + + priv->tny_session_camel = NULL; } @@ -153,11 +161,24 @@ modest_tny_account_store_finalize (GObject *obj) priv->modest_acc_mgr = NULL; } + if (priv->tny_session_camel) { + g_object_unref (G_OBJECT(priv->tny_session_camel)); + priv->tny_session_camel = NULL; + } + + if (priv->device) { + g_object_unref (G_OBJECT(priv->device)); + priv->device = NULL; + } + priv->store_accounts = free_gobject_list (priv->store_accounts); priv->transport_accounts = free_gobject_list (priv->store_accounts); - + g_free (priv->cache_dir); priv->cache_dir = NULL; + + + } GObject* @@ -173,32 +194,54 @@ modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr) priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); g_object_ref(G_OBJECT(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; + } + priv->tny_session_camel = tny_session_camel_new + (TNY_ACCOUNT_STORE_IFACE(obj)); + if (!priv->tny_session_camel) { + g_warning ("Cannot create TnySessionCamel instance"); + g_object_unref (obj); + return NULL; + } + return obj; } - -/* FIXME: tinymail needs to change here */ -/* a gpointer arg to get_password should be enough */ static gchar* get_password (TnyAccountIface *account, const gchar *prompt) { - const gchar *key = tny_account_iface_get_id (account); - const TnyAccountStoreIface *AccountStore = tny_account_iface_get_account_store(account); - ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(AccountStore); + const gchar *key; + const TnyAccountStoreIface *account_store; + ModestTnyAccountStore *self; + ModestTnyAccountStorePrivate *priv; gchar *val; - /* hostname */ - val = modest_account_mgr_get_account_string (priv->modest_acc_mgr, key, - MODEST_ACCOUNT_PASSWORD, NULL); - /* SMF: - * FIXME: if no password avail. in modest-conf, then we need to get the pw from - * somewhere else. - * - * DJCB: good point: we should probably emit a signal for that.. - */ + g_return_val_if_fail (account, NULL); - /* g_warning (val); */ + key = tny_account_iface_get_id (account); + account_store = tny_account_iface_get_account_store(account); + + self = MODEST_TNY_ACCOUNT_STORE (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); + + } return val; } @@ -222,8 +265,6 @@ add_account (TnyAccountStoreIface *self, TnyAccountIface *account) const gchar* account_name; const gchar *hostname, *username, *proto; - g_warning (__FUNCTION__); - g_return_val_if_fail (self, FALSE); g_return_val_if_fail (account, FALSE); @@ -269,7 +310,6 @@ modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self, - static TnyAccountIface* tny_account_from_key (ModestTnyAccountStore *self, const gchar *key, gboolean is_store) @@ -280,9 +320,9 @@ tny_account_from_key (ModestTnyAccountStore *self, const gchar *key, g_return_val_if_fail (self, NULL); g_return_val_if_fail (key, NULL); - + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - + /* is it a store or a transport? */ if (is_store) tny_account = TNY_ACCOUNT_IFACE(tny_store_account_new ()); @@ -294,7 +334,7 @@ tny_account_from_key (ModestTnyAccountStore *self, const gchar *key, is_store ? "store" : "transport"); return NULL; } - + tny_account_iface_set_account_store (TNY_ACCOUNT_IFACE(tny_account), TNY_ACCOUNT_STORE_IFACE(self)); /* id */ @@ -302,30 +342,31 @@ tny_account_from_key (ModestTnyAccountStore *self, const gchar *key, /* proto */ val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key, - MODEST_ACCOUNT_PROTO, NULL); + MODEST_ACCOUNT_PROTO, NULL); if (val) { tny_account_iface_set_proto (tny_account, val); g_free (val); } else { g_warning ("protocol not defined for %s", key); g_object_unref (G_OBJECT(tny_account)); - return NULL; + return NULL; } - + /* hostname */ val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key, - MODEST_ACCOUNT_HOSTNAME, NULL); + MODEST_ACCOUNT_HOSTNAME, + NULL); if (val) { - g_warning ("hostname: %s", val); tny_account_iface_set_hostname (tny_account, val); g_free (val); } - + /* username */ - val = modest_account_mgr_get_account_string (priv->modest_acc_mgr, key, - MODEST_ACCOUNT_USERNAME, NULL); + val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key, + MODEST_ACCOUNT_USERNAME, + NULL); if (val) { tny_account_iface_set_user (tny_account, val); g_free (val); @@ -344,27 +385,24 @@ tny_accounts_from_server_accounts (ModestTnyAccountStore *self, GSList *accounts { GSList *cursor = accounts; GList *tny_accounts = NULL; - + g_return_val_if_fail (self, NULL); - + while (cursor) { TnyAccountIface *tny_account; - tny_account = tny_account_from_key (self, (gchar*)cursor->data, is_store); + gchar *key = cursor->data; + tny_account = tny_account_from_key (self, (gchar*)cursor->data, + is_store); if (!tny_account) { g_warning ("could not create tnyaccount for %s", (gchar*)cursor->data); } else { - g_warning ("added %s",(gchar*)cursor->data); tny_accounts = g_list_append (tny_accounts, tny_account); } cursor = cursor->next; } - g_warning ("got %d %s account(s)", g_list_length(tny_accounts), - is_store ? "store" : "transport"); - - return tny_accounts; } @@ -377,32 +415,29 @@ modest_tny_account_store_get_store_accounts (TnyAccountStoreIface *iface) ModestTnyAccountStorePrivate *priv; GSList *accounts, *cursor; GList *tny_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); - g_message ("accounts: %d", g_slist_length (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 */ priv->store_accounts = free_gobject_list (priv->store_accounts); priv->store_accounts = tny_accounts; - - return tny_accounts; + + return tny_accounts; } @@ -429,18 +464,44 @@ modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface) g_warning ("transport accounts: %d", g_list_length (tny_accounts)); 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? */ } +ModestAccountMgr +*modest_tny_account_store_get_accout_mgr(ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv; + g_return_val_if_fail (self, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + return priv->modest_acc_mgr; +} + + + +TnySessionCamel* +tny_account_store_get_session (TnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv; + g_return_val_if_fail (self, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + return priv->tny_session_camel; +} + + + /** * modest_tny_account_store_get_cache_dir: * @self: self a TnyAccountStoreIface instance @@ -458,7 +519,7 @@ modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self) 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"), @@ -469,11 +530,12 @@ modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self) -/* FIXME */ static const TnyDeviceIface* modest_tny_account_store_get_device (TnyAccountStoreIface *self) { - return NULL; + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + + return priv->device; } @@ -498,7 +560,6 @@ modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data) klass->get_cache_dir_func = modest_tny_account_store_get_cache_dir; klass->get_device_func = - modest_tny_account_store_get_device; + modest_tny_account_store_get_device; } -