X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fui_appindicator.c;h=ed4cc6418ab6d577d8b39c4a9a511dea5fab0f88;hp=57d4fe97083618656cd69b2da97cade685ab9895;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=e8c4acf38e52589858842188fef5c308c8879349

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 57d4fe9..ed4cc64 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 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
@@ -23,13 +23,13 @@
 #include <gtk/gtk.h>
 #include <libappindicator/app-indicator.h>
 
-#include "cfg.h"
-#include "psensor.h"
-#include "ui.h"
-#include "ui_appindicator.h"
-#include "ui_sensorpref.h"
-#include "ui_status.h"
-#include "ui_pref.h"
+#include <cfg.h>
+#include <psensor.h>
+#include <ui.h>
+#include <ui_appindicator.h>
+#include <ui_sensorpref.h>
+#include <ui_status.h>
+#include <ui_pref.h>
 
 static const char *ICON = "psensor_normal";
 static const char *ATTENTION_ICON = "psensor_hot";
@@ -90,19 +90,21 @@ static void update_menu_items(int use_celsius)
 }
 
 static void
-build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
+create_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
 {
 	int i, j, n, celsius;
 	const char *name;
 	struct psensor **sorted_sensors;
 
-	free(menu_items);
-
-	celsius  = ui->config->temperature_unit == CELSIUS;
+	if (config_get_temperature_unit() == CELSIUS)
+		celsius = 1;
+	else
+		celsius = 0;
 
-	sorted_sensors = ui_get_sensors_ordered_by_position(ui);
+	sorted_sensors = ui_get_sensors_ordered_by_position(ui->sensors);
 	n = psensor_list_size(sorted_sensors);
-	menu_items = malloc(n * sizeof(GtkWidget *));
+	menu_items = malloc((n + 1) * sizeof(GtkWidget *));
+
 	sensors = malloc((n + 1) * sizeof(struct psensor *));
 	for (i = 0, j = 0; i < n; i++) {
 		if (config_is_appindicator_enabled(sorted_sensors[i]->id)) {
@@ -123,11 +125,12 @@ build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
 	}
 
 	sensors[j] = NULL;
+	menu_items[j] = NULL;
 
 	free(sorted_sensors);
 }
 
-static GtkWidget *get_menu(struct ui_psensor *ui)
+static GtkMenu *load_menu(struct ui_psensor *ui)
 {
 	GError *error;
 	GtkMenu *menu;
@@ -139,10 +142,7 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 	builder = gtk_builder_new();
 
 	error = NULL;
-	ok = gtk_builder_add_from_file
-	(builder,
-	 GLADE_FILE,
-	 &error);
+	ok = gtk_builder_add_from_file(builder, GLADE_FILE, &error);
 
 	if (!ok) {
 		log_err(_("Failed to load glade file %s: %s"),
@@ -153,7 +153,7 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 	}
 
 	menu = GTK_MENU(gtk_builder_get_object(builder, "appindicator_menu"));
-	build_sensor_menu_items(ui, menu);
+	create_sensor_menu_items(ui, menu);
 	gtk_builder_connect_signals(builder, ui);
 
 	g_object_ref(G_OBJECT(menu));
@@ -161,21 +161,27 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 
 	log_fct_exit();
 
-	return GTK_WIDGET(menu);
+	return menu;
 }
 
 static void update_label(struct ui_psensor *ui)
 {
 	char *label, *str, *tmp, *guide;
 	struct psensor **p;
+	int use_celsius;
 
-	p =  ui_get_sensors_ordered_by_position(ui);
+	p =  ui_get_sensors_ordered_by_position(ui->sensors);
 	label = NULL;
 	guide = NULL;
+
+	if (config_get_temperature_unit() == CELSIUS)
+		use_celsius = 1;
+	else
+		use_celsius = 0;
+
 	while (*p) {
 		if (config_is_appindicator_label_enabled((*p)->id)) {
-			str = psensor_current_value_to_str
-				(*p, ui->config->temperature_unit == CELSIUS);
+			str = psensor_current_value_to_str(*p, use_celsius);
 
 			if (label == NULL) {
 				label = str;
@@ -233,9 +239,12 @@ void ui_appindicator_update(struct ui_psensor *ui, bool attention)
 
 	if (attention && status == APP_INDICATOR_STATUS_ACTIVE)
 		app_indicator_set_status(indicator,
-					 APP_INDICATOR_STATUS_ATTENTION);
+		APP_INDICATOR_STATUS_ATTENTION);
 
-	update_menu_items(ui->config->temperature_unit == CELSIUS);
+	if (config_get_temperature_unit() == CELSIUS)
+		update_menu_items(1);
+	else
+		update_menu_items(0);
 }
 
 static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
@@ -263,14 +272,44 @@ unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
 	appindicator_supported = true;
 }
 
+static void remove_sensor_menu_items(GtkMenu *menu)
+{
+	GtkMenuItem **items;
+
+	if (!menu_items)
+		return;
+
+	items = menu_items;
+	while (*items) {
+		gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(*items));
+
+		items++;
+	}
+
+	free(menu_items);
+	free(sensors);
+}
+
 void ui_appindicator_update_menu(struct ui_psensor *ui)
 {
-	GtkWidget *menu;
+	GtkMenu *menu;
+
+	menu = GTK_MENU(app_indicator_get_menu(indicator));
+
+	if (menu) {
+		remove_sensor_menu_items(menu);
+		create_sensor_menu_items(ui, menu);
+	} else {
+		menu = load_menu(ui);
 
-	menu = get_menu(ui);
-	app_indicator_set_menu(indicator, GTK_MENU(menu));
+		if (menu) {
+			app_indicator_set_menu(indicator, menu);
+			g_object_unref(G_OBJECT(menu));
+		}
+	}
 
-	gtk_widget_show_all(menu);
+	if (menu)
+		gtk_widget_show_all(GTK_WIDGET(menu));
 }
 
 void ui_appindicator_init(struct ui_psensor *ui)