X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_status.c;h=a978929461b665cb43cc95da767684cddbafd27d;hb=0acbbfd3bee0ebad1faae5b8314aea10a9cc123e;hp=1b27b6e12bf281464e781897b1608a4e9563a4d0;hpb=6fd0582cc0f57ede04da2dbb1396625be4440b04;p=psensor.git

diff --git a/src/ui_status.c b/src/ui_status.c
index 1b27b6e..a978929 100644
--- a/src/ui_status.c
+++ b/src/ui_status.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 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
@@ -16,18 +16,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-
-#include "log.h"
+#include <plog.h>
 #include "ui_status.h"
 
+static const char *ICON = "psensor_normal";
+static const char *ATTENTION_ICON = "psensor_hot";
+
 static GtkStatusIcon *status;
 static unsigned status_attention;
 
 static void cb_activate(GtkStatusIcon *icon,
 			gpointer data)
 {
-	log_printf(LOG_DEBUG, "cb_activate()");
-
+	log_debug("cb_activate()");
 	ui_window_show((struct ui_psensor *)data);
 }
 
@@ -36,19 +37,19 @@ static void cb_popup_menu(GtkStatusIcon *icon,
 			  guint activate_time,
 			  gpointer data)
 {
-	log_printf(LOG_DEBUG, "cb_popup_menu()");
+	log_debug("cb_popup_menu()");
 }
 
 void ui_status_init(struct ui_psensor *ui)
 {
 	if (status)
-		return ;
+		return;
 
-	log_printf(LOG_DEBUG, "ui_status_create()");
+	log_debug("ui_status_create()");
 
 	status = gtk_status_icon_new();
-	gtk_status_icon_set_from_icon_name(status, "psensor_normal");
-	gtk_status_icon_set_visible(status, TRUE);
+	gtk_status_icon_set_from_icon_name(status, ICON);
+	ui_status_set_visible(0);
 
 	g_signal_connect(G_OBJECT(status),
 			 "popup-menu",
@@ -61,31 +62,49 @@ void ui_status_init(struct ui_psensor *ui)
 			 ui);
 }
 
-int is_status_supported()
+int is_status_supported(void)
 {
-	return gtk_status_icon_is_embedded(status);
+	return status && gtk_status_icon_is_embedded(status);
 }
 
-void ui_status_cleanup()
+void ui_status_cleanup(void)
 {
-	log_printf(LOG_DEBUG, "ui_status_cleanup()");
+	log_debug("ui_status_cleanup()");
 
-	g_object_unref(G_OBJECT(status));
+	if (status) {
+		g_object_unref(G_OBJECT(status));
+		status = NULL;
+	}
 }
 
 void ui_status_update(struct ui_psensor *ui, unsigned int attention)
 {
-	log_printf(LOG_DEBUG, "ui_status_update()");
+	log_debug("ui_status_update()");
 
 	if (status_attention && !attention)
-		gtk_status_icon_set_from_icon_name(status, "psensor_normal");
+		gtk_status_icon_set_from_icon_name(status, ICON);
 	else if (!status_attention && attention)
-		gtk_status_icon_set_from_icon_name(status, "psensor_hot");
+		gtk_status_icon_set_from_icon_name(status, ATTENTION_ICON);
 
 	status_attention = attention;
 }
 
-GtkStatusIcon *ui_status_get_icon()
+GtkStatusIcon *ui_status_get_icon(struct ui_psensor *ui)
 {
+	if (!status)
+		ui_status_init(ui);
+
 	return status;
 }
+
+void ui_status_set_visible(unsigned int visible)
+{
+	log_debug("ui_status_set_visible(%d)", visible);
+
+	if (status) {
+		if (visible)
+			gtk_status_icon_set_visible(status, TRUE);
+		else
+			gtk_status_icon_set_visible(status, FALSE);
+	}
+}