From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 11 Nov 2011 19:09:30 +0000 (+0000)
Subject: indicator as static
X-Git-Tag: v0.8.0.5~560
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=f2794ceb2db81a8be40649d151301ea8312bbece

indicator as static
---

diff --git a/src/ui.h b/src/ui.h
index f6559cd..b32dc80 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -63,10 +63,6 @@ struct ui_psensor {
 	/* Time of the last notification */
 	struct timeval *notification_last_time;
 #endif
-
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-	AppIndicator *indicator;
-#endif
 };
 
 /*
diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index e287e74..3d7f5a0 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -33,6 +33,7 @@
 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)
 {
@@ -198,18 +199,18 @@ void ui_appindicator_update(struct ui_psensor *ui,
 {
 	AppIndicatorStatus status;
 
-	if (!ui->indicator)
+	if (!indicator)
 		return;
 
-	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);
 }
@@ -236,7 +237,6 @@ static void unity_unfallback(AppIndicator *indicator,
 void ui_appindicator_init(struct ui_psensor *ui)
 {
 	GtkWidget *menu;
-	AppIndicator *indicator;
 
 	main_window = ui->main_window;
 
@@ -254,8 +254,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);
 }