void ui_appindicator_cb_preferences(GtkMenuItem *mi, gpointer data)
{
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_enter();
-#endif
-
ui_pref_dialog_run((struct ui_psensor *)data);
-
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_leave();
-#endif
}
void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
{
struct ui_psensor *ui = data;
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_enter();
-#endif
-
if (ui->sensors && *ui->sensors)
ui_sensorpref_dialog_run(*ui->sensors, ui);
-
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_leave();
-#endif
}
static void
-update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
+update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celsius)
{
gchar *str;
char *v;
- v = psensor_current_value_to_str(s, use_celcius);
+ v = psensor_current_value_to_str(s, use_celsius);
str = g_strdup_printf("%s: %s", s->name, v);
g_free(str);
}
-static void update_menu_items(int use_celcius)
+static void update_menu_items(int use_celsius)
{
struct psensor **s;
GtkMenuItem **m;
if (!sensors)
- return ;
+ return;
for (s = sensors, m = menu_items; *s; s++, m++)
- update_menu_item(*m, *s, use_celcius);
+ update_menu_item(*m, *s, use_celsius);
}
static void
-build_sensor_menu_items(const struct ui_psensor *ui,
- GtkMenu *menu)
+build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
{
- int i, j, n, celcius;
+ int i, j, n, celsius;
const char *name;
struct psensor **sorted_sensors;
free(menu_items);
- celcius = ui->config->temperature_unit == CELCIUS;
+ celsius = ui->config->temperature_unit == CELSIUS;
sorted_sensors = ui_get_sensors_ordered_by_position(ui);
n = psensor_list_size(sorted_sensors);
GTK_WIDGET(menu_items[j]),
j+2);
- update_menu_item(menu_items[j], sensors[j], celcius);
+ update_menu_item(menu_items[j], sensors[j], celsius);
j++;
}
while (*p) {
if (config_is_appindicator_label_enabled((*p)->id)) {
str = psensor_current_value_to_str
- (*p, ui->config->temperature_unit == CELCIUS);
+ (*p, ui->config->temperature_unit == CELSIUS);
if (label == NULL) {
label = str;
if (is_temp_type((*p)->type))
str = "999UUU";
- else if (is_fan_type((*p)->type))
+ else if ((*p)->type & SENSOR_TYPE_RPM)
str = "999UUU";
- else /* cpu load */
+ else /* percent */
str = "999%";
if (guide == NULL) {
app_indicator_set_status(indicator,
APP_INDICATOR_STATUS_ATTENTION);
- update_menu_items(ui->config->temperature_unit == CELCIUS);
+ update_menu_items(ui->config->temperature_unit == CELSIUS);
}
static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
ui_appindicator_update_menu(ui);
}
-int is_appindicator_supported()
+int is_appindicator_supported(void)
{
return appindicator_supported;
}
-void ui_appindicator_cleanup()
+void ui_appindicator_cleanup(void)
{
free(sensors);
}