diff options
Diffstat (limited to 'src/trayfreq.c')
| -rw-r--r-- | src/trayfreq.c | 69 |
1 files changed, 37 insertions, 32 deletions
diff --git a/src/trayfreq.c b/src/trayfreq.c index 4500dab..4e43e0b 100644 --- a/src/trayfreq.c +++ b/src/trayfreq.c @@ -1,28 +1,28 @@ /************************************************************************ - * This file is part of trayfreq. * + * This file is part of trayfreq-archlinux. * * * - * trayfreq 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 3 of the License, or * - * (at your option) any later version. * + * trayfreq-archlinux 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 3 of the * + * License, or (at your option) any later version. * * * - * trayfreq is distributed in the hope that it will be useful, * + * trayfreq-archlinux 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 trayfreq. If not, see <http://www.gnu.org/licenses/>. * + * along with trayfreq-archlinux. If not, see * + * <http://www.gnu.org/licenses/>. * ************************************************************************/ #include "widget_manager.h" #include "tray.h" -#include "bat_tray.h" -#include "getfreq.h" -#include "getcore.h" -#include "getbat.h" -#include "getgov.h" -#include "utilities.h" +#include "bat_tray/bat_tray.h" +#include "freq_tray/getfreq.h" +#include "freq_tray/getcore.h" +#include "bat_tray/getbat.h" +#include "freq_tray/getgov.h" #include "config_file.h" #include "defaults.h" @@ -36,28 +36,32 @@ static gboolean SHOW_BATTERY = TRUE; void config_init() { struct config_file config; - gboolean home_config_exists = TRUE; + FILE* fd = NULL; + gboolean home_config_exists; config.key_file = NULL; - gchar* home = getenv("HOME"); - config.file_name = g_strconcat(home, "/.trayfreq.config", NULL); - FILE* fd = fopen(config.file_name, "r"); - if(!fd) + config.file_name = g_strconcat(getenv("HOME"), "/.trayfreq.config", NULL); + + // Check if ~/.trayfreq.config exists + if( (fd = fopen(config.file_name, "r")) ) { + // If file exists, close it, set param to TRUE + fclose(fd); + home_config_exists = TRUE; + } else { + // If file didn't exist, it's not open (don't close it), free filename var, set param to FALSE g_free(config.file_name); home_config_exists = FALSE; - } else { - fclose(fd); } if(!home_config_exists) - config.file_name = g_strconcat(util_get_prefix(), "/share/trayfreq/trayfreq.config", NULL); + config.file_name = g_strconcat("/usr/share/trayfreq/trayfreq.config", NULL); gboolean success = config_open(&config); if(!success) { - g_warning("Unsuccessful opening configuration files"); + g_warning("Failed to open config files!\n"); return; } @@ -69,19 +73,19 @@ void config_init() gchar * ac_gov = config_get_key (&config, "ac", "governor"); if(def_prog) - def_set_prog(def_prog); + _DEFAULT_PROG = def_prog; if(def_gov) - def_set_gov(def_gov); + _DEFAULT_GOV = def_gov; if(def_freq) - def_set_freq(def_freq); + _DEFAULT_FREQ = def_freq; if (bat_gov) - def_set_bat_gov (bat_gov); + _DEFAULT_BAT_GOV = bat_gov; if (ac_gov) - def_set_ac_gov (ac_gov); + _DEFAULT_AC_GOV = ac_gov; if(show_bat) { @@ -90,18 +94,18 @@ void config_init() 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) + if(!gtk_init_check(&argc, &argv)) { - g_error("I was unable to initialize gtk. gtk_init_check returned FALSE."); + g_error("Cannot initialize gtk: gtk_init_check returned FALSE.\nBailing."); + return 1; } config_init(); @@ -111,7 +115,8 @@ int main(int argc, char** argv) tray_init(); tray_show(); - if(gb_init() && SHOW_BATTERY) + // Show battery tray only if we're supposed to + if(SHOW_BATTERY) { bat_tray_init(); bat_tray_show(); |