projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version and bug fix info update for week 35, 2009 second release
[modest]
/
src
/
modest-conf.c
diff --git
a/src/modest-conf.c
b/src/modest-conf.c
index
4696520
..
835d287
100644
(file)
--- a/
src/modest-conf.c
+++ b/
src/modest-conf.c
@@
-31,7
+31,9
@@
#include <config.h>
#include <string.h>
#include <glib/gi18n.h>
#include <config.h>
#include <string.h>
#include <glib/gi18n.h>
+#include "modest-defs.h"
#include "modest-conf.h"
#include "modest-conf.h"
+#include "modest-error.h"
#include "modest-marshal.h"
#include <stdio.h>
#include "modest-marshal.h"
#include <stdio.h>
@@
-134,13
+136,16
@@
modest_conf_init (ModestConf *obj)
&error);
/* Notify every change under namespace */
&error);
/* Notify every change under namespace */
- if (!error)
+ if (!error) {
gconf_client_notify_add (priv->gconf_client,
"/apps/modest",
modest_conf_on_change,
obj,
NULL,
&error);
gconf_client_notify_add (priv->gconf_client,
"/apps/modest",
modest_conf_on_change,
obj,
NULL,
&error);
+ } else {
+ g_error_free (error);
+ }
}
static void
}
static void
@@
-471,11
+476,12
@@
modest_conf_type_to_gconf_type (ModestConfValueType value_type, GError **err)
gconf_type = GCONF_VALUE_STRING;
break;
default:
gconf_type = GCONF_VALUE_STRING;
break;
default:
- /* FIXME: use MODEST_ERROR, and error code */
gconf_type = GCONF_VALUE_INVALID;
g_printerr ("modest: invalid list value type %d\n", value_type);
gconf_type = GCONF_VALUE_INVALID;
g_printerr ("modest: invalid list value type %d\n", value_type);
- *err = g_error_new_literal (0, 0, "invalid list value type");
- }
+ *err = g_error_new_literal (MODEST_CONF_ERROR,
+ MODEST_CONF_ERROR_INVALID_VALUE,
+ "invalid list value type");
+ }
return gconf_type;
}
return gconf_type;
}