*/
#include <string.h>
-#include <modest-marshal.h>
-#include <modest-account-keys.h>
-#include <modest-account-mgr.h>
+#include "modest-marshal.h"
+#include "modest-account-keys.h"
+#include "modest-account-mgr.h"
/* 'private'/'protected' functions */
static void modest_account_mgr_class_init (ModestAccountMgrClass * klass);
typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate;
struct _ModestAccountMgrPrivate {
ModestConf *modest_conf;
- ModestProtocolMgr *proto_mgr;
};
#define MODEST_ACCOUNT_MGR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_ACCOUNT_MGR_GET_PRIVATE (obj);
priv->modest_conf = NULL;
- priv->proto_mgr = modest_protocol_mgr_new ();
}
static void
priv->modest_conf = NULL;
}
- if (priv->proto_mgr) {
- g_object_unref (G_OBJECT(priv->proto_mgr));
- priv->proto_mgr = NULL;
- }
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
modest_account_mgr_add_server_account (ModestAccountMgr * self,
const gchar * name, const gchar *hostname,
const gchar * username, const gchar * password,
- const gchar * proto)
+ ModestProtocol proto)
{
ModestAccountMgrPrivate *priv;
gchar *key;
-
+ ModestProtocolType proto_type;
+
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
+ proto_type = modest_protocol_info_get_protocol_type (proto);
+ g_return_val_if_fail (proto_type == MODEST_PROTOCOL_TYPE_TRANSPORT ||
+ proto_type == MODEST_PROTOCOL_TYPE_STORE, FALSE);
+
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
/* hostname */
/* proto */
key = get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE);
- modest_conf_set_string (priv->modest_conf, key, null_means_empty (proto), NULL);
+ modest_conf_set_string (priv->modest_conf, key,
+ modest_protocol_info_get_protocol_name(proto),
+ NULL);
g_free (key);
return TRUE;
* length >= n, and also that data can be freed.
* change is in-place
*/
-void
+static void
strip_prefix_from_elements (GSList * lst, guint n)
{
while (lst) {
}
-GSList *
+GSList*
modest_account_mgr_search_server_accounts (ModestAccountMgr * self,
const gchar * account_name,
ModestProtocolType type,
- const gchar *proto)
+ ModestProtocol proto)
{
GSList *accounts;
GSList *cursor;
g_return_val_if_fail (self, NULL);
+ if (proto != MODEST_PROTOCOL_UNKNOWN) {
+ ModestProtocolType proto_type;
+ proto_type = modest_protocol_info_get_protocol_type (proto);
+ g_return_val_if_fail (proto_type == MODEST_PROTOCOL_TYPE_TRANSPORT ||
+ proto_type == MODEST_PROTOCOL_TYPE_STORE, NULL);
+ }
+
key = get_account_keyname (account_name, NULL, TRUE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
return NULL;
}
- /* no restrictions, return everything */
- if (type == MODEST_PROTOCOL_TYPE_ANY && !proto) {
- strip_prefix_from_elements (accounts, strlen(key)+1);
- return accounts;
- /* +1 because we must remove the ending '/' as well */
- }
-
- /* otherwise, filter out the none-matching ones */
+ /* filter out the ones with the wrong protocol */
+ /* we could optimize for unknown proto / unknown type, but it will only
+ * make the code more complex */
cursor = accounts;
- while (cursor) {
- gchar *account;
- gchar *acc_proto;
-
- account = account_from_key ((gchar*)cursor->data, NULL, NULL);
- acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO,
- TRUE, NULL);
- if ((!acc_proto) || /* proto not defined? */
- (type != MODEST_PROTOCOL_TYPE_ANY && /* proto type ... */
- !modest_protocol_mgr_protocol_is_valid (priv->proto_mgr,
- acc_proto,type)) || /* ... matches? */
- (proto && strcmp (proto, acc_proto) != 0)) { /* proto matches? */
- /* match! remove from the list */
+ while (cursor) {
+ gchar *account = account_from_key ((gchar*)cursor->data, NULL, NULL);
+ gchar *acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO,
+ TRUE, NULL);
+ ModestProtocol this_proto = modest_protocol_info_get_protocol (acc_proto);
+ ModestProtocolType this_type = modest_protocol_info_get_protocol_type (this_proto);
+
+ if ((this_type != MODEST_PROTOCOL_TYPE_UNKNOWN && this_type != type) ||
+ (this_proto != MODEST_PROTOCOL_UNKNOWN && this_proto != proto)) {
GSList *nxt = cursor->next;
accounts = g_slist_delete_link (accounts, cursor);
cursor = nxt;
} else
cursor = cursor->next;
-
+
g_free (account);
g_free (acc_proto);
}
-
+
/* +1 because we must remove the ending '/' as well */
strip_prefix_from_elements (accounts, strlen(key)+1);
-
- return accounts;
-
+ return accounts;
}
-GSList *
+GSList*
modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err)
{
GSList *accounts;
modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name)
{
ModestServerAccountData *data;
+ gchar *proto;
g_return_val_if_fail (modest_account_mgr_account_exists (self, name,
TRUE, NULL), NULL);
data->username = modest_account_mgr_get_string (self, name,
MODEST_ACCOUNT_USERNAME,
TRUE, NULL);
- data->proto = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_PROTO,
- TRUE, NULL);
+
+ proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO,
+ TRUE, NULL);
+ data->proto = modest_protocol_info_get_protocol (proto);
+ g_free (proto);
+
data->password = modest_account_mgr_get_string (self, name,
MODEST_ACCOUNT_PASSWORD,
TRUE, NULL);
g_free (data->account_name);
g_free (data->hostname);
g_free (data->username);
- g_free (data->proto);
g_free (data->password);
g_free (data);
projects / modest / blobdiff