aboutsummaryrefslogtreecommitdiff
path: root/src/trayfreq.c
diff options
context:
space:
mode:
authorDavid <dbphillipsnz@gmail.com>2014-02-13 21:50:39 +1300
committerDavid <dbphillipsnz@gmail.com>2014-02-13 21:50:39 +1300
commit801455e69461f3e7cdfd546958ed4c10673a5726 (patch)
tree21ca2bfaeeb456580a6387de445c623459af2bc0 /src/trayfreq.c
parentada817cc90ad8207e38c42604a6823ad8bbf7112 (diff)
downloadparamano-801455e69461f3e7cdfd546958ed4c10673a5726.tar.xz
Fixes
Diffstat (limited to 'src/trayfreq.c')
-rw-r--r--src/trayfreq.c107
1 files changed, 56 insertions, 51 deletions
diff --git a/src/trayfreq.c b/src/trayfreq.c
index 2b65af5..3d5b362 100644
--- a/src/trayfreq.c
+++ b/src/trayfreq.c
@@ -54,65 +54,70 @@ void config_init()
gboolean success = config_open(&config);
- if(!success)
- {
- g_warning("Unsuccessful opening configuration files");
- return;
- }
+ if(!success)
+ {
+ g_warning("Unsuccessful opening configuration files");
+ return;
+ }
- gchar * def_prog = config_get_key(&config, "events", "activate");
- gchar * def_gov = config_get_key(&config, "governor", "default");
- gchar * def_freq = config_get_key(&config, "frequency", "default");
- gchar * show_bat = config_get_key(&config, "battery", "show");
- gchar * bat_gov = config_get_key (&config, "battery", "governor");
- gchar * ac_gov = config_get_key (&config, "ac", "governor");
-
- if(def_prog)
- def_set_prog(def_prog);
- if(def_gov)
- def_set_gov(def_gov);
- if(def_freq)
- def_set_freq(def_freq);
- if (bat_gov)
- def_set_bat_gov (bat_gov);
- if (ac_gov)
- def_set_ac_gov (ac_gov);
- if(show_bat)
- {
- if(g_strcmp0(show_bat, "1") == 0)
- SHOW_BATTERY = TRUE;
- else
- SHOW_BATTERY = FALSE;
- }
+ gchar * def_prog = config_get_key(&config, "events", "activate");
+ gchar * def_gov = config_get_key(&config, "governor", "default");
+ gchar * def_freq = config_get_key(&config, "frequency", "default");
+ gchar * show_bat = config_get_key(&config, "battery", "show");
+ gchar * bat_gov = config_get_key (&config, "battery", "governor");
+ gchar * ac_gov = config_get_key (&config, "ac", "governor");
+
+ if(def_prog)
+ def_set_prog(def_prog);
- g_free(config.file_name);
- config_close(&config);
-};
+ if(def_gov)
+ def_set_gov(def_gov);
+
+ if(def_freq)
+ def_set_freq(def_freq);
+
+ if (bat_gov)
+ def_set_bat_gov (bat_gov);
+
+ if (ac_gov)
+ def_set_ac_gov (ac_gov);
+
+ if(show_bat)
+ {
+ if(g_strcmp0(show_bat, "1") == 0)
+ SHOW_BATTERY = TRUE;
+ else
+ SHOW_BATTERY = FALSE;
+ }
+
+ g_free(config.file_name);
+ config_close(&config);
+}
int main(int argc, char** argv)
{
- gboolean gtk_init_success = gtk_init_check(&argc, &argv);
+ gboolean gtk_init_success = gtk_init_check(&argc, &argv);
- if(!gtk_init_success)
- {
- g_error("I was unable to initialize gtk. gtk_init_check returned FALSE.");
- }
+ if(!gtk_init_success)
+ {
+ g_error("I was unable to initialize gtk. gtk_init_check returned FALSE.");
+ }
- config_init();
- gc_init();
- gg_init();
- gf_init();
- tray_init();
- tray_show();
-
- if(gb_init() && SHOW_BATTERY)
- {
- bat_tray_init();
- bat_tray_show();
-}
+ config_init();
+ gc_init();
+ gg_init();
+ gf_init();
+ tray_init();
+ tray_show();
+
+ if(gb_init() && SHOW_BATTERY)
+ {
+ bat_tray_init();
+ bat_tray_show();
+ }
- gtk_main();
- return 0;
+ gtk_main();
+ return 0;
}