unify bool usage

[psensor.git] / src / cfg.c

diff --git a/src/cfg.c b/src/cfg.c
index 21989a7..459193b 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -33,6 +33,7 @@ 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";
@@ -142,11 +143,7 @@ static struct color *get_foreground_color()
 
 static unsigned int 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()
@@ -314,7 +311,7 @@ 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)
@@ -335,7 +332,7 @@ 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)
@@ -367,50 +364,54 @@ void config_set_sensor_name(const char *sid, const char *name)
        free(key);
 }
 
-static int is_window_decoration_enabled()
+unsigned int 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, unsigned int 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);
+}
+
+
+static int is_window_decoration_enabled()
+{
+       return !gconf_client_get_bool(client,
+                                     KEY_INTERFACE_WINDOW_DECORATION_DISABLED,
+                                     NULL);
+}
 
-       return b == TRUE;
+static int is_window_keep_below_enabled()
+{
+       return gconf_client_get_bool(client,
+                                    KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED,
+                                    NULL);
 }
 
 static void set_window_decoration_enabled(int 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);
+       gconf_client_set_bool
+               (client,
+                KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled, NULL);
 }
 
 static void set_window_keep_below_enabled(int 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_KEEP_BELOW_ENABLED,
+                             enabled, NULL);
 }
 
 /*