support of fahrenheit option

[psensor.git] / src / cfg.c

diff --git a/src/cfg.c b/src/cfg.c
index 73cc7e8..99181ee 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -1,22 +1,21 @@
 /*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2012 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -69,6 +68,11 @@
 #define KEY_INTERFACE_WINDOW_W "/apps/psensor/interface/window_w"
 #define KEY_INTERFACE_WINDOW_H "/apps/psensor/interface/window_h"
 
+#define KEY_INTERFACE_WINDOW_DIVIDER_POS \
+"/apps/psensor/interface/window_divider_pos"
+
+#define KEY_INTERFACE_TEMPERATURE_UNIT \
+"/apps/psensor/interface/temperature_unit"
 
 GConfClient *client;
 
@@ -144,7 +148,6 @@ static double config_get_graph_background_alpha()
        double a = gconf_client_get_float(client,
                                          KEY_GRAPH_BACKGROUND_ALPHA,
                                          NULL);
-
        if (a == 0)
                gconf_client_set_float(client,
                                       KEY_GRAPH_BACKGROUND_ALPHA, 1.0, NULL);
@@ -480,12 +483,19 @@ struct config *config_load()
        c->window_h = gconf_client_get_int(client,
                                           KEY_INTERFACE_WINDOW_H,
                                           NULL);
+       c->window_divider_pos
+               = gconf_client_get_int(client,
+                                      KEY_INTERFACE_WINDOW_DIVIDER_POS,
+                                      NULL);
 
-       if (!c->window_w || !c->window_h) {
+       if (!c->window_restore_enabled || !c->window_w || !c->window_h) {
                c->window_w = 800;
                c->window_h = 200;
        }
 
+       c->temperature_unit = gconf_client_get_int
+               (client, KEY_INTERFACE_TEMPERATURE_UNIT, NULL);
+
        return c;
 }
 
@@ -543,4 +553,15 @@ void config_save(struct config *c)
                             KEY_INTERFACE_WINDOW_H,
                             c->window_h,
                             NULL);
+
+       gconf_client_set_int(client,
+                            KEY_INTERFACE_WINDOW_DIVIDER_POS,
+                            c->window_divider_pos,
+                            NULL);
+
+       gconf_client_set_int(client,
+                            KEY_INTERFACE_TEMPERATURE_UNIT,
+                            c->temperature_unit,
+                            NULL);
+
 }