code style

[psensor.git] / src / cfg.c

diff --git a/src/cfg.c b/src/cfg.c
index daa0a89..93f1db3 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -74,7 +74,7 @@
 #define KEY_INTERFACE_TEMPERATURE_UNIT \
 "/apps/psensor/interface/temperature_unit"
 
-GConfClient *client;
+static GConfClient *client;
 
 static char *get_string(char *key, char *default_value)
 {
@@ -95,7 +95,7 @@ static struct color *config_get_background_color()
 {
 
        char *scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR,
-                                        DEFAULT_GRAPH_BACKGROUND_COLOR);
+                                 DEFAULT_GRAPH_BACKGROUND_COLOR);
 
        struct color *c = string_to_color(scolor);
 
@@ -325,7 +325,6 @@ int config_is_sensor_enabled(char *sid)
        free(escaped_name);
 
        return res == TRUE;
-
 }
 
 void config_set_sensor_enabled(char *sid, int enabled)
@@ -424,9 +423,13 @@ static void config_set_window_keep_below_enabled(int enabled)
                                      FALSE, NULL);
 }
 
-void config_init()
+/*
+ * Initializes the GConf client.
+ */
+static void init()
 {
-       client = gconf_client_get_default();
+       if (!client)
+               client = gconf_client_get_default();
 }
 
 void config_cleanup()
@@ -441,6 +444,8 @@ struct config *config_load()
 {
        struct config *c;
 
+       init();
+
        c = malloc(sizeof(struct config));
 
        c->graph_bgcolor = config_get_background_color();
@@ -586,5 +591,4 @@ void config_save(struct config *c)
                             KEY_INTERFACE_TEMPERATURE_UNIT,
                             c->temperature_unit,
                             NULL);
-
 }