get ride of integer representation of the colors, no more needed since

[psensor.git] / src / cfg.c

diff --git a/src/cfg.c b/src/cfg.c
index 1218129..265f84c 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
@@ -110,7 +111,6 @@ static const char *KEY_SLOG_INTERVAL = "slog-interval";
 /* Path to the script called when a notification is raised */
 static const char *KEY_NOTIFICATION_SCRIPT = "notif-script";
 
-static GConfClient *client;
 static GSettings *settings;
 
 static char *user_dir;
@@ -119,6 +119,8 @@ static GKeyFile *key_file;
 
 static char *sensor_config_path;
 
+static void (*slog_enabled_cbk)(void *);
+
 static char *get_string(const char *key)
 {
        return g_settings_get_string(settings, key);
@@ -191,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;
 }
@@ -207,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;
 }
@@ -278,19 +280,26 @@ static void set_slog_enabled(bool enabled)
        set_bool(KEY_SLOG_ENABLED, enabled);
 }
 
-void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data)
+static void slog_enabled_changed_cbk(GSettings *settings,
+                                    gchar *key,
+                                    gpointer data)
 {
-       log_debug("config_slog_enabled_notify_add");
-       gconf_client_add_dir(client,
-                            KEY_SLOG_ENABLED,
-                            GCONF_CLIENT_PRELOAD_NONE,
-                            NULL);
-       gconf_client_notify_add(client,
-                               KEY_SLOG_ENABLED,
-                               cbk,
-                               data,
-                               NULL,
-                               NULL);
+       if (slog_enabled_cbk)
+               slog_enabled_cbk(data);
+}
+
+void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data)
+{
+       log_fct_enter();
+
+       slog_enabled_cbk = cbk;
+
+       g_signal_connect_after(settings,
+                              "changed::slog-enabled",
+                              G_CALLBACK(slog_enabled_changed_cbk),
+                              data);
+
+       log_fct_exit();
 }
 
 int config_get_slog_interval()
@@ -326,14 +335,8 @@ static void set_window_keep_below_enabled(bool enabled)
        set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled);
 }
 
-/*
- * Initializes the GConf client.
- */
 static void init()
 {
-       if (!client)
-               client = gconf_client_get_default();
-
        if (!settings)
                settings = g_settings_new("psensor");
 }
@@ -342,11 +345,6 @@ void config_cleanup()
 {
        config_sync();
 
-       if (client) {
-               g_object_unref(client);
-               client = NULL;
-       }
-
        if (settings) {
                g_settings_sync();
                g_object_unref(settings);
@@ -367,6 +365,8 @@ void config_cleanup()
                free(sensor_config_path);
                sensor_config_path = NULL;
        }
+
+       slog_enabled_cbk = NULL;
 }
 
 struct config *config_load()
@@ -672,12 +672,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);
 }
@@ -734,6 +734,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);