/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 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
#include "cpu.h"
#endif
-#include "compat.h"
-
static const char *program_name;
static void print_version()
"This is free software: you are free to change and "
" redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"),
- "2010-2012");
+ "2010-2013");
}
static void print_help()
graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
- ui_sensorlist_update(ui);
+ ui_sensorlist_update(ui, 0);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
/* main window */
ui_window_create(&ui);
- ui.sensor_box = NULL;
-
- /* drawing box */
- ui.w_graph = ui_graph_create(&ui);
ui_enable_alpha_channel(&ui);
- /* sensor list */
- ui_sensorlist_create(&ui);
-
thread = g_thread_create((GThreadFunc) update_measures,
&ui, TRUE, &error);
/*
* hack, did not find a cleaner solution.
- * wait 2s to ensure that the status icon is attempted to be
+ * wait 30s to ensure that the status icon is attempted to be
* drawn before determining whether the main window must be
* show.
*/
- g_timeout_add(2000, (GSourceFunc)initial_window_show, &ui);
+ if (ui.config->hide_on_startup)
+ g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+ else
+ initial_window_show(&ui);
/* main loop */
gtk_main();
- g_object_ref(app);
+ g_object_unref(app);
cleanup(&ui);
log_debug("Quitting...");
log_close();
+ if (url)
+ free(url);
+
return 0;
}