* first hackish implementation of *sending* mail

[modest] / src / modest-account-mgr.c

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index ad4202e..8831520 100644 (file)
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -11,6 +11,7 @@ static void    modest_account_mgr_init          (ModestAccountMgr *obj);
 static void    modest_account_mgr_finalize      (GObject *obj);
 
 static gchar*   get_account_keyname (const gchar *accname, const gchar *name);
+static gchar*   get_server_account_keyname (const gchar *accname, const gchar *name);
 
 /* list my signals */
 enum {
@@ -274,6 +275,23 @@ modest_account_mgr_remove_server_account    (ModestAccountMgr *self,
 }
 
 
+/* strip the first /n/ character from each element */
+/* caller must make sure all elements are strings with
+ * length >= n, and also that data can be freed.
+ */
+static GSList*
+strip_prefix_from_elements (GSList *lst, guint n)
+{
+       GSList *cursor = lst;
+       while (cursor) {
+               gchar *str = (gchar*)cursor->data;
+               cursor->data = g_strdup (str + n);
+               g_free (str);
+               cursor = cursor->next;
+       }
+       return lst;
+}
+
 
 
 GSList*
@@ -286,7 +304,9 @@ modest_account_mgr_server_account_names   (ModestAccountMgr *self,
        GSList *accounts;
        GSList *cursor;
        ModestAccountMgrPrivate *priv;
-
+       const size_t prefix_len =
+               strlen (MODEST_SERVER_ACCOUNT_NAMESPACE "/");
+       
        g_return_val_if_fail (self, NULL);
 
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
@@ -296,8 +316,8 @@ modest_account_mgr_server_account_names   (ModestAccountMgr *self,
 
        /* no restrictions, return everything */
        if (type == MODEST_PROTO_TYPE_ANY && !proto)
-               return accounts;
-
+               return strip_prefix_from_elements (accounts,prefix_len);
+       
        /* otherwise, filter out the none-matching ones */
        cursor = accounts;
        while (cursor) {
@@ -322,7 +342,7 @@ modest_account_mgr_server_account_names   (ModestAccountMgr *self,
                        cursor = cursor->next;
        }
 
-       return accounts;
+       return strip_prefix_from_elements (accounts, prefix_len);
 }
 
 
@@ -332,72 +352,161 @@ modest_account_mgr_account_names  (ModestAccountMgr *self, GError **err)
 {
        GSList *accounts, *cursor;
        ModestAccountMgrPrivate *priv;
+       const size_t prefix_len =
+               strlen (MODEST_ACCOUNT_NAMESPACE "/");
+
 
        g_return_val_if_fail (self, NULL);
 
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
 
-       return  modest_conf_list_subkeys (priv->modest_conf,
-                                         MODEST_ACCOUNT_NAMESPACE,
-                                         err);
+       accounts = modest_conf_list_subkeys (priv->modest_conf,
+                                            MODEST_ACCOUNT_NAMESPACE,
+                                            err);
+       return strip_prefix_from_elements (accounts, prefix_len);       
 }
 
 
-gchar*
-modest_account_mgr_get_account_string (ModestAccountMgr *self, const gchar *name,
-                                      const gchar *key, GError **err)
+
+static gchar*
+get_account_string (ModestAccountMgr *self, const gchar *name,
+                   const gchar *key, gboolean server_account,
+                   GError **err)
 {
        ModestAccountMgrPrivate *priv;
-
+       
        gchar *keyname;
-       gchar *retval;
-
+       gchar * retval;
+       
        g_return_val_if_fail (self, NULL);
        g_return_val_if_fail (name, NULL);
        g_return_val_if_fail (key, NULL);
 
-       keyname = get_account_keyname (name, key);
+       if (server_account)
+               keyname = get_server_account_keyname (name, key);
+       else
+               keyname = get_account_keyname (name, key);
+       
+       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
+       retval = modest_conf_get_string (priv->modest_conf,keyname,err);
+       g_free (keyname);
+       
+       return retval;
+}
 
-       g_warning ("===> %s", keyname);
 
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
+gchar*
+modest_account_mgr_get_server_account_string (ModestAccountMgr *self, const gchar *name,
+                                          const gchar *key, GError **err)
+{
+       return get_account_string (self, name, key, TRUE, err);
+}
+
+gchar*
+modest_account_mgr_get_account_string (ModestAccountMgr *self, const gchar *name,
+                                   const gchar *key, GError **err)
+{
+       return get_account_string (self, name, key, FALSE, err);
+}
+
 
-       retval = modest_conf_get_string (priv->modest_conf,
-                                        keyname, err);
 
+static gint
+get_account_int (ModestAccountMgr *self, const gchar *name,
+                const gchar *key, gboolean server_account,
+                GError **err)
+{
+       ModestAccountMgrPrivate *priv;
+       
+       gchar *keyname;
+       gint retval;
+
+       g_return_val_if_fail (self, -1);
+       g_return_val_if_fail (name, -1);
+       g_return_val_if_fail (key, -1);
+
+       if (server_account)
+               keyname = get_server_account_keyname (name, key);
+       else
+               keyname = get_account_keyname (name, key);
+
+       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
+       retval = modest_conf_get_int (priv->modest_conf,keyname,err);
        g_free (keyname);
+       
        return retval;
 }
 
 
+gint
+modest_account_mgr_get_server_account_int (ModestAccountMgr *self, const gchar *name,
+                                          const gchar *key, GError **err)
+{
+       return get_account_int (self, name, key, TRUE, err);
+}
 
 gint
 modest_account_mgr_get_account_int (ModestAccountMgr *self, const gchar *name,
                                    const gchar *key, GError **err)
 {
-       ModestAccountMgrPrivate *priv;
+       return get_account_int (self, name, key, FALSE, err);
+}
+
+
 
+static gboolean
+get_account_bool (ModestAccountMgr *self, const gchar *name,
+                 const gchar *key, gboolean server_account,
+                 GError **err)
+{
+       ModestAccountMgrPrivate *priv;
+       
        gchar *keyname;
-       gint retval;
+       gboolean retval;
 
        g_return_val_if_fail (self, -1);
        g_return_val_if_fail (name, -1);
        g_return_val_if_fail (key, -1);
+       
+       if (server_account)
+               keyname = get_server_account_keyname (name, key);
+       else
+               keyname = get_account_keyname (name, key);
 
-       keyname = get_account_keyname (name, key);
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
        retval = modest_conf_get_int (priv->modest_conf,keyname,err);
-
        g_free (keyname);
+       
        return retval;
 }
 
 
-gboolean modest_account_mgr_get_account_bool (ModestAccountMgr *self, const gchar *name,
-                                             const gchar *key, GError **err)
+
+gint
+modest_account_mgr_get_server_account_bool (ModestAccountMgr *self, const gchar *name,
+                                          const gchar *key, GError **err)
 {
-       ModestAccountMgrPrivate *priv;
+       return get_account_bool (self, name, key, TRUE, err);
+}
 
+gint
+modest_account_mgr_get_account_bool (ModestAccountMgr *self, const gchar *name,
+                                   const gchar *key, GError **err)
+{
+       return get_account_bool (self, name, key, FALSE, err);
+}
+
+
+
+
+
+static gboolean
+set_account_string  (ModestAccountMgr *self, const gchar *name,
+                    const gchar *key, const gchar* val, gboolean server_account,
+                    GError **err)
+{
+       ModestAccountMgrPrivate *priv;
+       
        gchar *keyname;
        gboolean retval;
 
@@ -405,9 +514,14 @@ gboolean modest_account_mgr_get_account_bool (ModestAccountMgr *self, const gcha
        g_return_val_if_fail (name, FALSE);
        g_return_val_if_fail (key, FALSE);
 
-       keyname = get_account_keyname (name, key);
+       if (server_account)
+               keyname = get_server_account_keyname (name, key);
+       else
+               keyname = get_account_keyname (name, key);
+
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_get_bool (priv->modest_conf,keyname,err);
+
+       retval = modest_conf_set_string (priv->modest_conf,keyname,val,err);
 
        g_free (keyname);
        return retval;
@@ -415,23 +529,49 @@ gboolean modest_account_mgr_get_account_bool (ModestAccountMgr *self, const gcha
 
 
 
+
+
+gboolean
+modest_account_mgr_set_server_account_string  (ModestAccountMgr *self, const gchar *name,
+                                              const gchar *key, const gchar* val,
+                                              GError **err)
+{
+       return set_account_string (self, name, key, val, TRUE, err);
+}
+
+
+
 gboolean
 modest_account_mgr_set_account_string  (ModestAccountMgr *self, const gchar *name,
                                        const gchar *key, const gchar* val,
                                        GError **err)
 {
-       ModestAccountMgrPrivate *priv;
+       return set_account_string (self, name, key, val, FALSE, err);
+}
+
 
+static gboolean
+set_account_int  (ModestAccountMgr *self, const gchar *name,
+                 const gchar *key, gboolean server_account, int val,
+                 GError **err)
+{
+       ModestAccountMgrPrivate *priv;
+       
        gchar *keyname;
        gboolean retval;
-
+       
        g_return_val_if_fail (self, FALSE);
        g_return_val_if_fail (name, FALSE);
        g_return_val_if_fail (key, FALSE);
 
-       keyname = get_account_keyname (name, key);
+       if (server_account)
+               keyname = get_server_account_keyname (name, key);
+       else
+               keyname = get_account_keyname (name, key);
+
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_set_string (priv->modest_conf,keyname,val,err);
+       
+       retval = modest_conf_set_int (priv->modest_conf,keyname,val,err);
 
        g_free (keyname);
        return retval;
@@ -440,44 +580,46 @@ modest_account_mgr_set_account_string  (ModestAccountMgr *self, const gchar *nam
 
 
 gboolean
-modest_account_mgr_set_account_int  (ModestAccountMgr *self, const gchar *name,
-                                    const gchar *key, gint val, GError **err)
+modest_account_mgr_set_server_account_int (ModestAccountMgr *self, const gchar *name,
+                                          const gchar *key, int val,
+                                          GError **err)
 {
-       ModestAccountMgrPrivate *priv;
-
-       gchar *keyname;
-       gboolean retval;
-
-       g_return_val_if_fail (self, -1);
-       g_return_val_if_fail (name, -1);
-       g_return_val_if_fail (key, -1);
+       return set_account_int (self, name, key, val, TRUE, err);
+}
 
-       keyname = get_account_keyname (name, key);
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_set_int (priv->modest_conf,keyname,val,err);
 
-       g_free (keyname);
-       return retval;
+gboolean
+modest_account_mgr_set_account_int  (ModestAccountMgr *self, const gchar *name,
+                                    const gchar *key, int val,
+                                    GError **err)
+{
+       return set_account_int (self, name, key, val, FALSE, err);
 }
 
 
 
 
-gboolean
-modest_account_mgr_set_account_bool  (ModestAccountMgr *self, const gchar *name,
-                                     const gchar *key, gboolean val, GError **err)
+static gboolean
+set_account_bool  (ModestAccountMgr *self, const gchar *name,
+                  const gchar *key, gboolean server_account, gboolean val,
+                  GError **err)
 {
        ModestAccountMgrPrivate *priv;
-
+       
        gchar *keyname;
        gboolean retval;
-
+       
        g_return_val_if_fail (self, FALSE);
        g_return_val_if_fail (name, FALSE);
        g_return_val_if_fail (key, FALSE);
-
-       keyname = get_account_keyname (name, key);
+       
+       if (server_account)
+               keyname = get_server_account_keyname (name, key);
+       else
+               keyname = get_account_keyname (name, key);
+       
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
+       
        retval = modest_conf_set_bool (priv->modest_conf,keyname,val,err);
 
        g_free (keyname);
@@ -486,8 +628,30 @@ modest_account_mgr_set_account_bool  (ModestAccountMgr *self, const gchar *name,
 
 
 gboolean
-modest_account_mgr_account_exists (ModestAccountMgr *self, const gchar *name,
-                                  GError **err)
+modest_account_mgr_set_server_account_bool  (ModestAccountMgr *self, const gchar *name,
+                                            const gchar *key, gboolean val,
+                                            GError **err)
+{
+       return set_account_bool (self, name, key, val, TRUE, err);
+}
+
+
+
+gboolean
+modest_account_mgr_set_account_bool  (ModestAccountMgr *self, const gchar *name,
+                                       const gchar *key, gboolean val,
+                                       GError **err)
+{
+       return set_account_bool (self, name, key, val, FALSE, err);
+}
+
+
+
+
+
+gboolean
+account_exists (ModestAccountMgr *self, const gchar *name, gboolean server_account,
+               GError **err)
 {
        ModestAccountMgrPrivate *priv;
 
@@ -497,16 +661,36 @@ modest_account_mgr_account_exists (ModestAccountMgr *self, const gchar *name,
        g_return_val_if_fail (self, FALSE);
        g_return_val_if_fail (name, FALSE);
 
-       keyname = get_account_keyname (name, NULL);
+       if (server_account) 
+               keyname = get_account_keyname (name, NULL);
+       else
+               keyname = get_server_account_keyname (name, NULL);
 
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
        retval = modest_conf_key_exists (priv->modest_conf,keyname,err);
-
+       
        g_free (keyname);
        return retval;
 }
 
 
+gboolean
+modest_account_mgr_server_account_exists (ModestAccountMgr *self, const gchar *name,
+                                  GError **err)
+{
+       return account_exists (self, name, TRUE, err);
+}
+
+
+
+gboolean
+modest_account_mgr_account_exists (ModestAccountMgr *self, const gchar *name,
+                                  GError **err)
+{
+       return account_exists (self, name, FALSE, err);
+}
+
+
 
 /* must be freed by caller */
 static gchar*
@@ -514,9 +698,22 @@ get_account_keyname (const gchar *accname, const gchar *name)
 {
        if (name)
                return g_strconcat
-                       (MODEST_ACCOUNT_NAMESPACE, "/", accname, "/", name, NULL);
+                       (accname, "/", name, NULL);
        else
-               return g_strconcat
-                       (MODEST_ACCOUNT_NAMESPACE, "/", accname, NULL);
+               return g_strdup (accname);
 }
 
+
+/* must be freed by caller */
+static gchar*
+get_server_account_keyname (const gchar *accname, const gchar *name)
+{
+       if (name)
+               return g_strconcat
+                       (MODEST_SERVER_ACCOUNT_NAMESPACE, "/",
+                        accname, "/", name, NULL);
+       else
+               return g_strconcat
+                       (MODEST_SERVER_ACCOUNT_NAMESPACE, "/",
+                        accname, NULL);
+}