X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-conf.h;h=40cf5117bf306441fa2cb002e7ad1503c1dd8ae6;hb=f384bbfed1575c1ce14c5bfe715c8d7b897e4b73;hp=7dd2514f6d0ddac8e63c3eb436fb5de9330c5c70;hpb=a61d692fcc93b406476c8ee5548470900d8bf42f;p=modest

diff --git a/src/modest-conf.h b/src/modest-conf.h
index 7dd2514..40cf511 100644
--- a/src/modest-conf.h
+++ b/src/modest-conf.h
@@ -45,12 +45,20 @@ G_BEGIN_DECLS
 
 typedef struct _ModestConf        ModestConf;
 typedef struct _ModestConfClass   ModestConfClass;
-typedef enum   _ModestConfEvent   ModestConfEvent;
+/* typedef enum   _ModestConfEvent   ModestConfEvent; */
+/* typedef enum   _ModestConfValueType   ModestConfValueType; */
 
-enum _ModestConfEvent {
+typedef enum _ModestConfValueType {
+	MODEST_CONF_VALUE_INT,
+	MODEST_CONF_VALUE_BOOL,
+	MODEST_CONF_VALUE_FLOAT,
+	MODEST_CONF_VALUE_STRING
+} ModestConfValueType;
+
+typedef enum _ModestConfEvent {
 	MODEST_CONF_EVENT_KEY_CHANGED,
 	MODEST_CONF_EVENT_KEY_UNSET
-};
+} ModestConfEvent;
 
 struct _ModestConf {
 	 GObject parent;
@@ -108,7 +116,7 @@ gchar*       modest_conf_get_string  (ModestConf* self, const gchar* key, GError
  * (of course, -1 can also be returned in non-error cases).
  * @err gives details in case of error
  */
-int          modest_conf_get_int     (ModestConf* self, const gchar* key, GError **err);
+gint         modest_conf_get_int     (ModestConf* self, const gchar* key, GError **err);
 
 
 /** 
@@ -119,13 +127,46 @@ int          modest_conf_get_int     (ModestConf* self, const gchar* key, GError
  * 
  * get a boolean value from the configuration system
  *  
- * Returns: a boolean value with the value for the key, or -1 in case of error
- * (of course, -1 can also be returned in non-error cases).
+ * Returns: a boolean value with the value for the key, or FALSE in case of error
+ * (of course, FALSE can also be returned in non-error cases).
  * @err gives details in case of error
  */
 gboolean     modest_conf_get_bool    (ModestConf* self, const gchar* key, GError **err);
 
 
+
+/**
+ * modest_conf_get_string_or_default:
+ * @self: a ModestConf instance
+ * @key: the key of the value to retrieve
+ * @err: a GError ptr, or NULL to ignore.
+ * 
+ * get a string from the configuration system; if the value is not set,
+ * or some error occurs, return @defaultval (copied)
+ *
+ * Returns: a newly allocated string with the value for the key,
+ * or the @defaultval in case of any error
+ */
+gchar*       modest_conf_get_string_or_default  (ModestConf* self, const gchar* key,
+						 const gchar *defaultval);
+
+
+/**
+ * modest_conf_get_int_or_default:
+ * @self: a ModestConf instance
+ * @key: the key of the value to retrieve
+ * @err: a GError ptr, or NULL to ignore.
+ * 
+ * get an integer from the configuration system; if the value is not set,
+ * or some error occurs, return @defaultval.
+ * 
+ * Returns: an integer with the value for the key, or the @defaultval in case
+ * of any error
+ */
+gint          modest_conf_get_int_or_default     (ModestConf* self, const gchar* key,
+						  int defaultval);
+
+
 /**
  * modest_conf_set_string:
  * @self: a ModestConf instance
@@ -240,6 +281,7 @@ gchar* modest_conf_key_escape (ModestConf *self, const gchar* str);
 gchar* modest_conf_key_unescape (ModestConf *self, const gchar* str);
 
 
+GSList* modest_conf_get_list (ModestConf* self, const gchar* key, ModestConfValueType list_type, GError **err);
 
 G_END_DECLS