From b56de4fea8df297a1bea3d6218c3e244fe224278 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 29 Jan 2010 19:16:48 +0100
Subject: [PATCH] fix groups combobox in add contact dialog. Fixes #5584

---
 data/gui/add_new_contact_window.ui | 11 +++--------
 src/dialogs.py                     |  2 --
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/data/gui/add_new_contact_window.ui b/data/gui/add_new_contact_window.ui
index 79d5b3413..b44993135 100644
--- a/data/gui/add_new_contact_window.ui
+++ b/data/gui/add_new_contact_window.ui
@@ -196,13 +196,8 @@
             <child>
               <object class="GtkComboBoxEntry" id="group_comboboxentry">
                 <property name="visible">True</property>
-                <property name="model">liststore1</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
-                </child>
+                <property name="model">groups_liststore</property>
+                <property name="text_column">0</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -375,7 +370,7 @@ to add a contact from this protocol.</property>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">I would like to add you to my contact list.</property>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkListStore" id="groups_liststore">
     <columns>
       <!-- column-name item -->
       <column type="gchararray"/>
diff --git a/src/dialogs.py b/src/dialogs.py
index a9f55e5cf..6068ba51f 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -896,8 +896,6 @@ _('Please fill in the data of the contact you want to add in account %s') % acco
 					if not jid_ in self.agents[type_]:
 						self.agents[type_].append(jid_)
 				self.available_types.append(type_)
-		liststore = gtk.ListStore(str)
-		self.group_comboboxentry.set_model(liststore)
 		# Combobox with transport/jabber icons
 		liststore = gtk.ListStore(str, gtk.gdk.Pixbuf, str)
 		cell = gtk.CellRendererPixbuf()