while (TRUE) {
name = g_strdup_printf ("%s:%d",
modest_protocol_info_get_protocol_name(proto), i++);
- if (modest_account_mgr_account_exists (acc_mgr, name, TRUE, NULL))
+ if (modest_account_mgr_account_exists (acc_mgr, name, TRUE))
g_free (name);
else
break;
modest_account_mgr_add_account (priv->account_mgr,
account_name,
store_name,
- transport_name,
- NULL);
+ transport_name);
modest_account_mgr_set_string (priv->account_mgr,
account_name,
MODEST_ACCOUNT_FULLNAME,
- get_fullname(self), FALSE, NULL);
+ get_fullname(self), FALSE);
modest_account_mgr_set_string (priv->account_mgr,
account_name,
MODEST_ACCOUNT_EMAIL,
- get_email(self), FALSE, NULL);
+ get_email(self), FALSE);
/* Frees */
g_free (store_name);
if (account_name) {
gboolean removed;
- GError *err = NULL;
GtkWidget *dialog;
gchar *txt;
the account from the ModestAccountView */
removed = modest_account_mgr_remove_account (account_mgr,
account_name,
- FALSE,
- &err);
+ FALSE);
if (removed) {
/* Show confirmation dialog ??? */
} else {
/* Show error dialog ??? */
- if (err)
- g_error_free (err);
}
}
gtk_widget_destroy (dialog);
GSList *cursor, *accounts;
account_mgr = modest_runtime_get_account_mgr();
- cursor = accounts = modest_account_mgr_account_names (account_mgr, NULL);
+ cursor = accounts = modest_account_mgr_account_names (account_mgr);
while (cursor) {
gchar *account_name = (gchar*)cursor->data;
gchar *from_string = modest_account_mgr_get_from_string (account_mgr,
modest_account_mgr_set_enabled (ModestAccountMgr *self, const gchar* name,
gboolean enabled)
{
- return modest_account_mgr_set_bool (self, name,
- MODEST_ACCOUNT_ENABLED, enabled,
- FALSE, NULL);
+ return modest_account_mgr_set_bool (self, name, MODEST_ACCOUNT_ENABLED, enabled,FALSE);
}
gboolean
modest_account_mgr_get_enabled (ModestAccountMgr *self, const gchar* name)
{
- return modest_account_mgr_get_bool (self, name,
- MODEST_ACCOUNT_ENABLED, FALSE,
- NULL);
+ return modest_account_mgr_get_bool (self, name, MODEST_ACCOUNT_ENABLED, FALSE);
}
ModestServerAccountData *data;
gchar *proto;
- g_return_val_if_fail (modest_account_mgr_account_exists (self, name,
- TRUE, NULL), NULL);
+ g_return_val_if_fail (modest_account_mgr_account_exists (self, name, TRUE), NULL);
data = g_slice_new0 (ModestServerAccountData);
data->account_name = g_strdup (name);
- data->hostname = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_HOSTNAME,
- TRUE, NULL);
- data->username = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_USERNAME,
- TRUE, NULL);
-
- proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO,
- TRUE, NULL);
- data->proto = modest_protocol_info_get_protocol (proto);
+ data->hostname = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_HOSTNAME,TRUE);
+ data->username = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_USERNAME,TRUE);
+ proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE);
+ data->proto = modest_protocol_info_get_protocol (proto);
g_free (proto);
-
- data->last_updated = modest_account_mgr_get_int (self, name,
- MODEST_ACCOUNT_LAST_UPDATED,
- TRUE, NULL);
+ data->last_updated = modest_account_mgr_get_int (self, name, MODEST_ACCOUNT_LAST_UPDATED,TRUE);
- data->password = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_PASSWORD,
- TRUE, NULL);
-
- data->uri = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_URI,
- TRUE, NULL);
- data->options = modest_account_mgr_get_list (self, name,
- MODEST_ACCOUNT_OPTIONS,
- MODEST_CONF_VALUE_STRING,
- TRUE, NULL);
+ data->password = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PASSWORD, TRUE);
+ data->uri = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_URI,TRUE);
+ data->options = modest_account_mgr_get_list (self, name, MODEST_ACCOUNT_OPTIONS,
+ MODEST_CONF_VALUE_STRING, TRUE);
return data;
}
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (name, NULL);
- g_return_val_if_fail (modest_account_mgr_account_exists (self, name,
- FALSE, NULL), NULL);
+ g_return_val_if_fail (modest_account_mgr_account_exists (self, name,FALSE), NULL);
data = g_slice_new0 (ModestAccountData);
-
+
data->account_name = g_strdup (name);
data->display_name = modest_account_mgr_get_string (self, name,
MODEST_ACCOUNT_DISPLAY_NAME,
- FALSE, NULL);
+ FALSE);
data->fullname = modest_account_mgr_get_string (self, name,
MODEST_ACCOUNT_FULLNAME,
- FALSE, NULL);
+ FALSE);
data->email = modest_account_mgr_get_string (self, name,
MODEST_ACCOUNT_EMAIL,
- FALSE, NULL);
+ FALSE);
data->is_enabled = modest_account_mgr_get_enabled (self, name);
default_account = modest_account_mgr_get_default_account (self);
/* store */
server_account = modest_account_mgr_get_string (self, name,
MODEST_ACCOUNT_STORE_ACCOUNT,
- FALSE, NULL);
+ FALSE);
if (server_account) {
data->store_account =
- modest_account_mgr_get_server_account_data (self,
- server_account);
+ modest_account_mgr_get_server_account_data (self, server_account);
g_free (server_account);
}
/* transport */
server_account = modest_account_mgr_get_string (self, name,
MODEST_ACCOUNT_TRANSPORT_ACCOUNT,
- FALSE, NULL);
+ FALSE);
if (server_account) {
data->transport_account =
- modest_account_mgr_get_server_account_data (self,
- server_account);
+ modest_account_mgr_get_server_account_data (self, server_account);
g_free (server_account);
}
{
gchar *account;
ModestConf *conf;
+ GError *err = NULL;
g_return_val_if_fail (self, NULL);
conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
- account = modest_conf_get_string (conf, MODEST_CONF_DEFAULT_ACCOUNT,
- NULL);
+ account = modest_conf_get_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, &err);
+
+ if (err) {
+ g_printerr ("modest: failed to get '%s': %s\n",
+ MODEST_CONF_DEFAULT_ACCOUNT, err->message);
+ g_error_free (err);
+ g_free (account);
+ return NULL;
+ }
/* it's not really an error if there is no default account */
if (!account)
return NULL;
/* sanity check */
- if (!modest_account_mgr_account_exists (self, account, FALSE, NULL)) {
+ if (!modest_account_mgr_account_exists (self, account, FALSE)) {
g_printerr ("modest: default account does not exist\n");
g_free (account);
return NULL;
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (account, FALSE);
- g_return_val_if_fail (modest_account_mgr_account_exists (self, account, FALSE, NULL),
+ g_return_val_if_fail (modest_account_mgr_account_exists (self, account, FALSE),
FALSE);
conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
g_return_val_if_fail (name, NULL);
fullname = modest_account_mgr_get_string (self, name,MODEST_ACCOUNT_FULLNAME,
- FALSE, NULL);
+ FALSE);
email = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_EMAIL,
- FALSE, NULL);
+ FALSE);
from = g_strdup_printf ("%s <%s>",
fullname ? fullname : "",
email ? email : "");
ModestAccountMgr *
-modest_account_mgr_new (ModestConf * conf)
+modest_account_mgr_new (ModestConf *conf)
{
GObject *obj;
ModestAccountMgrPrivate *priv;
modest_account_mgr_add_account (ModestAccountMgr *self,
const gchar *name,
const gchar *store_account,
- const gchar *transport_account,
- GError **err)
+ const gchar *transport_account)
{
ModestAccountMgrPrivate *priv;
gchar *key;
gboolean ok;
gchar *default_account;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
* and in that the 'display_name' string key
*/
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE);
- if (modest_account_mgr_account_exists (self, key, FALSE, err)) {
+ if (modest_account_mgr_account_exists (self, key, FALSE)) {
g_printerr ("modest: account already exists\n");
g_free (key);
return FALSE;
}
- ok = modest_conf_set_string (priv->modest_conf, key, name, err);
+ ok = modest_conf_set_string (priv->modest_conf, key, name, &err);
g_free (key);
if (!ok) {
g_printerr ("modest: cannot set display name\n");
+ if (err) {
+ g_printerr ("modest: %s\n", err->message);
+ g_error_free (err);
+ }
return FALSE;
}
if (store_account) {
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_STORE_ACCOUNT, FALSE);
- ok = modest_conf_set_string (priv->modest_conf, key, store_account, err);
+ ok = modest_conf_set_string (priv->modest_conf, key, store_account, &err);
g_free (key);
if (!ok) {
g_printerr ("modest: failed to set store account '%s'\n",
store_account);
+ if (err) {
+ g_printerr ("modest: %s\n", err->message);
+ g_error_free (err);
+ }
+
return FALSE;
}
}
-
+
if (transport_account) {
- key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE);
- ok = modest_conf_set_string (priv->modest_conf, key, transport_account, err);
+ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT,
+ FALSE);
+ ok = modest_conf_set_string (priv->modest_conf, key, transport_account, &err);
g_free (key);
if (!ok) {
g_printerr ("modest: failed to set transport account '%s'\n",
- transport_account);
+ transport_account);
+ if (err) {
+ g_printerr ("modest: %s\n", err->message);
+ g_error_free (err);
+ }
return FALSE;
}
}
ModestAccountMgrPrivate *priv;
gchar *key;
ModestProtocolType proto_type;
+ gboolean ok;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
/* hostname */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE);
- if (modest_conf_key_exists (priv->modest_conf, key, NULL)) {
+ if (modest_conf_key_exists (priv->modest_conf, key, &err)) {
g_printerr ("modest: server account '%s' already exists", name);
g_free (key);
- return FALSE;
+ ok = FALSE;
}
+ g_free (key);
+ if (!ok)
+ goto cleanup;
- modest_conf_set_string (priv->modest_conf, key, null_means_empty(hostname), NULL);
+ modest_conf_set_string (priv->modest_conf, key, null_means_empty(hostname), &err);
+ if (err) {
+ g_printerr ("modest: failed to set %s: %s\n", key, err->message);
+ g_error_free (err);
+ ok = FALSE;
+ }
g_free (key);
-
+ if (!ok)
+ goto cleanup;
+
/* username */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_USERNAME, TRUE);
- modest_conf_set_string (priv->modest_conf, key, null_means_empty (username), NULL);
+ ok = modest_conf_set_string (priv->modest_conf, key, null_means_empty (username), &err);
+ if (err) {
+ g_printerr ("modest: failed to set %s: %s\n", key, err->message);
+ g_error_free (err);
+ ok = FALSE;
+ }
g_free (key);
-
+ if (!ok)
+ goto cleanup;
+
+
/* password */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PASSWORD, TRUE);
- modest_conf_set_string (priv->modest_conf, key, null_means_empty (password), NULL);
+ ok = modest_conf_set_string (priv->modest_conf, key, null_means_empty (password), &err);
+ if (err) {
+ g_printerr ("modest: failed to set %s: %s\n", key, err->message);
+ g_error_free (err);
+ ok = FALSE;
+ }
g_free (key);
+ if (!ok)
+ goto cleanup;
/* proto */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE);
- modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_protocol_name(proto),
- NULL);
+ ok = modest_conf_set_string (priv->modest_conf, key,
+ modest_protocol_info_get_protocol_name(proto), &err);
+ if (err) {
+ g_printerr ("modest: failed to set %s: %s\n", key, err->message);
+ g_error_free (err);
+ ok = FALSE;
+ }
g_free (key);
-
+
+cleanup:
+ if (!ok) {
+ g_printerr ("modest: failed to add server account\n");
+ return FALSE;
+ }
+
return TRUE;
}
{
ModestAccountMgrPrivate *priv;
gchar *key;
+ gboolean ok;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
g_return_val_if_fail (uri, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
-
-
+
+
/* proto */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE);
- modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_protocol_name(proto), NULL);
+ ok = modest_conf_set_string (priv->modest_conf, key,
+ modest_protocol_info_get_protocol_name(proto), NULL);
g_free (key);
+
+ if (!ok) {
+ g_printerr ("modest: failed to set proto\n");
+ return FALSE;
+ }
/* uri */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_URI, TRUE);
- modest_conf_set_string (priv->modest_conf, key, uri, NULL);
+ ok = modest_conf_set_string (priv->modest_conf, key, uri, NULL);
g_free (key);
+ if (!ok) {
+ g_printerr ("modest: failed to set uri\n");
+ return FALSE;
+ }
return TRUE;
}
gboolean
modest_account_mgr_remove_account (ModestAccountMgr * self,
- const gchar * name,
- gboolean server_account,
- GError ** err)
+ const gchar * name, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *key;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
- if (!modest_account_mgr_account_exists (self, name, server_account, err)) {
+ if (!modest_account_mgr_account_exists (self, name, server_account)) {
g_printerr ("modest: account '%s' does not exist\n", name);
return FALSE;
}
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
key = _modest_account_mgr_get_account_keyname (name, NULL, server_account);
-
- retval = modest_conf_remove_key (priv->modest_conf, key, NULL);
-
+
+ retval = modest_conf_remove_key (priv->modest_conf, key, &err);
g_free (key);
+
+ if (err) {
+ g_printerr ("modest: error removing key: %s\n", err->message);
+ g_error_free (err);
+ }
+
return retval;
}
/* get the list of all server accounts */
accounts = modest_conf_list_subkeys (priv->modest_conf, key, &err);
if (err) {
- g_error_free (err);
- g_printerr ("modest: failed to get subkeys for '%s'\n", key);
+ g_printerr ("modest: failed to get subkeys for '%s' (%s)\n", key,
+ err->message);
+ g_error_free(err);
return NULL;
}
cursor = accounts;
while (cursor) {
gchar *account = _modest_account_mgr_account_from_key ((gchar*)cursor->data, NULL, NULL);
- gchar *acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO,
- TRUE, NULL);
+ gchar *acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO,TRUE);
ModestProtocol this_proto = modest_protocol_info_get_protocol (acc_proto);
ModestProtocolType this_type = modest_protocol_info_get_protocol_type (this_proto);
GSList*
-modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err)
+modest_account_mgr_account_names (ModestAccountMgr * self)
{
GSList *accounts;
ModestAccountMgrPrivate *priv;
+ GError *err = NULL;
+
const size_t prefix_len = strlen (MODEST_ACCOUNT_NAMESPACE "/");
g_return_val_if_fail (self, NULL);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
-
+
accounts = modest_conf_list_subkeys (priv->modest_conf,
- MODEST_ACCOUNT_NAMESPACE, err);
+ MODEST_ACCOUNT_NAMESPACE, &err);
+ if (err) {
+ g_printerr ("modest: failed to get subkeys (%s): %s\n",
+ MODEST_ACCOUNT_NAMESPACE, err->message);
+ g_error_free (err);
+ return NULL; /* assume accounts did not get value when err is set...*/
+ }
strip_prefix_from_elements (accounts, prefix_len);
return accounts;
gchar *
modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account, GError **err) {
+ const gchar *key, gboolean server_account) {
ModestAccountMgrPrivate *priv;
gchar *keyname;
gchar *retval;
+ GError *err = NULL;
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (name, NULL);
keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_get_string (priv->modest_conf, keyname, err);
+ retval = modest_conf_get_string (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error getting string '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = NULL;
+ }
g_free (keyname);
return retval;
}
+gchar *
+modest_account_mgr_get_password (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, gboolean server_account)
+{
+ return modest_account_mgr_get_string (self, name, key, server_account);
+
+}
+
+
+
gint
-modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account, GError **err)
+modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name, const gchar *key,
+ gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gint retval;
-
- g_return_val_if_fail (self, -1);
+ GError *err = NULL;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), -1);
g_return_val_if_fail (name, -1);
g_return_val_if_fail (key, -1);
keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_get_int (priv->modest_conf, keyname, err);
+ retval = modest_conf_get_int (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error getting int '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = -1;
+ }
g_free (keyname);
return retval;
gboolean
modest_account_mgr_get_bool (ModestAccountMgr * self, const gchar *account,
- const gchar * key, gboolean server_account, GError ** err)
+ const gchar * key, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (account, FALSE);
g_return_val_if_fail (key, FALSE);
keyname = _modest_account_mgr_get_account_keyname (account, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_get_bool (priv->modest_conf, keyname, err);
-
+ retval = modest_conf_get_bool (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error getting bool '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
+ g_free (keyname);
+
+ return retval;
+}
+
+
+
+GSList *
+modest_account_mgr_get_list (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, ModestConfValueType list_type,
+ gboolean server_account)
+{
+ ModestAccountMgrPrivate *priv;
+
+ gchar *keyname;
+ GSList *retval;
+ GError *err = NULL;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), NULL);
+ g_return_val_if_fail (name, NULL);
+ g_return_val_if_fail (key, NULL);
+
+ keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
+
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+ retval = modest_conf_get_list (priv->modest_conf, keyname, list_type, &err);
+ if (err) {
+ g_printerr ("modest: error getting list '%s': %s\n", keyname,
+ err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
gboolean
modest_account_mgr_set_string (ModestAccountMgr * self, const gchar * name,
- const gchar * key, const gchar * val,
- gboolean server_account, GError ** err)
+ const gchar * key, const gchar * val, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (key, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_set_string (priv->modest_conf, keyname, val,
- err);
-
- g_free (keyname);
+ retval = modest_conf_set_string (priv->modest_conf, keyname, val, &err);
+ if (err) {
+ g_printerr ("modest: error setting string '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
+ g_free (keyname);
return retval;
}
gboolean
+modest_account_mgr_set_password (ModestAccountMgr * self, const gchar * name,
+ const gchar * key, const gchar * val, gboolean server_account)
+{
+ return modest_account_mgr_set_password (self, name, key, val, server_account);
+}
+
+
+
+gboolean
modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name,
- const gchar * key, int val, gboolean server_account,
- GError ** err)
+ const gchar * key, int val, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
-
- g_return_val_if_fail (self, FALSE);
+ GError *err = NULL;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (key, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_set_int (priv->modest_conf, keyname, val, err);
-
+ retval = modest_conf_set_int (priv->modest_conf, keyname, val, &err);
+ if (err) {
+ g_printerr ("modest: error setting int '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
}
gboolean
modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name,
- const gchar * key, gboolean val, gboolean server_account,
- GError ** err)
+ const gchar * key, gboolean val, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (key, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_set_bool (priv->modest_conf, keyname, val, err);
-
+ retval = modest_conf_set_bool (priv->modest_conf, keyname, val, &err);
+ if (err) {
+ g_printerr ("modest: error setting bool '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
}
-void
+
+gboolean
modest_account_mgr_set_list (ModestAccountMgr *self,
const gchar *name,
const gchar *key,
GSList *val,
ModestConfValueType list_type,
- gboolean server_account,
- GError **err)
+ gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
+ GError *err = NULL;
+ gboolean retval;
- g_return_if_fail (self);
- g_return_if_fail (name);
- g_return_if_fail (key);
- g_return_if_fail (val);
+ g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (name, FALSE);
+ g_return_val_if_fail (key, FALSE);
+ g_return_val_if_fail (val, FALSE);
keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- modest_conf_set_list (priv->modest_conf, keyname, val, list_type, err);
+ retval = modest_conf_set_list (priv->modest_conf, keyname, val, list_type, &err);
+ if (err) {
+ g_printerr ("modest: error setting list '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
+
+ return retval;
}
gboolean
modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name,
- gboolean server_account, GError ** err)
+ gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
keyname = _modest_account_mgr_get_account_keyname (name, NULL, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_key_exists (priv->modest_conf, keyname, err);
-
+ retval = modest_conf_key_exists (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error determining existance of '%s': %s\n", keyname,
+ err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
}
-GSList *
-modest_account_mgr_get_list (ModestAccountMgr *self,
- const gchar *name,
- const gchar *key,
- ModestConfValueType list_type,
- gboolean server_account,
- GError **err)
-{
- ModestAccountMgrPrivate *priv;
-
- gchar *keyname;
- GSList *retval;
-
- g_return_val_if_fail (self, NULL);
- g_return_val_if_fail (name, NULL);
- g_return_val_if_fail (key, NULL);
-
- keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
-
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_get_list (priv->modest_conf, keyname, list_type, err);
- g_free (keyname);
-
- return retval;
-}
-
gboolean
-modest_account_mgr_unset (ModestAccountMgr *self,
- const gchar *name,
- const gchar *key,
- gboolean server_account,
- GError **err)
+modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
-
+
gchar *keyname;
gboolean retval;
-
- g_return_val_if_fail (self, FALSE);
+ GError *err = NULL;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (key, FALSE);
keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_remove_key (priv->modest_conf, keyname, err);
-
+ retval = modest_conf_remove_key (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error unsetting'%s': %s\n", keyname,
+ err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
}
gboolean modest_account_mgr_add_account (ModestAccountMgr *self,
const gchar* name,
const gchar* store_name,
- const gchar* transport_name,
- GError **err);
-
+ const gchar* transport_name);
/**
* modest_account_mgr_add_server_account:
*/
gboolean modest_account_mgr_remove_account (ModestAccountMgr *self,
const gchar* name,
- gboolean server_account,
- GError **err);
+ gboolean server_account);
/**
* modest_account_mgr_account_names:
* @self: a ModestAccountMgr instance
- * @err: a GError ptr, or NULL to ignore.
*
* list all account names
*
* Returns: a newly allocated list of account names, or NULL in case of error or
* if there are no accounts. The caller must free the returned GSList
- * @err gives details in case of error
*/
-GSList* modest_account_mgr_account_names (ModestAccountMgr *self, GError **err);
+GSList* modest_account_mgr_account_names (ModestAccountMgr *self);
/**
* @self: a ModestAccountMgr instance
* @name: the account name to check
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
*
* check whether account @name exists
*
* Returns: TRUE if the account with name @name exists, FALSE otherwise (or in case of error)
- * @err gives details in case of error
*/
gboolean modest_account_mgr_account_exists (ModestAccountMgr *self,
const gchar *name,
- gboolean server_account,
- GError **err);
+ gboolean server_account);
/**
- * modest_account_mgr_get_account_string:
+ * modest_account_mgr_get_string:
* @self: self a ModestAccountMgr instance
* @name: the name of the account
* @key: the key of the value to retrieve
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
*
* get a config string from an account
*
* Returns: a newly allocated string with the value for the key,
- * or NULL in case of error. @err gives details in case of error
+ * or NULL in case of error.
*/
gchar* modest_account_mgr_get_string (ModestAccountMgr *self,
const gchar *name,
const gchar *key,
- gboolean server_account,
- GError **err);
+ gboolean server_account);
+
+
+/**
+ * modest_account_mgr_get_password:
+ * @self: self a ModestAccountMgr instance
+ * @name: the name of the account
+ * @key: the key of the value to retrieve
+ * @server_account: if TRUE, this is a server account
+ *
+ * get a password from an account
+ *
+ * Returns: a newly allocated string with the value for the key,
+ * or NULL in case of error.
+ */
+gchar* modest_account_mgr_get_password (ModestAccountMgr *self,
+ const gchar *name,
+ const gchar *key,
+ gboolean server_account);
/**
- * modest_account_mgr_get_account_int:
+ * modest_account_mgr_get_int:
* @self: a ModestAccountMgr instance
* @name: the name of the account
* @key: the key of the value to retrieve
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
*
* get a config int from an account
*
* Returns: an integer with the value for the key, or -1 in case of
* error (but of course -1 does not necessarily imply an error)
- * @err gives details in case of error
*/
gint modest_account_mgr_get_int (ModestAccountMgr *self,
const gchar *name,
const gchar *key,
- gboolean server_account,
- GError **err);
+ gboolean server_account);
/**
- * modest_account_mgr_get_account_bool:
+ * modest_account_mgr_get_bool:
* @self: a ModestAccountMgr instance
* @name: the name of the account
* @key: the key of the value to retrieve
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
*
* get a config boolean from an account
*
* Returns: an boolean with the value for the key, or FALSE in case of
* error (but of course FALSE does not necessarily imply an error)
- * @err gives details in case of error
*/
gboolean modest_account_mgr_get_bool (ModestAccountMgr *self,
const gchar *name,
const gchar *key,
- gboolean server_account,
- GError **err);
+ gboolean server_account);
/**
* modest_account_mgr_get_list:
* @key: the key of the value to get
* @list_type: the type of the members of the list
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
*
* get a config list of values of type @list_type of an account
*
* Returns: a newly allocated list of elements
- * @err gives details in case of error
*/
GSList* modest_account_mgr_get_list (ModestAccountMgr *self,
const gchar *name,
const gchar *key,
ModestConfValueType list_type,
- gboolean server_account,
- GError **err);
+ gboolean server_account);
/**
- * modest_account_mgr_set_account_string:
+ * modest_account_mgr_set_string:
* @self: a ModestAccountMgr instance
* @name: the name of the account
* @key: the key of the value to set
* @val: the value to set
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
*
* set a config string for an account.
*
* Returns: TRUE if setting the value succeeded, or FALSE in case of error.
- * @err gives details in case of error
*/
gboolean modest_account_mgr_set_string (ModestAccountMgr *self,
const gchar *name,
const gchar *key, const gchar* val,
- gboolean server_account,
- GError **err);
+ gboolean server_account);
+
/**
- * modest_account_mgr_set_account_int:
+ * modest_account_mgr_set_password:
+ * @self: a ModestAccountMgr instance
+ * @name: the name of the account
+ * @key: the key of the value to set
+ * @val: the value to set
+ * @server_account: if TRUE, this is a server account
+ *
+ * set a password for an account.
+ *
+ * Returns: TRUE if setting the value succeeded, or FALSE in case of error.
+* @err gives details in case of error
+ */
+gboolean modest_account_mgr_set_password (ModestAccountMgr *self,
+ const gchar *name,
+ const gchar *key, const gchar* val,
+ gboolean server_account);
+
+/**
+ * modest_account_mgr_set_int:
* @self: a ModestAccountMgr instance
* @name: the name of the account
* @key: the key of the value to set
* @val: the value to set
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
*
* set a config int for an account
*
* Returns: TRUE if setting the value succeeded, or FALSE in case of error.
- * @err gives details in case of error
*/
gboolean modest_account_mgr_set_int (ModestAccountMgr *self,
const gchar *name,
const gchar *key, gint val,
- gboolean server_account,
- GError **err);
-
+ gboolean server_account);
/**
- * modest_account_mgr_set_account_bool:
+ * modest_account_mgr_set_bool:
* @self: a ModestAccountMgr instance
* @name: the name of the account
* @key: the key of the value to set
* @val: the value to set
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
*
* set a config bool for an account
*
* Returns: TRUE if setting the value succeeded, or FALSE in case of error.
- * @err gives details in case of error
*/
gboolean modest_account_mgr_set_bool (ModestAccountMgr *self,
const gchar *name,
const gchar *key, gboolean val,
- gboolean server_account,
- GError **err);
+ gboolean server_account);
/**
* modest_account_mgr_set_list:
* @val: the list with the values to set
* @list_type: the type of the members of the list
* @server_account: if TRUE, this is a server account
- * @err: a GError ptr, or NULL to ignore.
+ *
+ * * set a config list of values of type @list_type of an account
*
- * set a config list of values of type @list_type of an account
- * @err gives details in case of error
+ * returns TRUE if this succeeded, FALSE otherwise
*/
-void modest_account_mgr_set_list (ModestAccountMgr *self,
- const gchar *name,
- const gchar *key,
- GSList *val,
- ModestConfValueType list_type,
- gboolean server_account,
- GError **err);
+gboolean modest_account_mgr_set_list (ModestAccountMgr *self,
+ const gchar *name,
+ const gchar *key,
+ GSList *val,
+ ModestConfValueType list_type,
+ gboolean server_account);
/**
* modest_account_mgr_unset:
* @err gives details in case of error
*/
gboolean modest_account_mgr_unset (ModestAccountMgr *self,
- const gchar *name,
- const gchar *key,
- gboolean server_account,
- GError **err);
+ const gchar *name,
+ const gchar *key,
+ gboolean server_account);
G_END_DECLS
}
-void
+gboolean
modest_conf_set_list (ModestConf* self, const gchar* key,
GSList *val, ModestConfValueType list_type,
GError **err)
ModestConfPrivate *priv;
GConfValueType gconf_type;
- g_return_if_fail (self);
- g_return_if_fail (key);
+ g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (key, FALSE);
priv = MODEST_CONF_GET_PRIVATE(self);
gconf_type = modest_conf_type_to_gconf_type (list_type, err);
+ if (err)
+ return FALSE;
- if (!err)
- gconf_client_set_list (priv->gconf_client, key, gconf_type, val, err);
+ return gconf_client_set_list (priv->gconf_client, key, gconf_type, val, err);
}
* Returns: a list with the values for the key, or NULL in case of error
* @err gives details in case of error
*/
-GSList * modest_conf_get_list (ModestConf* self, const gchar* key,
+GSList* modest_conf_get_list (ModestConf* self, const gchar* key,
ModestConfValueType list_type, GError **err);
/**
* @err: a GError ptr, or NULL to ignore.
*
* set a list of values in the configuration system
+ *
+ * Returns: TRUE if succeeded or FALSE in case of error.
* @err gives details in case of error
*/
-void modest_conf_set_list (ModestConf* self, const gchar* key,
+gboolean modest_conf_set_list (ModestConf* self, const gchar* key,
GSList *val, ModestConfValueType list_type,
GError **err);
retval = g_strdup (account);
/* sanity check */
- if (!account || !modest_account_mgr_account_exists (account_mgr, account, FALSE, NULL)) {
+ if (!account || !modest_account_mgr_account_exists (account_mgr, account, FALSE)) {
g_free (retval);
retval = NULL;
}
gchar *default_account;
gboolean retval = TRUE;
- all_accounts = modest_account_mgr_account_names (acc_mgr, NULL);
+ all_accounts = modest_account_mgr_account_names (acc_mgr);
if (all_accounts) { /* if there are any accounts, there should be a default one */
default_account =
modest_account_mgr_get_default_account (acc_mgr);
self = MODEST_TNY_ACCOUNT_STORE (account_store);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- g_warning ("prompt: %s", prompt);
/* is it in the hash? if it's already there, it must be wrong... */
pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
/* if the password is not already there, try ModestConf */
if (!already_asked) {
pwd = modest_account_mgr_get_string (priv->account_mgr,
- key, MODEST_ACCOUNT_PASSWORD,
- TRUE, NULL);
+ key, MODEST_ACCOUNT_PASSWORD,TRUE);
g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup (pwd));
}
if (remember)
modest_account_mgr_set_string (priv->account_mgr,key,
MODEST_ACCOUNT_PASSWORD,
- pwd, TRUE, NULL);
+ pwd, TRUE);
/* We need to dup the string even knowing that
it's already a dup of the contents of an
entry, because it if it's wrong, then camel
}
} else
*cancel = FALSE;
-
- //g_warning ("pwd: '%s', cancel:%s", pwd, *cancel?"yes":"no");
return pwd;
}
/* Remove from configuration system */
modest_account_mgr_unset (priv->account_mgr,
- key, MODEST_ACCOUNT_PASSWORD,
- TRUE, NULL);
+ key, MODEST_ACCOUNT_PASSWORD, TRUE);
}
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- account_names = modest_account_mgr_account_names (priv->account_mgr, NULL);
+ account_names = modest_account_mgr_account_names (priv->account_mgr);
for (cursor = account_names; cursor; cursor = cursor->next) {
gboolean *remember,
gboolean *cancel,
gpointer user_data);
-
-
};
/**
{
ModestTnySendQueue *self;
ModestTnySendQueuePrivate *priv;
-
+
g_return_val_if_fail (TNY_IS_CAMEL_TRANSPORT_ACCOUNT(account), NULL);
self = MODEST_TNY_SEND_QUEUE(g_object_new(MODEST_TYPE_TNY_SEND_QUEUE, NULL));
- priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
-
+ priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE(self);
+
priv->account = account;
g_object_ref (G_OBJECT(priv->account));
+
+// tny_camel_send_queue_set_transport_account (TNY_CAMEL_SEND_QUEUE(self),
+// account); /* hmmm */
return self;
}
model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(view)));
gtk_list_store_clear (model);
- cursor = account_names =
- modest_account_mgr_account_names (account_mgr, NULL);
+ cursor = account_names = modest_account_mgr_account_names (account_mgr);
while (cursor) {
gchar *account_name;
projects / modest / commitdiff