#include "lmsensor.h"
#include "ui_pref.h"
#include "ui_graph.h"
+#include "ui_status.h"
#ifdef HAVE_UNITY
#include "ui_unity.h"
#include "rsensor.h"
#endif
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
#include "ui_appindicator.h"
-#else
-#include "ui_status.h"
-#endif
#ifdef HAVE_LIBNOTIFY
#include "ui_notify.h"
associate_colors(ui.sensors);
associate_cb_alarm_raised(ui.sensors, &ui);
+ ui_status_init(&ui);
+
/* main window */
ui_window_create(&ui);
ui.sensor_box = NULL;
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
ui_appindicator_init(&ui);
-#else
- ui_status_create();
#endif
gdk_notify_startup_complete();
psensor_list_free(ui.sensors);
ui.sensors = NULL;
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+ ui_appindicator_cleanup();
+#endif
+
+ ui_status_cleanup();
+
g_mutex_unlock(ui.sensors_mutex);
config_cleanup();