From 23ab28d76fdffe0ed71a26ed7776e0facfca1a1d Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 21 Mar 2010 21:50:07 +0100
Subject: [PATCH] restore combobox in disco window. Fixes #5656

---
 data/gui/service_discovery_window.ui | 7 +------
 src/disco.py                         | 4 +---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/data/gui/service_discovery_window.ui b/data/gui/service_discovery_window.ui
index b969befc6..e5ef4a2e4 100644
--- a/data/gui/service_discovery_window.ui
+++ b/data/gui/service_discovery_window.ui
@@ -70,13 +70,8 @@ Agent JID - node</property>
               <object class="GtkComboBoxEntry" id="address_comboboxentry">
                 <property name="visible">True</property>
                 <property name="model">liststore1</property>
+                <property name="text_column">0</property>
                 <signal name="changed" handler="on_address_comboboxentry_changed"/>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/src/disco.py b/src/disco.py
index f1ec3e923..4bb7fb73e 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -549,10 +549,8 @@ _('Without a connection, you can not browse available services'))
             self.address_comboboxentry_entry = self.address_comboboxentry.child
             self.address_comboboxentry_entry.set_activates_default(True)
 
-            liststore = gtk.ListStore(str)
-            self.address_comboboxentry.set_model(liststore)
             self.latest_addresses = gajim.config.get(
-                    'latest_disco_addresses').split()
+                'latest_disco_addresses').split()
             if jid in self.latest_addresses:
                 self.latest_addresses.remove(jid)
             self.latest_addresses.insert(0, jid)