* add support for GtkWidget settings

[modest] / src / modest-conf.h

diff --git a/src/modest-conf.h b/src/modest-conf.h
index 895ee2b..e451a4b 100644 (file)
--- a/src/modest-conf.h
+++ b/src/modest-conf.h
@@ -47,6 +47,11 @@ typedef struct _ModestConf        ModestConf;
 typedef struct _ModestConfClass   ModestConfClass;
 typedef enum   _ModestConfEvent   ModestConfEvent;
 
+enum _ModestConfEvent {
+       MODEST_CONF_EVENT_KEY_CHANGED,
+       MODEST_CONF_EVENT_KEY_UNSET
+};
+
 struct _ModestConf {
         GObject parent;
 };
@@ -56,11 +61,6 @@ struct _ModestConfClass {
        void (* key_changed) (ModestConf* self, const gchar *key, ModestConfEvent event);
 };
 
-enum _ModestConfEvent {
-       MODEST_CONF_EVENT_KEY_CHANGED,
-       MODEST_CONF_EVENT_KEY_UNSET
-};
-
 /**
  * modest_conf_get_type:
  * 
@@ -79,7 +79,7 @@ GType        modest_conf_get_type    (void) G_GNUC_CONST;
  * Returns: a new ModestConf instance, or NULL in case
  * of any error
  */
-GObject*     modest_conf_new         (void);
+ModestConf*     modest_conf_new         (void);
 
 
 /**
@@ -108,7 +108,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 +119,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
@@ -216,6 +249,31 @@ gboolean   modest_conf_remove_key    (ModestConf* self, const gchar* key, GError
 gboolean   modest_conf_key_exists   (ModestConf* self, const gchar* key, GError **err);
 
 
+/**
+ * modest_conf_key_escape:
+ * @self: a ModestConf instance. Not used, but for consistency with other ModestConf funcs
+ * @str: a string to escape
+ *
+ * returns an escaped version of @str, ie. something suitable as a key
+ * 
+ * Returns: a newly allocated string with the escaped version
+ */
+gchar* modest_conf_key_escape (ModestConf *self, const gchar* str);
+
+
+/**
+ * modest_conf_key_escape:
+ * @self: a ModestConf instance. Not used, but for consistency with other ModestConf funcs
+ * @str: a string to escape
+ *
+ * returns an unescaped version of @str
+ * 
+ * Returns: a newly allocated string with the unescaped version
+ */
+gchar* modest_conf_key_unescape (ModestConf *self, const gchar* str);
+
+
+
 G_END_DECLS
 
 #endif /* __MODEST_CONF_H__ */