commit 2e63676fc6cd5b967c622ad8f0993cd5eabacd73
Author: Vibha Yadav <gtk3@linux-qoy7.site>
Date:   Thu Nov 18 17:14:21 2010 +0530

    Fix for bgo 635171
    
    Using GtkComboBox with has-entry property enabled

diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui
index 1c0dcca..a10b5d8 100644
--- a/addressbook/gui/contact-editor/contact-editor.ui
+++ b/addressbook/gui/contact-editor/contact-editor.ui
@@ -256,8 +256,9 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkComboBoxEntry" id="combo-file-as">
+                                  <object class="GtkComboBox" id="combo-file-as">
                                     <property name="visible">True</property>
+                                    <property name="has-entry">TRUE</property>
                                     <property name="model">model1</property>
                                   </object>
                                   <packing>
diff --git a/addressbook/gui/contact-editor/fullname.ui b/addressbook/gui/contact-editor/fullname.ui
index 62e4525..b3515a6 100644
--- a/addressbook/gui/contact-editor/fullname.ui
+++ b/addressbook/gui/contact-editor/fullname.ui
@@ -313,8 +313,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxEntry" id="comboentry-title">
+              <object class="GtkComboBox" id="comboentry-title">
                 <property name="visible">True</property>
+                <property name="has-entry">True</property>
                 <property name="add_tearoffs">False</property>
                 <property name="has_frame">True</property>
                 <property name="focus_on_click">True</property>
@@ -330,8 +331,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxEntry" id="comboentry-suffix">
+              <object class="GtkComboBox" id="comboentry-suffix">
                 <property name="visible">True</property>
+                <property name="has-entry">True</property>
                 <property name="add_tearoffs">False</property>
                 <property name="has_frame">True</property>
                 <property name="focus_on_click">True</property>
diff --git a/calendar/gui/dialogs/event-page.ui b/calendar/gui/dialogs/event-page.ui
index fe3ece2..19c9f8d 100644
--- a/calendar/gui/dialogs/event-page.ui
+++ b/calendar/gui/dialogs/event-page.ui
@@ -741,10 +741,11 @@
                     <property name="homogeneous">True</property>
                     <property name="spacing">0</property>
                     <child>
-                      <object class="GtkComboBoxEntry" id="organizer">
+                      <object class="GtkComboBox" id="organizer">
                         <property name="visible">True</property>
                         <property name="add_tearoffs">False</property>
                         <property name="has_frame">True</property>
+                        <property name="has_entry">TRUE</property>
                         <property name="focus_on_click">True</property>
                         <property name="model">model2</property>
                       </object>
diff --git a/calendar/gui/dialogs/memo-page.ui b/calendar/gui/dialogs/memo-page.ui
index 6e9be05..a7e49b6 100644
--- a/calendar/gui/dialogs/memo-page.ui
+++ b/calendar/gui/dialogs/memo-page.ui
@@ -422,10 +422,11 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBoxEntry" id="org-combo">
+                  <object class="GtkComboBox" id="org-combo">
                     <property name="visible">False</property>
                     <property name="add_tearoffs">False</property>
                     <property name="has_frame">True</property>
+                    <property name="has_entry">TRUE</property>
                     <property name="focus_on_click">True</property>
                     <property name="model">model1</property>
                   </object>
diff --git a/calendar/gui/dialogs/task-page.ui b/calendar/gui/dialogs/task-page.ui
index 5d685a3..664caad 100644
--- a/calendar/gui/dialogs/task-page.ui
+++ b/calendar/gui/dialogs/task-page.ui
@@ -408,9 +408,10 @@
                     <property name="spacing">6</property>
                     <property name="homogeneous">True</property>
                     <child>
-                      <object class="GtkComboBoxEntry" id="organizer">
+                      <object class="GtkComboBox" id="organizer">
                         <property name="visible">True</property>
                         <property name="model">model1</property>
+                        <property name="has-entry">TRUE</property>
                       </object>
                       <packing>
                         <property name="position">0</property>
diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui
index 82e9928..87bd71a 100644
--- a/mail/mail-dialogs.ui
+++ b/mail/mail-dialogs.ui
@@ -331,8 +331,9 @@ Please select a follow up action from the "Flag" menu.</property>
           </packing>
         </child>
         <child>
-          <object class="GtkComboBoxEntry" id="combo">
+          <object class="GtkComboBox" id="combo">
             <property name="visible">True</property>
+            <property name="has-entry">True</property>
             <property name="model">combo_model</property>
           </object>
           <packing>
diff --git a/modules/addressbook/ldap-config.ui b/modules/addressbook/ldap-config.ui
index a82e468..cb900c0 100644
--- a/modules/addressbook/ldap-config.ui
+++ b/modules/addressbook/ldap-config.ui
@@ -309,9 +309,10 @@
       </packing>
     </child>
     <child>
-      <object class="GtkComboBoxEntry" id="port-comboentry">
+      <object class="GtkComboBox" id="port-comboentry">
         <property name="visible">True</property>
         <property name="model">model2</property>
+	<property name="has-entry">TRUE</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
