From ad6ea372fc3673d6b9dcc08f9edac8558e6eb5c9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Tue, 2 Apr 2013 06:48:29 +0000
Subject: [PATCH] defined the tree in the glade file

---
 src/glade/sensor-edit.glade | 15 ++++++++++++++-
 src/ui_sensorpref.c         | 17 +++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade
index be35af6..5c98616 100644
--- a/src/glade/sensor-edit.glade
+++ b/src/glade/sensor-edit.glade
@@ -76,9 +76,22 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="model">sensors_liststore</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">1</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection1"/>
                 </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="sensor_name1">
+                    <property name="title" translatable="yes">Name</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="resize">False</property>
@@ -556,7 +569,7 @@
   </object>
   <object class="GtkListStore" id="sensors_liststore">
     <columns>
-      <!-- column-name sensor_name -->
+      <!-- column-name Sensor Name -->
       <column type="gchararray"/>
     </columns>
   </object>
diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 9c17475..9032633 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -30,6 +30,10 @@
 #include "ui_appindicator.h"
 #endif
 
+enum {
+	COL_NAME = 0
+};
+
 struct sensor_pref {
 	struct psensor *sensor;
 	char *name;
@@ -486,7 +490,6 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 	GError *error = NULL;
 	GtkTreeView *w_sensors_list;
 	guint ok;
-	GtkCellRenderer *renderer;
 	GtkListStore *store;
 	struct psensor **s_cur;
 	GtkTreeSelection *selection;
@@ -517,14 +520,8 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 		= GTK_TREE_VIEW(gtk_builder_get_object(builder,
 						       "sensors_list"));
 
-	renderer = gtk_cell_renderer_text_new();
-	gtk_tree_view_insert_column_with_attributes(w_sensors_list,
-						    -1,
-						    _("Sensor Name"),
-						    renderer,
-						    "text", 0, NULL);
-
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(w_sensors_list));
+	store = GTK_LIST_STORE(gtk_builder_get_object(builder,
+						      "sensors_liststore"));
 
 	s_cur = ui->sensors;
 	while (*s_cur) {
@@ -532,7 +529,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 		struct psensor *s = *s_cur;
 
 		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 0, s->name, -1);
+		gtk_list_store_set(store, &iter, COL_NAME, s->name, -1);
 
 		s_cur++;
 	}
-- 
2.7.4