fixed memeroy leaks (glib GError handling)

[psensor.git] / src / cfg.c

diff --git a/src/cfg.c b/src/cfg.c
index 3bd02f4..37048c9 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -119,6 +119,11 @@ static const char *KEY_PROVIDER_LIBATASMART_ENABLED
 static const char *KEY_PROVIDER_NVCTRL_ENABLED = "provider-nvctrl-enabled";
 static const char *KEY_PROVIDER_UDISKS2_ENABLED = "provider-udisks2-enabled";
 
+static const char *KEY_DEFAULT_HIGH_THRESHOLD_TEMPERATURE
+= "default-high-threshold-temperature";
+static const char *KEY_DEFAULT_SENSOR_ALARM_ENABLED
+= "default-sensor-alarm-enabled";
+
 static GSettings *settings;
 
 static char *user_dir;
@@ -353,6 +358,15 @@ void config_set_smooth_curves_enabled(bool b)
        set_bool(KEY_GRAPH_SMOOTH_CURVES_ENABLED, b);
 }
 
+double config_get_default_high_threshold_temperature(void)
+{
+       return get_double(KEY_DEFAULT_HIGH_THRESHOLD_TEMPERATURE);
+}
+
+static bool config_get_default_sensor_alarm_enabled(void)
+{
+       return get_bool(KEY_DEFAULT_SENSOR_ALARM_ENABLED);
+}
 
 static void init(void)
 {
@@ -552,10 +566,12 @@ static GKeyFile *get_sensor_key_file(void)
                                                | G_KEY_FILE_KEEP_TRANSLATIONS,
                                                &err);
 
-               if (!ret)
+               if (!ret) {
                        log_warn(_("Failed to load configuration file %s: %s"),
                                 path,
                                 err->message);
+                       g_error_free(err);
+               }
        }
 
        return key_file;
@@ -619,19 +635,39 @@ static bool sensor_get_double(const char *sid, const char *att, double *d)
        err = NULL;
        v = g_key_file_get_double(kfile, sid, att, &err);
 
-       if (err)
+       if (err) {
+               log_err(err->message);
+
+               g_error_free(err);
+
                return false;
+       }
 
        *d = v;
        return true;
 }
 
-static bool sensor_get_bool(const char *sid, const char *att)
+static bool sensor_get_bool(const char *sid, const char *att, bool dft)
 {
        GKeyFile *kfile;
+       GError *err;
+       bool ret;
 
        kfile = get_sensor_key_file();
-       return g_key_file_get_boolean(kfile, sid, att, NULL);
+
+       err = NULL;
+       ret = g_key_file_get_boolean(kfile, sid, att, &err);
+
+       if (err) {
+               if (err->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
+                       ret = dft;
+               else
+                       log_err(err->message);
+
+               g_error_free(err);
+       }
+
+       return ret;
 }
 
 static void sensor_set_bool(const char *sid, const char *att, bool enabled)
@@ -747,7 +783,7 @@ GdkRGBA *config_get_sensor_color(const char *sid)
 
 bool config_is_sensor_graph_enabled(const char *sid)
 {
-       return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED);
+       return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED, false);
 }
 
 void config_set_sensor_graph_enabled(const char *sid, bool enabled)
@@ -777,7 +813,9 @@ void config_set_sensor_alarm_low_threshold(const char *sid, int threshold)
 
 bool config_is_appindicator_enabled(const char *sid)
 {
-       return !sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_MENU_DISABLED);
+       return !sensor_get_bool(sid,
+                               ATT_SENSOR_APPINDICATOR_MENU_DISABLED,
+                               false);
 }
 
 void config_set_appindicator_enabled(const char *sid, bool enabled)
@@ -799,7 +837,7 @@ void config_set_sensor_position(const char *sid, int pos)
 
 bool config_get_sensor_alarm_enabled(const char *sid)
 {
-       return sensor_get_bool(sid, ATT_SENSOR_ALARM_ENABLED);
+       return sensor_get_bool(sid, ATT_SENSOR_ALARM_ENABLED, false);
 }
 
 void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
@@ -809,7 +847,9 @@ void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
 
 bool config_is_sensor_enabled(const char *sid)
 {
-       return !sensor_get_bool(sid, ATT_SENSOR_HIDE);
+       return !sensor_get_bool(sid,
+                               ATT_SENSOR_HIDE,
+                               config_get_default_sensor_alarm_enabled());
 }
 
 void config_set_sensor_enabled(const char *sid, bool enabled)
@@ -819,7 +859,9 @@ void config_set_sensor_enabled(const char *sid, bool enabled)
 
 bool config_is_appindicator_label_enabled(const char *sid)
 {
-       return sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
+       return sensor_get_bool(sid,
+                              ATT_SENSOR_APPINDICATOR_LABEL_ENABLED,
+                              false);
 }
 
 void config_set_appindicator_label_enabled(const char *sid, bool enabled)