projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed useless intermediate var
[psensor.git]
/
src
/
ui_sensorlist.c
diff --git
a/src/ui_sensorlist.c
b/src/ui_sensorlist.c
index
4904eb4
..
3a9e988
100644
(file)
--- a/
src/ui_sensorlist.c
+++ b/
src/ui_sensorlist.c
@@
-201,32
+201,30
@@
static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
GtkWidget *menu;
static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
GtkWidget *menu;
- struct ui_psensor *ui
= (struct ui_psensor *)data
;
+ struct ui_psensor *ui;
GtkTreeView *view;
GtkTreeView *view;
+ struct psensor *s;
+ int coli;
if (event->button != 3)
return FALSE;
if (event->button != 3)
return FALSE;
+ ui = (struct ui_psensor *)data;
view = ui->sensors_tree;
view = ui->sensors_tree;
- struct psensor *sensor = get_sensor_at_pos(view,
- event->x,
- event->y,
- ui);
+ s = get_sensor_at_pos(view, event->x, event->y, ui);
- if (sensor) {
- int coli = col_index_to_col(get_col_index_at_pos(view,
- event->x));
+ if (s) {
+ coli = col_index_to_col(get_col_index_at_pos(view, event->x));
if (coli == COL_COLOR) {
if (ui_change_color(_("Select foreground color"),
if (coli == COL_COLOR) {
if (ui_change_color(_("Select foreground color"),
- s
ensor
->color)) {
+ s->color)) {
ui_sensorlist_update(ui, 1);
ui_sensorlist_update(ui, 1);
- config_set_sensor_color(sensor->id,
- sensor->color);
+ config_set_sensor_color(s->id, s->color);
}
} else if (coli >= 0 && coli != COL_ENABLED) {
}
} else if (coli >= 0 && coli != COL_ENABLED) {
- menu = create_sensor_popup(ui, s
ensor
);
+ menu = create_sensor_popup(ui, s);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
event->button, event->time);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
event->button, event->time);
@@
-243,7
+241,6
@@
toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *path;
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *path;
- gboolean fixed;
struct psensor *s;
ui = (struct ui_psensor *)data;
struct psensor *s;
ui = (struct ui_psensor *)data;
@@
-253,11
+250,8
@@
toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
- gtk_tree_model_get(model, &iter, COL_ENABLED, &fixed, -1);
- fixed ^= 1;
-
- s->enabled = fixed;
+ s->enabled ^= 1;
config_set_sensor_enabled(s->id, s->enabled);
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
config_set_sensor_enabled(s->id, s->enabled);
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
@@
-280,7
+274,7
@@
static int cmp_sensors(const void *p1, const void *p2)
return pos1 - pos2;
}
return pos1 - pos2;
}
-
static void create_widget
(struct ui_psensor *ui)
+
void ui_sensorlist_create
(struct ui_psensor *ui)
{
GtkListStore *store;
GtkCellRenderer *renderer;
{
GtkListStore *store;
GtkCellRenderer *renderer;
@@
-288,6
+282,8
@@
static void create_widget(struct ui_psensor *ui)
GtkTreeIter iter;
struct psensor **ordered_sensors;
GtkTreeIter iter;
struct psensor **ordered_sensors;
+ log_debug("ui_sensorlist_create()");
+
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-1,
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-1,
@@
-357,9
+353,3
@@
static void create_widget(struct ui_psensor *ui)
ui_sensorlist_update(ui, 1);
}
ui_sensorlist_update(ui, 1);
}
-
-void ui_sensorlist_create(struct ui_psensor *ui)
-{
- log_debug("ui_sensorlist_create()");
- create_widget(ui);
-}