X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fcfg.c;h=55a20e50c105e4196929a01e39c9b7ef046d6519;hb=11754fc1183bbca571714f032ee6b42c7df9e6dd;hp=daa0a89f4cbf19cf86446b7d90d2807221bd551d;hpb=f7966462c5b2b82560a691022708f6d043b8a199;p=psensor.git

diff --git a/src/cfg.c b/src/cfg.c
index daa0a89..55a20e5 100644
--- 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)
 {
@@ -424,9 +424,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 +445,8 @@ struct config *config_load()
 {
 	struct config *c;
 
+	init();
+
 	c = malloc(sizeof(struct config));
 
 	c->graph_bgcolor = config_get_background_color();