* Fixes NB#91062, fixes a memory leak

[modest] / src / modest-conf.c

diff --git a/src/modest-conf.c b/src/modest-conf.c
index e8fc818..ca7d8be 100644 (file)
--- a/src/modest-conf.c
+++ b/src/modest-conf.c
@@ -31,6 +31,7 @@
 #include <config.h>
 #include <string.h>
 #include <glib/gi18n.h>
+#include "modest-defs.h"
 #include "modest-conf.h"
 #include "modest-marshal.h"
 #include <stdio.h>
@@ -134,13 +135,16 @@ modest_conf_init (ModestConf *obj)
                              &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);
+       } else {
+               g_error_free (error);
+       }
 }
 
 static void
@@ -207,6 +211,18 @@ modest_conf_get_int (ModestConf* self, const gchar* key, GError **err)
        return gconf_client_get_int (priv->gconf_client, key, err);
 }
 
+gdouble
+modest_conf_get_float (ModestConf* self, const gchar* key, GError **err)
+{
+       ModestConfPrivate *priv;
+
+       g_return_val_if_fail (self, -1);
+       g_return_val_if_fail (key, -1);
+
+       priv = MODEST_CONF_GET_PRIVATE(self);
+       
+       return gconf_client_get_float (priv->gconf_client, key, err);
+}
 
 gboolean
 modest_conf_get_bool (ModestConf* self, const gchar* key, GError **err)
@@ -281,6 +297,27 @@ modest_conf_set_int  (ModestConf* self, const gchar* key, gint val,
        return gconf_client_set_int (priv->gconf_client, key, val, err);
 }
 
+gboolean
+modest_conf_set_float (ModestConf* self, 
+                      const gchar* key, 
+                      gdouble val,
+                      GError **err)
+{
+       ModestConfPrivate *priv;
+               
+       g_return_val_if_fail (self,FALSE);
+       g_return_val_if_fail (key, FALSE);
+       
+       priv = MODEST_CONF_GET_PRIVATE(self);
+
+       if (!gconf_client_key_is_writable(priv->gconf_client,key,err)) {
+               g_printerr ("modest: '%s' is not writable\n", key);
+               return FALSE;
+       }
+                       
+       return gconf_client_set_float (priv->gconf_client, key, val, err);
+}
+
 
 gboolean
 modest_conf_set_bool (ModestConf* self, const gchar* key, gboolean val,