temperature displayed in the unity launcher entry is the maximum current temperature...

[psensor.git] / src / ui_appindicator.c

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index d68bc42..0dddc68 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010-2011 wpitchoune@gmail.com
+    Copyright (C) 2010-2011 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 published by
@@ -29,25 +29,20 @@
 #include "ui_appindicator.h"
 #include "ui_pref.h"
 
-static void cb_appindicator_show(gpointer data,
-                                guint cb_action,
-                                GtkWidget *item)
+static void cb_menu_show(gpointer data, guint cb_action, GtkWidget *item)
 {
        struct ui_psensor *ui = (struct ui_psensor *)data;
 
        gtk_window_present(GTK_WINDOW(ui->main_window));
 }
 
-static void cb_appindicator_quit(gpointer data,
-                                       guint cb_action,
-                                       GtkWidget *item)
+static void cb_menu_quit(gpointer data, guint cb_action, GtkWidget *item)
 {
-       ui_psensor_exit(data);
+       ui_psensor_quit(data);
 }
 
-static void cb_appindicator_preferences(gpointer data,
-                                       guint cb_action,
-                                       GtkWidget *item)
+static void
+cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item)
 {
 #ifdef HAVE_APPINDICATOR_029
        gdk_threads_enter();
@@ -62,17 +57,17 @@ static void cb_appindicator_preferences(gpointer data,
 
 static GtkItemFactoryEntry menu_items[] = {
        {"/Show",
-        NULL, cb_appindicator_show, 0, "<Item>"},
+        NULL, cb_menu_show, 0, "<Item>"},
        {"/Preferences",
-        NULL, cb_appindicator_preferences, 0, "<Item>"},
+        NULL, cb_menu_preferences, 0, "<Item>"},
        {"/sep1",
         NULL, NULL, 0, "<Separator>"},
        {"/Quit",
-        "", cb_appindicator_quit, 0, "<StockItem>", GTK_STOCK_QUIT},
+        "", cb_menu_quit, 0, "<StockItem>", GTK_STOCK_QUIT},
 };
 
 static gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
-GtkWidget *ui_appindicator_get_menu(struct ui_psensor *ui)
+static GtkWidget *get_menu(struct ui_psensor *ui)
 {
        GtkItemFactory *item_factory;
 
@@ -126,6 +121,6 @@ void ui_appindicator_init(struct ui_psensor *ui)
        app_indicator_set_status(ui->indicator, APP_INDICATOR_STATUS_ACTIVE);
        app_indicator_set_attention_icon(ui->indicator, "psensor_hot");
 
-       indicatormenu = ui_appindicator_get_menu(ui);
+       indicatormenu = get_menu(ui);
        app_indicator_set_menu(ui->indicator, GTK_MENU(indicatormenu));
 }