From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 10 Nov 2011 20:06:22 +0000 (+0000)
Subject: status icon
X-Git-Tag: v0.8.0.5~572
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=d915d840d60e6a634fbd38be2b92c1a293aed18c

status icon
---

diff --git a/po/Makefile.in b/po/Makefile.in
index 758a503..8b758af 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -21,7 +21,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /tmp/r
+prefix = /usr/local
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}
@@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/wpitchoune.net/psensor/trunk/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/psensor/trunk/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/psensor/trunk/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 
diff --git a/src/main.c b/src/main.c
index f06ea5b..e9277d1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -446,10 +446,10 @@ int main(int argc, char **argv)
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
 	ui_appindicator_init(&ui);
-#else
-	ui_status_init();
 #endif
 
+	ui_status_init();
+
 	gdk_notify_startup_complete();
 
 	/* main loop */
@@ -474,10 +474,10 @@ int main(int argc, char **argv)
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
 	ui_appindicator_cleanup();
-#else
-	ui_status_cleanup();
 #endif
 
+	ui_status_cleanup();
+
 	g_mutex_unlock(ui.sensors_mutex);
 
 	config_cleanup();
diff --git a/src/ui_status.c b/src/ui_status.c
index 49137e0..b3a0b2d 100644
--- a/src/ui_status.c
+++ b/src/ui_status.c
@@ -30,8 +30,6 @@ void ui_status_init()
 
         status = gtk_status_icon_new();
         gtk_status_icon_set_from_icon_name(status, "psensor");
-        gtk_status_icon_set_tooltip(status, 
-                                    "Psensor - Hardware Sensors Monitoring");
         gtk_status_icon_set_visible(status, TRUE);
 }
 
@@ -42,5 +40,7 @@ int is_status_supported()
 
 void ui_status_cleanup()
 {
+	log_printf(LOG_DEBUG, "ui_status_cleanup()");
+
 	g_object_unref(G_OBJECT(status));
 }