logging

[psensor.git] / src / ui_status.c

diff --git a/src/ui_status.c b/src/ui_status.c
index 517ab27..df79172 100644 (file)
--- a/src/ui_status.c
+++ b/src/ui_status.c
@@ -17,22 +17,18 @@
  * 02110-1301 USA
  */
 
-#include <gtk/gtk.h>
-
 #include "log.h"
 #include "ui_status.h"
 
-GtkStatusIcon *status;
+static GtkStatusIcon *status;
+static unsigned status_attention;
 
 static void cb_activate(GtkStatusIcon *icon,
                        gpointer data)
 {
-       struct ui_psensor *ui;
-
-       log_printf(LOG_DEBUG, "cb_activate()");
+       log_debug("cb_activate()");
 
-       ui = (struct ui_psensor *)data;
-       gtk_window_present(GTK_WINDOW(ui->main_window));
+       ui_window_show((struct ui_psensor *)data);
 }
 
 static void cb_popup_menu(GtkStatusIcon *icon,
@@ -40,15 +36,18 @@ 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)
 {
-       log_printf(LOG_DEBUG, "ui_status_create()");
+       if (status)
+               return ;
+
+       log_debug("ui_status_create()");
 
        status = gtk_status_icon_new();
-       gtk_status_icon_set_from_icon_name(status, "psensor");
+       gtk_status_icon_set_from_icon_name(status, "psensor_normal");
        gtk_status_icon_set_visible(status, TRUE);
 
        g_signal_connect(G_OBJECT(status),
@@ -69,12 +68,24 @@ int is_status_supported()
 
 void ui_status_cleanup()
 {
-       log_printf(LOG_DEBUG, "ui_status_cleanup()");
+       log_debug("ui_status_cleanup()");
 
        g_object_unref(G_OBJECT(status));
 }
 
 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");
+       else if (!status_attention && attention)
+               gtk_status_icon_set_from_icon_name(status, "psensor_hot");
+
+       status_attention = attention;
+}
+
+GtkStatusIcon *ui_status_get_icon()
+{
+       return status;
 }