From 9537affafd82e212e627df517dec1038e2bd1cfb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 27 Jul 2012 10:50:07 +0000
Subject: [PATCH] use gtkcombotext instead of gtkcombo

---
 src/glade/psensor-pref.glade | 59 +++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 39 deletions(-)

diff --git a/src/glade/psensor-pref.glade b/src/glade/psensor-pref.glade
index eec58d9..e7dcf9f 100644
--- a/src/glade/psensor-pref.glade
+++ b/src/glade/psensor-pref.glade
@@ -119,25 +119,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="sensors_list_position">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="model">liststore1</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="renderer1"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">3</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkCheckButton" id="enable_menu">
                     <property name="label" translatable="yes">Enable menu</property>
                     <property name="use_action_appearance">False</property>
@@ -246,6 +227,26 @@
                     <property name="y_padding">4</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkComboBoxText" id="sensors_list_position">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="entry_text_column">0</property>
+                    <property name="id_column">1</property>
+                    <items>
+                      <item translatable="yes">Right</item>
+                      <item translatable="yes">Left</item>
+                      <item translatable="yes">Top</item>
+                      <item translatable="yes">Bottom</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">3</property>
+                    <property name="x_padding">4</property>
+                    <property name="y_padding">4</property>
+                  </packing>
+                </child>
               </object>
             </child>
             <child type="tab">
@@ -684,26 +685,6 @@
       <action-widget response="0">button2</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Right</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Left</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Top</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bottom</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkAdjustment" id="mins">
     <property name="lower">1</property>
     <property name="upper">65535</property>
-- 
2.7.4