From 801455e69461f3e7cdfd546958ed4c10673a5726 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 13 Feb 2014 21:50:39 +1300 Subject: Fixes --- src/trayfreq.c | 107 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 51 deletions(-) (limited to 'src/trayfreq.c') 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; } -- cgit v1.1