share same fct to present main window

[psensor.git] / src / ui_appindicator.c

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index a7c662c..e287e74 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -36,9 +36,7 @@ static int appindicator_supported = 1;
 
 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)
@@ -195,27 +193,14 @@ 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)
                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);
 
        if (!attention && status == APP_INDICATOR_STATUS_ATTENTION)
@@ -248,29 +233,30 @@ static void unity_unfallback(AppIndicator *indicator,
        appindicator_supported = 1;
 }
 
-
 void ui_appindicator_init(struct ui_psensor *ui)
 {
-       GtkWidget *indicatormenu;
+       GtkWidget *menu;
+       AppIndicator *indicator;
 
        main_window = ui->main_window;
 
-       ui->indicator
-           = app_indicator_new("psensor",
-                               "psensor_normal",
-                               APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+       indicator = app_indicator_new
+               ("psensor",
+                "psensor_normal",
+                APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
-       APP_INDICATOR_GET_CLASS(ui->indicator)->fallback = unity_fallback;
-       APP_INDICATOR_GET_CLASS(ui->indicator)->unfallback = unity_unfallback;
+       APP_INDICATOR_GET_CLASS(indicator)->fallback = unity_fallback;
+       APP_INDICATOR_GET_CLASS(indicator)->unfallback = unity_unfallback;
 
-       app_indicator_set_status(ui->indicator, APP_INDICATOR_STATUS_ACTIVE);
-       app_indicator_set_attention_icon(ui->indicator, "psensor_hot");
+       app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE);
+       app_indicator_set_attention_icon(indicator, "psensor_hot");
 
-       indicatormenu = get_menu(ui);
+       menu = get_menu(ui);
+       app_indicator_set_menu(indicator, GTK_MENU(menu));
 
-       gtk_widget_show_all(indicatormenu);
+       ui->indicator = indicator;
 
-       app_indicator_set_menu(ui->indicator, GTK_MENU(indicatormenu));
+       gtk_widget_show_all(menu);
 }
 
 int is_appindicator_supported()