X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=6ec83d1022a1a78f28ec3b24de41ae7ffa708fed;hb=68ce33841da938d3487d9e9c5ab3adc6a7b51418;hp=7eeb15ea122aa5626d23de2f450a56fa6b31af83;hpb=4e7bc75508b67d60a3f12210faff760af326d4bf;p=psensor.git

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 7eeb15e..6ec83d1 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 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
@@ -34,7 +34,8 @@
 static const char *ICON = "psensor_normal";
 static const char *ATTENTION_ICON = "psensor_hot";
 
-static GtkMenuItem **sensor_menu_items;
+static struct psensor **sensors;
+static GtkMenuItem **menu_items;
 static int appindicator_supported = 1;
 static AppIndicator *indicator;
 static struct ui_psensor *ui_psensor;
@@ -128,38 +129,32 @@ static GtkActionEntry entries[] = {
 };
 static guint n_entries = G_N_ELEMENTS(entries);
 
-static void update_sensor_menu_item(GtkMenuItem *item,
-				    struct psensor *s,
-				    int use_celcius)
+static void
+update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
 {
 	gchar *str;
-	double v;
-
-	v = psensor_get_current_value(s);
+	char *v;
 
-	if (is_temp_type(s->type) && !use_celcius)
-		v = celcius_to_fahrenheit(v);
+	v = psensor_current_value_to_str(s, use_celcius);
 
-	str = g_strdup_printf("%s: %2.f %s",
-			      s->name,
-			      v,
-			      psensor_type_to_unit_str(s->type, use_celcius));
+	str = g_strdup_printf("%s: %s", s->name, v);
 
 	gtk_menu_item_set_label(item, str);
 
+	free(v);
 	g_free(str);
 }
 
-static void update_sensor_menu_items(struct psensor **sensors,
-				     int use_celcius)
+static void update_menu_items(int use_celcius)
 {
-	int n, i;
+	struct psensor **s;
+	GtkMenuItem **m;
+
+	if (!sensors)
+		return ;
 
-	n = psensor_list_size(sensors);
-	for (i = 0; i < n; i++)
-		update_sensor_menu_item(sensor_menu_items[i],
-					sensors[i],
-					use_celcius);
+	for (s = sensors, m = menu_items; *s; s++, m++)
+		update_menu_item(*m, *s, use_celcius);
 }
 
 static GtkWidget *get_menu(struct ui_psensor *ui)
@@ -168,9 +163,8 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 	GtkUIManager *menu_manager;
 	GError *error;
 	GtkMenu *menu;
-	int i;
-	int n = psensor_list_size(ui->sensors);
-	struct psensor **sensors = ui->sensors;
+	int i, n, j, celcius;
+	const char *name;
 
 	action_group = gtk_action_group_new("PsensorActions");
 	gtk_action_group_set_translation_domain(action_group, PACKAGE);
@@ -187,23 +181,31 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 
 	menu = GTK_MENU(gtk_ui_manager_get_widget(menu_manager, "/MainMenu"));
 
-	sensor_menu_items = malloc(sizeof(GtkWidget *)*n);
-	for (i = 0; i < n; i++) {
-		struct psensor *s = sensors[i];
+	celcius  = ui->config->temperature_unit == CELCIUS;
+
+	n = psensor_list_size(ui->sensors);
+	menu_items = malloc(n * sizeof(GtkWidget *));
+	sensors = malloc((n + 1) * sizeof(struct psensor *));
+	for (i = 0, j = 0; i < n; i++) {
+		if (config_is_appindicator_enabled(ui->sensors[i]->id)) {
+			sensors[j] = ui->sensors[i];
+			name = sensors[j]->name;
+
+			menu_items[j] = GTK_MENU_ITEM
+				(gtk_menu_item_new_with_label(name));
 
-		sensor_menu_items[i]
-			= GTK_MENU_ITEM(gtk_menu_item_new_with_label(s->name));
+			gtk_menu_shell_insert(GTK_MENU_SHELL(menu),
+					      GTK_WIDGET(menu_items[j]),
+					      j+2);
 
-		gtk_menu_shell_insert(GTK_MENU_SHELL(menu),
-				      GTK_WIDGET(sensor_menu_items[i]),
-				      i+2);
+			update_menu_item(menu_items[j], sensors[j], celcius);
 
-		update_sensor_menu_item
-			(sensor_menu_items[i],
-			 s,
-			 ui->config->temperature_unit == CELCIUS);
+			j++;
+		}
 	}
 
+	sensors[j] = NULL;
+
 	return GTK_WIDGET(menu);
 }
 
@@ -217,22 +219,21 @@ void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
 	status = app_indicator_get_status(indicator);
 
 	if (!attention && status == APP_INDICATOR_STATUS_ATTENTION)
-		app_indicator_set_status
-			(indicator, APP_INDICATOR_STATUS_ACTIVE);
+		app_indicator_set_status(indicator,
+					 APP_INDICATOR_STATUS_ACTIVE);
 
 	if (attention && status == APP_INDICATOR_STATUS_ACTIVE)
-		app_indicator_set_status
-		    (indicator, APP_INDICATOR_STATUS_ATTENTION);
+		app_indicator_set_status(indicator,
+					 APP_INDICATOR_STATUS_ATTENTION);
 
-	update_sensor_menu_items(ui->sensors,
-				 ui->config->temperature_unit == CELCIUS);
+	update_menu_items(ui->config->temperature_unit == CELCIUS);
 }
 
 static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
 {
 	GtkStatusIcon *ico;
 
-	log_debug("ui_appindicator#unity_fallback");
+	log_debug("ui_appindicator.unity_fallback()");
 
 	appindicator_supported = 0;
 
@@ -246,17 +247,25 @@ static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
 static void
 unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
 {
-	log_debug("ui_appindicator#unity_unfallback");
+	log_debug("ui_appindicator.unity_unfallback()");
 
 	ui_status_set_visible(0);
 
 	appindicator_supported = 1;
 }
 
-void ui_appindicator_init(struct ui_psensor *ui)
+void ui_appindicator_update_menu(struct ui_psensor *ui)
 {
 	GtkWidget *menu;
 
+	menu = get_menu(ui);
+	app_indicator_set_menu(indicator, GTK_MENU(menu));
+
+	gtk_widget_show_all(menu);
+}
+
+void ui_appindicator_init(struct ui_psensor *ui)
+{
 	ui_psensor = ui;
 
 	indicator = app_indicator_new
@@ -270,10 +279,7 @@ void ui_appindicator_init(struct ui_psensor *ui)
 	app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE);
 	app_indicator_set_attention_icon(indicator, ATTENTION_ICON);
 
-	menu = get_menu(ui);
-	app_indicator_set_menu(indicator, GTK_MENU(menu));
-
-	gtk_widget_show_all(menu);
+	ui_appindicator_update_menu(ui);
 }
 
 int is_appindicator_supported()
@@ -283,5 +289,6 @@ int is_appindicator_supported()
 
 void ui_appindicator_cleanup()
 {
+	free(sensors);
 	/* TODO: cleanup menu items. */
 }