[gnome-games/gnome-3-0] swell-foop: Fix settings dialog

[Jason Clinton <jclinton src gnome org>]

commit 67178851ac75a75b0d84d3d609dac803755587e8
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Mar 30 18:47:40 2011 +1100

    swell-foop: Fix settings dialog

 swell-foop/data/settings.ui |   11 ++++++-----
 swell-foop/src/Settings.js  |   12 ------------
 2 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/swell-foop/data/settings.ui b/swell-foop/data/settings.ui
index 46426b8..81d8ede 100644
--- a/swell-foop/data/settings.ui
+++ b/swell-foop/data/settings.ui
@@ -7,7 +7,6 @@
     <property name="title" translatable="yes">Swell Foop</property>
     <property name="icon_name">gnome-swell-foop</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -63,9 +62,10 @@
                             <property name="visible">True</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkComboBox" id="size-selector">
+                              <object class="GtkComboBoxText" id="size-selector">
                                 <property name="visible">True</property>
-                                <property name="model">liststore2</property>
+                                <property name="entry-text-column">0</property>
+                                <property name="id-column">1</property>
                                 <signal name="changed" handler="update_size"/>
                               </object>
                               <packing>
@@ -136,9 +136,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="theme-selector">
+                              <object class="GtkComboBoxText" id="theme-selector">
                                 <property name="visible">True</property>
-                                <property name="model">liststore1</property>
+                                <property name="entry-text-column">0</property>
+                                <property name="id-column">1</property>
                                 <signal name="changed" handler="select_theme"/>
                               </object>
                               <packing>
diff --git a/swell-foop/src/Settings.js b/swell-foop/src/Settings.js
index a34a7e2..243c030 100644
--- a/swell-foop/src/Settings.js
+++ b/swell-foop/src/Settings.js
@@ -164,12 +164,6 @@ function show_settings()
 
 function populate_size_selector(selector)
 {
-	// Since we're using GtkBuilder, we can't make a Gtk.ComboBox.text. Instead,
-	// we'll construct the cell renderer here, once, and use that.
-	var cell = new Gtk.CellRendererText();
-	selector.pack_start(cell, true);
-	selector.add_attribute(cell, "text", 0);
-
 	for(var i in sizes)
 	{
 		selector.append_text(sizes[i].name);
@@ -178,12 +172,6 @@ function populate_size_selector(selector)
 
 function populate_theme_selector(selector)
 {
-	// Since we're using GtkBuilder, we can't make a Gtk.ComboBox.text. Instead,
-	// we'll construct the cell renderer here, once, and use that.
-	var cell = new Gtk.CellRendererText();
-	selector.pack_start(cell, true);
-	selector.add_attribute(cell, "text", 0);
-
 	var i = 0;
 
 	for(var th in themes)