X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-conf.h;h=c68154949e14e593af62dd5f5e6c3259018f21f5;hp=a2c483c996c0ec7cc598381fe86c9faf9022afaf;hb=c5e5c216be6773f1a37385084d067672db73edc3;hpb=e82d0e58b454379215411c36eb4edaae13b41bbb

diff --git a/src/modest-conf.h b/src/modest-conf.h
index a2c483c..c681549 100644
--- a/src/modest-conf.h
+++ b/src/modest-conf.h
@@ -31,7 +31,7 @@
 #define __MODEST_CONF_H__
 
 #include <glib-object.h>
-#include "modest-conf-keys.h"
+#include "modest-defs.h"
 
 G_BEGIN_DECLS
 
@@ -45,17 +45,17 @@ G_BEGIN_DECLS
 
 typedef struct _ModestConf        ModestConf;
 typedef struct _ModestConfClass   ModestConfClass;
-/* typedef enum   _ModestConfEvent   ModestConfEvent; */
-/* typedef enum   _ModestConfValueType   ModestConfValueType; */
 
-typedef enum _ModestConfValueType {
+typedef guint ModestConfNotificationId; 
+
+typedef enum {
 	MODEST_CONF_VALUE_INT,
 	MODEST_CONF_VALUE_BOOL,
 	MODEST_CONF_VALUE_FLOAT,
 	MODEST_CONF_VALUE_STRING
 } ModestConfValueType;
 
-typedef enum _ModestConfEvent {
+typedef enum {
 	MODEST_CONF_EVENT_KEY_CHANGED,
 	MODEST_CONF_EVENT_KEY_UNSET
 } ModestConfEvent;
@@ -66,15 +66,18 @@ struct _ModestConf {
 
 struct _ModestConfClass {
 	GObjectClass parent_class;	
-	void (* key_changed) (ModestConf* self, const gchar *key, ModestConfEvent event);
+	void (* key_changed) (ModestConf* self, 
+			      const gchar *key, 
+			      ModestConfEvent event,
+			      ModestConfNotificationId id);
 };
 
 /**
  * modest_conf_get_type:
  * 
- * get the GType for ModestConf
+ * get the #GType for #ModestConf
  *  
- * Returns: the GType
+ * Returns: the #GType
  */
 GType        modest_conf_get_type    (void) G_GNUC_CONST;
 
@@ -82,9 +85,9 @@ GType        modest_conf_get_type    (void) G_GNUC_CONST;
 /**
  * modest_conf_new:
  * 
- * create a new modest ModestConf object. 
+ * create a new modest #ModestConf object. 
  * 
- * Returns: a new ModestConf instance, or NULL in case
+ * Returns: a new #ModestConf instance, or NULL in case
  * of any error
  */
 ModestConf*     modest_conf_new         (void);
@@ -146,7 +149,7 @@ gboolean     modest_conf_get_bool    (ModestConf* self, const gchar* key, GError
  * 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);
 
 /**
@@ -204,9 +207,11 @@ gboolean     modest_conf_set_bool    (ModestConf* self, const gchar* key, gboole
  * @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);
 
@@ -271,7 +276,7 @@ gboolean modest_conf_key_is_valid (const gchar* str);
 
 /**
  * modest_conf_key_escape:
- * @str: a string to escape
+ * @str: a non-empty string to escape
  *
  * returns an escaped version of @str, ie. something suitable as a key
  * This is a *class* function, and therefore does not require a ModestConf
@@ -295,6 +300,11 @@ gchar* modest_conf_key_escape (const gchar* str);
 gchar* modest_conf_key_unescape (const gchar* str);
 
 
+void modest_conf_listen_to_namespace (ModestConf *self,
+				      const gchar *namespace);
+
+void modest_conf_forget_namespace    (ModestConf *self,
+				      const gchar *namespace);
 G_END_DECLS
 
 #endif /* __MODEST_CONF_H__ */