[seahorse] Fix issues with GtkComboBoxText used in builder files

[Stefan Walter <stefw src gnome org>]

commit aa850691116f103d96a4d5dfd26a50993c927915
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Sep 15 09:58:04 2011 +0200

    Fix issues with GtkComboBoxText used in builder files
    
     * Needed some additional properties in order not to fail with warnings.

 libseahorse/seahorse-add-keyserver.xml |    2 ++
 pgp/seahorse-pgp-generate.xml          |    2 ++
 ssh/seahorse-ssh-generate.xml          |   16 ++--------------
 3 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/libseahorse/seahorse-add-keyserver.xml b/libseahorse/seahorse-add-keyserver.xml
index f5fbc27..1181ed0 100644
--- a/libseahorse/seahorse-add-keyserver.xml
+++ b/libseahorse/seahorse-add-keyserver.xml
@@ -48,6 +48,8 @@
             <child>
               <object class="GtkComboBoxText" id="keyserver-type">
                 <property name="visible">True</property>
+                <property name="id_column">1</property>
+                <property name="entry_text_column">0</property>
                 <signal name="changed" handler="on_prefs_add_keyserver_uri_changed"/>
               </object>
               <packing>
diff --git a/pgp/seahorse-pgp-generate.xml b/pgp/seahorse-pgp-generate.xml
index 62fce2a..259a10e 100644
--- a/pgp/seahorse-pgp-generate.xml
+++ b/pgp/seahorse-pgp-generate.xml
@@ -264,6 +264,8 @@
                                 <child>
                                   <object class="GtkComboBoxText" id="algorithm-choice">
                                     <property name="visible">True</property>
+                                    <property name="id_column">1</property>
+                                    <property name="entry_text_column">0</property>
                                     <signal name="changed" handler="on_gpgme_generate_algorithm_changed"/>
                                   </object>
                                 </child>
diff --git a/ssh/seahorse-ssh-generate.xml b/ssh/seahorse-ssh-generate.xml
index aa8321c..0e8b8cd 100644
--- a/ssh/seahorse-ssh-generate.xml
+++ b/ssh/seahorse-ssh-generate.xml
@@ -12,20 +12,6 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-ok</property>
   </object>
-  <object class="GtkListStore" id="model1">
-    <columns>
-      <!-- column-name gchararray -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">RSA</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">DSA</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkDialog" id="ssh-generate">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -352,6 +338,8 @@
                                   <object class="GtkComboBoxText" id="algorithm-choice">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="id_column">1</property>
+                                    <property name="entry_text_column">0</property>
                                     <items>
                                       <item translatable="yes">RSA</item>
                                       <item translatable="yes">DSA</item>