projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
status
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
a88e25e
..
f06ea5b
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-40,6
+40,7
@@
#include "lmsensor.h"
#include "ui_pref.h"
#include "ui_graph.h"
#include "lmsensor.h"
#include "ui_pref.h"
#include "ui_graph.h"
+#include "ui_status.h"
#ifdef HAVE_UNITY
#include "ui_unity.h"
#ifdef HAVE_UNITY
#include "ui_unity.h"
@@
-59,8
+60,6
@@
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
#include "ui_appindicator.h"
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
#include "ui_appindicator.h"
-#else
-#include "ui_status.h"
#endif
#ifdef HAVE_LIBNOTIFY
#endif
#ifdef HAVE_LIBNOTIFY
@@
-448,7
+447,7
@@
int main(int argc, char **argv)
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
ui_appindicator_init(&ui);
#else
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
ui_appindicator_init(&ui);
#else
- ui_status_
create
();
+ ui_status_
init
();
#endif
gdk_notify_startup_complete();
#endif
gdk_notify_startup_complete();
@@
-473,6
+472,12
@@
int main(int argc, char **argv)
psensor_list_free(ui.sensors);
ui.sensors = NULL;
psensor_list_free(ui.sensors);
ui.sensors = NULL;
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+ ui_appindicator_cleanup();
+#else
+ ui_status_cleanup();
+#endif
+
g_mutex_unlock(ui.sensors_mutex);
config_cleanup();
g_mutex_unlock(ui.sensors_mutex);
config_cleanup();