ui,data: Port UI to gtk-3

2 files changed, 4 insertions, 6 deletions

diff --git a/data/rygel-preferences.ui b/data/rygel-preferences.ui
index 8de3ed9c..15985dde 100644
--- a/data/rygel-preferences.ui
+++ b/data/rygel-preferences.ui
@@ -19,7 +19,6 @@
     <property name="title" translatable="yes">Rygel Preferences</property>
     <property name="default_height">400</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -207,7 +206,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBoxEntry" id="iface-entry">
+                          <object class="GtkComboBoxText" id="iface-entry">
                             <property name="visible">True</property>
                             <property name="model">iface-liststore</property>
                           </object>
@@ -585,7 +584,6 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="transient_for">preferences-dialog</property>
-    <property name="has_separator">False</property>
     <property name="action">select-folder</property>
     <property name="select_multiple">True</property>
     <property name="local_only">False</property>
diff --git a/src/ui/rygel-general-pref-section.vala b/src/ui/rygel-general-pref-section.vala
index 0c7742eb..9f6ec67e 100644
--- a/src/ui/rygel-general-pref-section.vala
+++ b/src/ui/rygel-general-pref-section.vala
@@ -32,7 +32,7 @@ public class Rygel.GeneralPrefSection : PreferencesSection {
     const string MP2TS_CHECKBUTTON = "mp2ts-checkbutton";
     const string LPCM_CHECKBUTTON = "lpcm-checkbutton";
 
-    private ComboBoxEntry iface_entry;
+    private ComboBoxText iface_entry;
     private SpinButton port_spin;
 
     // Transcoding options
@@ -50,7 +50,7 @@ public class Rygel.GeneralPrefSection : PreferencesSection {
 
         this.upnp_check = (CheckButton) builder.get_object (UPNP_CHECKBUTTON);
         assert (this.upnp_check != null);
-        this.iface_entry = (ComboBoxEntry) builder.get_object (IFACE_ENTRY);
+        this.iface_entry = (ComboBoxText) builder.get_object (IFACE_ENTRY);
         assert (this.iface_entry != null);
         this.port_spin = (SpinButton) builder.get_object (PORT_SPINBUTTON);
         assert (this.port_spin != null);
@@ -66,7 +66,7 @@ public class Rygel.GeneralPrefSection : PreferencesSection {
         this.context_manager = new ContextManager (null, 0);
 
         // Apparently glade/GtkBuilder is unable to do this for us
-        this.iface_entry.set_text_column (0);
+        this.iface_entry.set_entry_text_column (0);
         try {
             this.iface_entry.append_text (config.get_interface ());
             this.iface_entry.set_active (0);