Fixed message when the configuration file is missing.

[psensor.git] / src / cfg.c

diff --git a/src/cfg.c b/src/cfg.c
index 42e5701..6a7ce1b 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -47,6 +47,7 @@ static const char *ATT_SENSOR_APPINDICATOR_MENU_DISABLED
 static const char *ATT_SENSOR_APPINDICATOR_LABEL_ENABLED
 = "appindicator_label_enabled";
 static const char *ATT_SENSOR_POSITION = "position";
+static const char *ATT_SENSOR_HIDE = "hide";
 
 /* Update interval of the measures of the sensors */
 static const char *KEY_SENSOR_UPDATE_INTERVAL
@@ -192,7 +193,7 @@ static struct color *get_background_color()
        free(scolor);
 
        if (!c)
-               return color_new(0xffff, 0xffff, 0xffff);
+               return color_new(1, 1, 1);
 
        return c;
 }
@@ -208,7 +209,7 @@ static struct color *get_foreground_color()
        free(scolor);
 
        if (!c)
-               return color_new(0x0000, 0x0000, 0x0000);
+               return color_new(0, 0, 0);
 
        return c;
 }
@@ -336,8 +337,12 @@ static void set_window_keep_below_enabled(bool enabled)
 
 static void init()
 {
+       log_fct_enter();
+
        if (!settings)
                settings = g_settings_new("psensor");
+
+       log_fct_exit();
 }
 
 void config_cleanup()
@@ -532,15 +537,10 @@ static GKeyFile *get_sensor_key_file()
                                                | G_KEY_FILE_KEEP_TRANSLATIONS,
                                                &err);
 
-               if (!ret) {
-                       if (err->code == G_KEY_FILE_ERROR_NOT_FOUND)
-                               log_fct(_("The configuration file "
-                                         "does not exist."));
-                       else
-                               log_err(_("Failed to parse configuration "
-                                         "file: %s"),
-                                       path);
-               }
+               if (!ret)
+                       log_warn(_("Failed to load configuration file %s: %s"),
+                                path,
+                                err->message);
        }
 
        return key_file;
@@ -671,12 +671,12 @@ config_get_sensor_color(const char *sid, const struct color *dft)
        return color;
 }
 
-bool config_is_sensor_enabled(const char *sid)
+bool config_is_sensor_graph_enabled(const char *sid)
 {
        return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED);
 }
 
-void config_set_sensor_enabled(const char *sid, bool enabled)
+void config_set_sensor_graph_enabled(const char *sid, bool enabled)
 {
        sensor_set_bool(sid, ATT_SENSOR_GRAPH_ENABLED, enabled);
 }
@@ -733,6 +733,16 @@ void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
        sensor_set_bool(sid, ATT_SENSOR_ALARM_ENABLED, enabled);
 }
 
+bool config_is_sensor_enabled(const char *sid)
+{
+       return !sensor_get_bool(sid, ATT_SENSOR_HIDE);
+}
+
+void config_set_sensor_enabled(const char *sid, bool enabled)
+{
+       sensor_set_bool(sid, ATT_SENSOR_HIDE, !enabled);
+}
+
 bool config_is_appindicator_label_enabled(const char *sid)
 {
        return sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);