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

[Jason Clinton <jclinton src gnome org>]

commit 3a6d492773fbd954c7d630be6f26918814389298
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Mar 30 18:47:26 2011 +1100

    lightsoff: Fix settings dialog

 lightsoff/data/settings.ui |   12 +++---------
 lightsoff/src/Settings.js  |    6 ------
 2 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/lightsoff/data/settings.ui b/lightsoff/data/settings.ui
index 8472d41..2b099bd 100644
--- a/lightsoff/data/settings.ui
+++ b/lightsoff/data/settings.ui
@@ -7,7 +7,6 @@
     <property name="border_width">5</property>
     <property name="icon_name">gnome-lightsoff</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>
@@ -44,9 +43,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>
@@ -132,10 +132,4 @@
       <action-widget response="0">close-button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name str -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
 </interface>
diff --git a/lightsoff/src/Settings.js b/lightsoff/src/Settings.js
index 9be2695..0ea8d39 100644
--- a/lightsoff/src/Settings.js
+++ b/lightsoff/src/Settings.js
@@ -157,12 +157,6 @@ function show_settings()
 
 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)