status icon

[psensor.git] / src / ui_appindicator.c

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 5497c7f..08ef670 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -28,17 +28,17 @@
 #include "ui.h"
 #include "ui_appindicator.h"
 #include "ui_sensorpref.h"
+#include "ui_status.h"
 #include "ui_pref.h"
 
 static GtkMenuItem **sensor_menu_items;
 static GtkWidget *main_window;
 static int appindicator_supported = 1;
+static AppIndicator *indicator;
 
 static void cb_menu_show(GtkMenuItem *mi, gpointer data)
 {
-       struct ui_psensor *ui = (struct ui_psensor *)data;
-
-       gtk_window_present(GTK_WINDOW(ui->main_window));
+       ui_window_show((struct ui_psensor *)data);
 }
 
 static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
@@ -59,8 +59,7 @@ static void cb_menu_preferences(GtkMenuItem *mi, gpointer data)
 #endif
 }
 
-static void
-cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
+static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 {
        struct ui_psensor *ui = data;
 
@@ -142,12 +141,11 @@ static void update_sensor_menu_item(GtkMenuItem *item, struct psensor *s)
 
 static void update_sensor_menu_items(struct psensor **sensors)
 {
-       int n = psensor_list_size(sensors);
-       int i;
+       int n, i;
 
+       n = psensor_list_size(sensors);
        for (i = 0; i < n; i++)
-               update_sensor_menu_item(sensor_menu_items[i],
-                                       sensors[i]);
+               update_sensor_menu_item(sensor_menu_items[i], sensors[i]);
 }
 
 static GtkWidget *get_menu(struct ui_psensor *ui)
@@ -195,36 +193,22 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
        return GTK_WIDGET(menu);
 }
 
-
-void ui_appindicator_update(struct ui_psensor *ui)
+void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
 {
-       struct psensor **sensor_cur = ui->sensors;
        AppIndicatorStatus status;
-       int attention = 0;
 
-       if (!ui->indicator)
+       if (!indicator)
                return;
 
-       while (*sensor_cur) {
-               struct psensor *s = *sensor_cur;
-
-               if (s->alarm_enabled && s->alarm_raised) {
-                       attention = 1;
-                       break;
-               }
-
-               sensor_cur++;
-       }
-
-       status = app_indicator_get_status(ui->indicator);
+       status = app_indicator_get_status(indicator);
 
        if (!attention && status == APP_INDICATOR_STATUS_ATTENTION)
                app_indicator_set_status
-                   (ui->indicator, APP_INDICATOR_STATUS_ACTIVE);
+                       (indicator, APP_INDICATOR_STATUS_ACTIVE);
 
        if (attention && status == APP_INDICATOR_STATUS_ACTIVE)
                app_indicator_set_status
-                   (ui->indicator, APP_INDICATOR_STATUS_ATTENTION);
+                   (indicator, APP_INDICATOR_STATUS_ATTENTION);
 
        update_sensor_menu_items(ui->sensors);
 }
@@ -233,26 +217,22 @@ static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
 {
        log_printf(LOG_DEBUG, "ui_appindicator#unity_fallback");
 
-       gtk_widget_show_all(main_window);
-
        appindicator_supported = 0;
 
-       return NULL;
+       return ui_status_get_icon();
 }
 
-static void unity_unfallback(AppIndicator *indicator,
-                            GtkStatusIcon *status_icon)
+static void
+unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
 {
        log_printf(LOG_DEBUG, "ui_appindicator#unity_unfallback");
 
        appindicator_supported = 1;
 }
 
-
 void ui_appindicator_init(struct ui_psensor *ui)
 {
        GtkWidget *menu;
-       AppIndicator *indicator;
 
        main_window = ui->main_window;
 
@@ -270,8 +250,6 @@ void ui_appindicator_init(struct ui_psensor *ui)
        menu = get_menu(ui);
        app_indicator_set_menu(indicator, GTK_MENU(menu));
 
-       ui->indicator = indicator;
-
        gtk_widget_show_all(menu);
 }