X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=9579bd84514d7e524c87eaddf7f6372be332b437;hb=5bf2f24ec962205cc2c0af1e658189913ce7cfef;hp=d9296077572b543cc9af91206da8df238b9c2402;hpb=301e9cdb0328838fc3a43ee0500121941574e17b;p=modest diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index d929607..9579bd8 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -39,9 +39,13 @@ enum { LAST_SIGNAL }; +static const gchar *transport_protocols[] = { "smtp", NULL }; + typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { + GMutex *store_lock; + GMutex *transport_lock; GList *store_accounts; GList *transport_accounts; gchar *cache_dir; @@ -107,7 +111,7 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) g_signal_new ("password_requested", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET(ModestTnyAccountStoreClass,password_requested), + G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -122,6 +126,8 @@ modest_tny_account_store_init (ModestTnyAccountStore *obj) priv->modest_acc_mgr = NULL; priv->device = NULL; + priv->store_lock = NULL; + priv->transport_lock = NULL; priv->store_accounts = NULL; priv->transport_accounts = NULL; priv->cache_dir = NULL; @@ -148,72 +154,8 @@ free_gobject_list (GList *list) return NULL; } - -static void -modest_tny_account_store_finalize (GObject *obj) -{ - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj); - ModestTnyAccountStorePrivate *priv = - MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - if (priv->modest_acc_mgr) { - g_object_unref (G_OBJECT(priv->modest_acc_mgr)); - 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* -modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr) -{ - GObject *obj; - ModestTnyAccountStorePrivate *priv; - - g_return_val_if_fail (modest_acc_mgr, NULL); - - obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL)); - - 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; -} - - static gchar* -get_password (TnyAccountIface *account, const gchar *prompt) +get_password (TnyAccountIface *account, const gchar *prompt, gboolean *cancel) { const gchar *key; const TnyAccountStoreIface *account_store; @@ -230,20 +172,16 @@ get_password (TnyAccountIface *account, const gchar *prompt) 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); - + 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; + return val; } @@ -254,62 +192,6 @@ forget_password (TnyAccountIface *account) } - -static gboolean -add_account (TnyAccountStoreIface *self, TnyAccountIface *account) -{ - TnyAccountIface *account_iface; - ModestTnyAccountStore *account_store; - ModestTnyAccountStorePrivate *priv; - - const gchar* account_name; - const gchar *hostname, *username, *proto; - - g_return_val_if_fail (self, FALSE); - g_return_val_if_fail (account, FALSE); - - account_iface = TNY_ACCOUNT_IFACE(account); - account_store = MODEST_TNY_ACCOUNT_STORE(self); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - account_name = tny_account_iface_get_id(account_iface); - if (!account_name) { - g_warning ("failed to retrieve account name"); - return FALSE; - } - - hostname = tny_account_iface_get_hostname(account_iface); - username = tny_account_iface_get_user(account_iface); - proto = tny_account_iface_get_proto(account_iface); - - return modest_account_mgr_add_server_account (priv->modest_acc_mgr, - account_name, - hostname, username, NULL, - proto); -} - - - -static void -modest_tny_account_store_add_store_account (TnyAccountStoreIface *self, - TnyStoreAccountIface *account) -{ - if (!add_account (self, TNY_ACCOUNT_IFACE(account))) - g_warning ("failed to add store account"); -} - - - -static void -modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self, - TnyTransportAccountIface *account) -{ - if (!add_account (self, TNY_ACCOUNT_IFACE(account))) - g_warning ("failed to add transport account"); -} - - - static TnyAccountIface* tny_account_from_key (ModestTnyAccountStore *self, const gchar *key, gboolean is_store) @@ -390,7 +272,6 @@ tny_accounts_from_server_accounts (ModestTnyAccountStore *self, GSList *accounts while (cursor) { TnyAccountIface *tny_account; - gchar *key = cursor->data; tny_account = tny_account_from_key (self, (gchar*)cursor->data, is_store); if (!tny_account) { @@ -407,72 +288,318 @@ tny_accounts_from_server_accounts (ModestTnyAccountStore *self, GSList *accounts } +static void +manager_new_account (ModestAccountMgr *modest_acc_mgr, gchar *name, gpointer data) +{ + ModestTnyAccountStore *self = data; + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + TnyAccountIface *new_account; + gchar *proto; + gint i = 0; + gboolean is_store = TRUE; + + g_print ("new account signal %s\n", name); + + + proto = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, name, + MODEST_ACCOUNT_PROTO, NULL); + if (!proto) { + g_printerr ("Cannot add account: unknown type."); + return; + } + + while (transport_protocols [i]) { + if (!strcmp (transport_protocols [i], proto)) { + is_store = FALSE; + break; + } + i++; + } + + /* fill account lists */ + if (!priv->store_accounts) + modest_tny_account_store_get_store_accounts (TNY_ACCOUNT_STORE_IFACE(self)); + if (!priv->transport_accounts) + modest_tny_account_store_get_transport_accounts (TNY_ACCOUNT_STORE_IFACE(self)); + + + if (is_store) { + new_account = tny_account_from_key (self, name, is_store); + g_mutex_lock (priv->store_lock); + priv->store_accounts = g_list_append (priv->store_accounts, new_account); + g_mutex_unlock (priv->store_lock); + } else { + new_account = tny_account_from_key (self, name, is_store); + g_mutex_lock (priv->transport_lock); + priv->transport_accounts = g_list_append (priv->transport_accounts, new_account); + g_mutex_unlock (priv->transport_lock); + } + g_signal_emit (self, + tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNT_INSERTED], 0, new_account); +} + + +static void +manager_remove_account (ModestAccountMgr *modest_acc_mgr, gchar *name, gpointer data) +{ + g_print ("remove account signal %s\n", name); +} + + +static void +manager_change_account (ModestAccountMgr *modest_acc_mgr, gchar *accountname, + gchar *key, gchar* value, gpointer data) +{ + ModestTnyAccountStore *self = data; + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + GList *iter; + TnyAccountIface *account = NULL; + + g_print ("account change signal: account: %s key: %s value: %s\n", accountname, key, value); + + /* fill account lists */ + if (!priv->store_accounts) + modest_tny_account_store_get_store_accounts (TNY_ACCOUNT_STORE_IFACE(self)); + if (!priv->transport_accounts) + modest_tny_account_store_get_transport_accounts (TNY_ACCOUNT_STORE_IFACE(self)); + + for (iter = priv->store_accounts; iter; iter = iter->next) { + TnyAccountIface *acc = iter->data; + if (!strcmp (tny_account_iface_get_name (acc), accountname)) { + account = acc; + break; + } + } + + if (!account) + for (iter = priv->transport_accounts; iter; iter = iter->next) { + TnyAccountIface *acc = iter->data; + if (!strcmp (tny_account_iface_get_name (acc), accountname)) { + account = acc; + break; + } + } + + if (!account) { + g_printerr ("Couldn't find account - returning without applying changes."); + return; + } + + g_mutex_lock (priv->store_lock); + g_mutex_lock (priv->transport_lock); + + if (!strcmp (key, MODEST_ACCOUNT_HOSTNAME)) + tny_account_iface_set_hostname (account, value); + if (!strcmp (key, MODEST_ACCOUNT_USERNAME)) + tny_account_iface_set_user (account, value); + + g_mutex_unlock (priv->transport_lock); + g_mutex_unlock (priv->store_lock); + + /* TODO: handle protocol and password changes */ + g_signal_emit (self, + tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNTS_RELOADED], 0); +} + + +static void +modest_tny_account_store_finalize (GObject *obj) +{ + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj); + ModestTnyAccountStorePrivate *priv = + MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr), + G_CALLBACK(manager_new_account), NULL); + g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr), + G_CALLBACK(manager_remove_account), NULL); + g_signal_handlers_disconnect_by_func (G_OBJECT (priv->modest_acc_mgr), + G_CALLBACK(manager_change_account), NULL); + + if (priv->modest_acc_mgr) { + g_object_unref (G_OBJECT(priv->modest_acc_mgr)); + 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; + } + + g_mutex_lock (priv->store_lock); + priv->store_accounts = free_gobject_list (priv->store_accounts); + g_mutex_unlock (priv->store_lock); + + g_mutex_lock (priv->transport_lock); + priv->transport_accounts = free_gobject_list (priv->store_accounts); + g_mutex_unlock (priv->transport_lock); + + + g_mutex_free (priv->store_lock); + g_mutex_free (priv->transport_lock); + + g_free (priv->cache_dir); + priv->cache_dir = NULL; + +} + + +GObject* +modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr) +{ + GObject *obj; + ModestTnyAccountStorePrivate *priv; + + g_return_val_if_fail (modest_acc_mgr, NULL); + + obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL)); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); + + g_object_ref(G_OBJECT(modest_acc_mgr)); + priv->modest_acc_mgr = modest_acc_mgr; + + priv->store_lock = g_mutex_new (); + priv->transport_lock = g_mutex_new (); + + 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; + } + + g_signal_connect (G_OBJECT (modest_acc_mgr), "account-add", + G_CALLBACK(manager_new_account), obj); + g_signal_connect (G_OBJECT (modest_acc_mgr), "account-remove", + G_CALLBACK(manager_remove_account), obj); + g_signal_connect (G_OBJECT (modest_acc_mgr), "account-change", + G_CALLBACK(manager_change_account), obj); + + return obj; +} + + +static gboolean +add_account (TnyAccountStoreIface *self, TnyAccountIface *account) +{ + TnyAccountIface *account_iface; + ModestTnyAccountStore *account_store; + ModestTnyAccountStorePrivate *priv; + + const gchar *account_name; + const gchar *hostname, *username, *proto; + + g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (account, FALSE); + + account_iface = TNY_ACCOUNT_IFACE(account); + account_store = MODEST_TNY_ACCOUNT_STORE(self); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + account_name = tny_account_iface_get_id(account_iface); + if (!account_name) { + g_warning ("failed to retrieve account name"); + return FALSE; + } + + hostname = tny_account_iface_get_hostname(account_iface); + username = tny_account_iface_get_user(account_iface); + proto = tny_account_iface_get_proto(account_iface); + + return modest_account_mgr_add_server_account (priv->modest_acc_mgr, + account_name, + hostname, username, NULL, + proto); +} + + +static void +modest_tny_account_store_add_store_account (TnyAccountStoreIface *self, + TnyStoreAccountIface *account) +{ + if (!add_account (self, TNY_ACCOUNT_IFACE(account))) + g_warning ("failed to add store account"); +} + + +static void +modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self, + TnyTransportAccountIface *account) +{ + if (!add_account (self, TNY_ACCOUNT_IFACE(account))) + g_warning ("failed to add transport account"); +} + static const GList* modest_tny_account_store_get_store_accounts (TnyAccountStoreIface *iface) { ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; - GSList *accounts, *cursor; - GList *tny_accounts; + GSList *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); + if (!priv->store_accounts) { + accounts = + modest_account_mgr_server_account_names (priv->modest_acc_mgr, + NULL, + MODEST_PROTO_TYPE_STORE, + NULL, FALSE); - tny_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE); - g_slist_free (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; + g_mutex_lock (priv->store_lock); + priv->store_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE); + g_mutex_unlock (priv->store_lock); + g_slist_free (accounts); + } - return tny_accounts; + return priv->store_accounts; } - static const GList* modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface) { ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; - GSList *accounts, *cursor; - GList *tny_accounts; + GSList *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_TRANSPORT, - NULL, FALSE); - tny_accounts = tny_accounts_from_server_accounts (self, accounts, FALSE); - g_warning ("transport accounts: %d", g_list_length (tny_accounts)); - - g_slist_free (accounts); + + if (!priv->transport_accounts) { + accounts = + modest_account_mgr_server_account_names (priv->modest_acc_mgr, + NULL, + MODEST_PROTO_TYPE_TRANSPORT, + NULL, FALSE); + g_mutex_lock (priv->transport_lock); + priv->transport_accounts = tny_accounts_from_server_accounts (self, accounts, FALSE); + g_mutex_unlock (priv->transport_lock); + 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? */ + return priv->transport_accounts; } @@ -488,7 +615,6 @@ ModestAccountMgr } - TnySessionCamel* tny_account_store_get_session (TnyAccountStore *self) { @@ -501,7 +627,6 @@ tny_account_store_get_session (TnyAccountStore *self) } - /** * modest_tny_account_store_get_cache_dir: * @self: self a TnyAccountStoreIface instance @@ -518,8 +643,6 @@ modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self) ModestTnyAccountStorePrivate *priv; 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"), @@ -529,17 +652,17 @@ modest_tny_account_store_get_cache_dir (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; } - static void modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data) { @@ -549,17 +672,16 @@ modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data) klass = (TnyAccountStoreIfaceClass *)g_iface; - klass->add_store_account_func = + klass->add_store_account_func = modest_tny_account_store_add_store_account; - klass->get_store_accounts_func = + klass->get_store_accounts_func = modest_tny_account_store_get_store_accounts; - klass->add_transport_account_func = + klass->add_transport_account_func = modest_tny_account_store_add_transport_account; - klass->get_transport_accounts_func = + klass->get_transport_accounts_func = modest_tny_account_store_get_transport_accounts; klass->get_cache_dir_func = modest_tny_account_store_get_cache_dir; klass->get_device_func = modest_tny_account_store_get_device; - }