X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=6deedcb060d93ffcfd5a6098e3afa9014c63da34;hb=6b13160a6a51bf73d1dc47c7f42b301bc68878b4;hp=5c3f66e6f151de9f77f967516e784123e678552d;hpb=b0fbaa0cc4cdc38bc86e3739e5bc78d73ca063ec;p=psensor.git

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 5c3f66e..6deedcb 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
@@ -133,20 +133,15 @@ static void
 update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
 {
 	gchar *str;
-	double v;
+	char *v;
 
-	v = psensor_get_current_value(s);
+	v = psensor_current_value_to_str(s, use_celcius);
 
-	if (is_temp_type(s->type) && !use_celcius)
-		v = celcius_to_fahrenheit(v);
-
-	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);
 }
 
@@ -162,30 +157,14 @@ static void update_menu_items(int use_celcius)
 		update_menu_item(*m, *s, use_celcius);
 }
 
-static GtkWidget *get_menu(struct ui_psensor *ui)
+static void
+build_sensor_menu_items(const struct ui_psensor *ui,
+			GtkMenu *menu)
 {
-	GtkActionGroup *action_group;
-	GtkUIManager *menu_manager;
-	GError *error;
-	GtkMenu *menu;
-	int i, n, j;
-	int celcius;
+	int i, j, n, celcius;
 	const char *name;
 
-	action_group = gtk_action_group_new("PsensorActions");
-	gtk_action_group_set_translation_domain(action_group, PACKAGE);
-	menu_manager = gtk_ui_manager_new();
-
-	gtk_action_group_add_actions(action_group, entries, n_entries, ui);
-	gtk_ui_manager_insert_action_group(menu_manager, action_group, 0);
-
-	error = NULL;
-	gtk_ui_manager_add_ui_from_string(menu_manager, menu_desc, -1, &error);
-
-	if (error)
-		g_error(_("building menus failed: %s"), error->message);
-
-	menu = GTK_MENU(gtk_ui_manager_get_widget(menu_manager, "/MainMenu"));
+	free(menu_items);
 
 	celcius  = ui->config->temperature_unit == CELCIUS;
 
@@ -211,6 +190,31 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 	}
 
 	sensors[j] = NULL;
+}
+
+static GtkWidget *get_menu(struct ui_psensor *ui)
+{
+	GtkActionGroup *action_group;
+	GtkUIManager *menu_manager;
+	GError *error;
+	GtkMenu *menu;
+
+	action_group = gtk_action_group_new("PsensorActions");
+	gtk_action_group_set_translation_domain(action_group, PACKAGE);
+	menu_manager = gtk_ui_manager_new();
+
+	gtk_action_group_add_actions(action_group, entries, n_entries, ui);
+	gtk_ui_manager_insert_action_group(menu_manager, action_group, 0);
+
+	error = NULL;
+	gtk_ui_manager_add_ui_from_string(menu_manager, menu_desc, -1, &error);
+
+	if (error)
+		g_error(_("building menus failed: %s"), error->message);
+
+	menu = GTK_MENU(gtk_ui_manager_get_widget(menu_manager, "/MainMenu"));
+
+	build_sensor_menu_items(ui, menu);
 
 	return GTK_WIDGET(menu);
 }
@@ -239,7 +243,7 @@ static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
 {
 	GtkStatusIcon *ico;
 
-	log_debug("ui_appindicator#unity_fallback");
+	log_debug("ui_appindicator.unity_fallback()");
 
 	appindicator_supported = 0;
 
@@ -253,7 +257,7 @@ 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);