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";
c = str_to_color(scolor);
free(scolor);
- if (c == NULL)
+ if (!c)
return color_new(0xffff, 0xffff, 0xffff);
return c;
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()
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, "alarmlimit");
+ key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD);
res = gconf_client_get_int(client, key, NULL);
free(key);
}
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, "alarmlimit");
- 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;
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;
free(key);
}
-int config_is_sensor_enabled(const char *sid)
+bool config_is_sensor_enabled(const char *sid)
{
gboolean b;
char *key;
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;
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);
}
/*
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,