use bool def from stdbool.h or define it if it does not exist

[psensor.git] / src / cfg.c

diff --git a/src/cfg.c b/src/cfg.c
index a82883c..f0e53aa 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -28,11 +28,12 @@
 static const char *KEY_SENSORS = "/apps/psensor/sensors";
 
 static const char *ATT_SENSOR_ALARM_ENABLED = "alarm/enabled";
-static const char *ATT_SENSOR_ALARM_HIGH_THRESOLD = "alarm/high_thresold";
-/*static const char *ATT_SENSOR_ALARM_LOW_THRESOLD = "alarm/low_thresold";*/
+static const char *ATT_SENSOR_ALARM_HIGH_THRESHOLD = "alarm/high_threshold";
+static const char *ATT_SENSOR_ALARM_LOW_THRESHOLD = "alarm/low_threshold";
 static const char *ATT_SENSOR_COLOR = "color";
 static const char *ATT_SENSOR_ENABLED = "enabled";
 static const char *ATT_SENSOR_NAME = "name";
+static const char *ATT_SENSOR_APPINDICATOR_DISABLED = "appindicator/disabled";
 
 static const char *KEY_SENSOR_UPDATE_INTERVAL
 = "/apps/psensor/sensor/update_interval";
@@ -117,7 +118,7 @@ static struct color *get_background_color()
        c = str_to_color(scolor);
        free(scolor);
 
-       if (c == NULL)
+       if (!c)
                return color_new(0xffff, 0xffff, 0xffff);
 
        return c;
@@ -134,19 +135,15 @@ static struct color *get_foreground_color()
        c = str_to_color(scolor);
        free(scolor);
 
-       if (c == NULL)
+       if (!c)
                return color_new(0x0000, 0x0000, 0x0000);
 
        return c;
 }
 
-static unsigned int is_alpha_channel_enabled()
+static bool is_alpha_channel_enabled()
 {
-       gboolean b;
-
-       b = gconf_client_get_bool(client, KEY_ALPHA_CHANNEL_ENABLED, NULL);
-
-       return b == TRUE;
+       return gconf_client_get_bool(client, KEY_ALPHA_CHANNEL_ENABLED, NULL);
 }
 
 static enum sensorlist_position get_sensorlist_position()
@@ -261,12 +258,12 @@ void config_set_sensor_color(const char *sid, const struct color *color)
        free(key);
 }
 
-int config_get_sensor_alarm_high_thresold(const char *sid)
+int config_get_sensor_alarm_high_threshold(const char *sid)
 {
        int res;
        char *key;
 
-       key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESOLD);
+       key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD);
        res = gconf_client_get_int(client, key, NULL);
        free(key);
 
@@ -274,16 +271,38 @@ int config_get_sensor_alarm_high_thresold(const char *sid)
 }
 
 void
-config_set_sensor_alarm_high_thresold(const char *sid, int thresold)
+config_set_sensor_alarm_high_threshold(const char *sid, int threshold)
 {
        char *key;
 
-       key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESOLD);
-       gconf_client_set_int(client, key, thresold, NULL);
+       key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD);
+       gconf_client_set_int(client, key, threshold, NULL);
        free(key);
 }
 
-int config_get_sensor_alarm_enabled(const char *sid)
+int config_get_sensor_alarm_low_threshold(const char *sid)
+{
+       int res;
+       char *key;
+
+       key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD);
+       res = gconf_client_get_int(client, key, NULL);
+       free(key);
+
+       return res;
+}
+
+void
+config_set_sensor_alarm_low_threshold(const char *sid, int threshold)
+{
+       char *key;
+
+       key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD);
+       gconf_client_set_int(client, key, threshold, NULL);
+       free(key);
+}
+
+bool config_get_sensor_alarm_enabled(const char *sid)
 {
        gboolean b;
        char *key;
@@ -292,10 +311,10 @@ int config_get_sensor_alarm_enabled(const char *sid)
        b = gconf_client_get_bool(client, key, NULL);
        free(key);
 
-       return b == TRUE;
+       return b;
 }
 
-void config_set_sensor_alarm_enabled(const char *sid, int enabled)
+void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
 {
        char *key;
 
@@ -304,7 +323,7 @@ void config_set_sensor_alarm_enabled(const char *sid, int enabled)
        free(key);
 }
 
-int config_is_sensor_enabled(const char *sid)
+bool config_is_sensor_enabled(const char *sid)
 {
        gboolean b;
        char *key;
@@ -313,10 +332,10 @@ int config_is_sensor_enabled(const char *sid)
        b = gconf_client_get_bool(client, key, NULL);
        free(key);
 
-       return b == TRUE;
+       return b;
 }
 
-void config_set_sensor_enabled(const char *sid, int enabled)
+void config_set_sensor_enabled(const char *sid, bool enabled)
 {
        char *key;
 
@@ -345,50 +364,54 @@ void config_set_sensor_name(const char *sid, const char *name)
        free(key);
 }
 
-static int is_window_decoration_enabled()
+bool config_is_appindicator_enabled(const char *sid)
 {
+       char *key;
        gboolean b;
 
-       b = gconf_client_get_bool(client,
-                                 KEY_INTERFACE_WINDOW_DECORATION_DISABLED,
-                                 NULL);
+       key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_DISABLED);
+       b = gconf_client_get_bool(client, key, NULL);
+       free(key);
 
-       return b == FALSE;
+       return !b;
 }
 
-static int is_window_keep_below_enabled()
+void config_set_appindicator_enabled(const char *sid, bool enabled)
 {
-       gboolean b;
+       char *key;
 
-       b = gconf_client_get_bool(client,
-                                 KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED,
-                                 NULL);
+       key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_DISABLED);
+       gconf_client_set_bool(client, key, !enabled, NULL);
+       free(key);
+}
 
-       return b == TRUE;
+
+static bool is_window_decoration_enabled()
+{
+       return !gconf_client_get_bool(client,
+                                     KEY_INTERFACE_WINDOW_DECORATION_DISABLED,
+                                     NULL);
 }
 
-static void set_window_decoration_enabled(int enabled)
+static bool is_window_keep_below_enabled()
 {
-       if (enabled)
-               gconf_client_set_bool
-                   (client,
-                    KEY_INTERFACE_WINDOW_DECORATION_DISABLED, FALSE, NULL);
-       else
-               gconf_client_set_bool
-                   (client,
-                    KEY_INTERFACE_WINDOW_DECORATION_DISABLED, TRUE, NULL);
+       return gconf_client_get_bool(client,
+                                    KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED,
+                                    NULL);
 }
 
-static void set_window_keep_below_enabled(int enabled)
+static void set_window_decoration_enabled(bool enabled)
 {
-       if (enabled)
-               gconf_client_set_bool(client,
-                                     KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED,
-                                     TRUE, NULL);
-       else
-               gconf_client_set_bool(client,
-                                     KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED,
-                                     FALSE, NULL);
+       gconf_client_set_bool
+               (client,
+                KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled, NULL);
+}
+
+static void set_window_keep_below_enabled(bool enabled)
+{
+       gconf_client_set_bool(client,
+                             KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED,
+                             enabled, NULL);
 }
 
 /*
@@ -533,22 +556,10 @@ void config_save(const struct config *c)
                              c->window_restore_enabled,
                              NULL);
 
-       gconf_client_set_int(client,
-                            KEY_INTERFACE_WINDOW_X,
-                            c->window_x,
-                            NULL);
-       gconf_client_set_int(client,
-                            KEY_INTERFACE_WINDOW_Y,
-                            c->window_y,
-                            NULL);
-       gconf_client_set_int(client,
-                            KEY_INTERFACE_WINDOW_W,
-                            c->window_w,
-                            NULL);
-       gconf_client_set_int(client,
-                            KEY_INTERFACE_WINDOW_H,
-                            c->window_h,
-                            NULL);
+       gconf_client_set_int(client, KEY_INTERFACE_WINDOW_X, c->window_x, NULL);
+       gconf_client_set_int(client, KEY_INTERFACE_WINDOW_Y, c->window_y, NULL);
+       gconf_client_set_int(client, KEY_INTERFACE_WINDOW_W, c->window_w, NULL);
+       gconf_client_set_int(client, KEY_INTERFACE_WINDOW_H, c->window_h, NULL);
 
        gconf_client_set_int(client,
                             KEY_INTERFACE_WINDOW_DIVIDER_POS,