From eac0f93da7b8724c93d126d8a4606ce5105185db Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 9 Nov 2012 10:46:37 +0100
Subject: [PATCH] Drop comboboxentry RHEL6 compat

---
 src/virtManager/addhardware.py | 14 +----------
 src/virtManager/connect.py     | 13 ----------
 src/virtManager/create.py      | 25 ------------------
 src/virtManager/createpool.py  | 21 ----------------
 src/virtManager/details.py     | 20 ---------------
 src/vmm-add-hardware.ui        | 21 +++++++++++++---
 src/vmm-create-pool.ui         | 38 ++++++++++++++++++++++++++++
 src/vmm-create.ui              | 46 +++++++++++++++++++++++++++++++---
 src/vmm-details.ui             | 24 ++++++++++++++++--
 src/vmm-open-connection.ui     | 22 +++++++++++++---
 10 files changed, 141 insertions(+), 103 deletions(-)

diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
index 645223e0b..011e60af4 100644
--- a/src/virtManager/addhardware.py
+++ b/src/virtManager/addhardware.py
@@ -63,13 +63,6 @@ char_widget_mappings = {
     "target_name" : "char-target-name",
 }
 
-_comboentry_xml = """
-<interface>
-    <object class="GtkComboBoxEntry" id="config-storage-format">
-      <property name="visible">True</property>
-    </object>
-</interface>
-"""
 
 class vmmAddHardware(vmmGObjectUI):
     __gsignals__ = {
@@ -77,8 +70,7 @@ class vmmAddHardware(vmmGObjectUI):
     }
 
     def __init__(self, vm):
-        vmmGObjectUI.__init__(self,
-                              "vmm-add-hardware.ui", "vmm-add-hardware")
+        vmmGObjectUI.__init__(self, "vmm-add-hardware.ui", "vmm-add-hardware")
 
         self.vm = vm
         self.conn = vm.conn
@@ -90,10 +82,6 @@ class vmmAddHardware(vmmGObjectUI):
 
         self._dev = None
 
-        self.get_window().add_from_string(_comboentry_xml)
-        self.widget("table7").attach(self.widget("config-storage-format"),
-                                     1, 2, 2, 3, xoptions=Gtk.AttachOptions.FILL)
-
         self.get_window().connect_signals({
             "on_create_cancel_clicked" : self.close,
             "on_vmm_create_delete_event" : self.close,
diff --git a/src/virtManager/connect.py b/src/virtManager/connect.py
index 2b64093dc..e70d632db 100644
--- a/src/virtManager/connect.py
+++ b/src/virtManager/connect.py
@@ -49,15 +49,6 @@ def default_conn_user(conn):
         return "root"
     return current_user()
 
-_hostname_xml = """
-<interface>
-               <object class="GtkComboBoxText" id="hostname">
-                 <property name="visible">True</property>
-                 <property name="has_entry">True</property>
-                 <signal name="changed" handler="on_hostname_combo_changed"/>
-               </object>
-</interface>
-"""
 
 class vmmConnect(vmmGObjectUI):
     __gsignals__ = {
@@ -86,10 +77,6 @@ class vmmConnect(vmmGObjectUI):
         self.browser_sigs = []
         self.can_browse = False
 
-        self.get_window().add_from_string(_hostname_xml)
-        self.widget("table1").attach(self.widget("hostname"),
-                                     1, 2, 4, 5, yoptions=Gtk.AttachOptions.FILL)
-
         # Set this if we can't resolve 'hostname.local': means avahi
         # prob isn't configured correctly, and we should strip .local
         self.can_resolve_local = None
diff --git a/src/virtManager/create.py b/src/virtManager/create.py
index a26c2c203..504522640 100644
--- a/src/virtManager/create.py
+++ b/src/virtManager/create.py
@@ -59,24 +59,6 @@ RHEL6_OS_SUPPORT = [
     "win2k3", "winxp", "win2k8", "vista", "win7",
 ]
 
-_comboentry_xml = """
-<interface>
-    <object class="GtkComboBoxText" id="install-local-box">
-        <property name="visible">True</property>
-        <property name="has_entry">True</property>
-        <signal name="changed" handler="on_install_local_box_changed"/>
-    </object>
-    <object class="GtkComboBoxText" id="install-url-box">
-        <property name="visible">True</property>
-        <property name="has_entry">True</property>
-        <signal name="changed" handler="on_install_url_box_changed"/>
-    </object>
-    <object class="GtkComboBoxText" id="install-ks-box">
-        <property name="visible">True</property>
-        <property name="has_entry">True</property>
-    </object>
-</interface>
-"""
 
 class vmmCreate(vmmGObjectUI):
     __gsignals__ = {
@@ -119,13 +101,6 @@ class vmmCreate(vmmGObjectUI):
         self.config_window = None
         self.config_window_signals = []
 
-        self.get_window().add_from_string(_comboentry_xml)
-        self.widget("table2").attach(self.widget("install-url-box"),
-                                     1, 2, 0, 1)
-        self.widget("table7").attach(self.widget("install-ks-box"),
-                                     1, 2, 0, 1)
-        self.widget("alignment8").add(self.widget("install-local-box"))
-
         self.get_window().connect_signals({
             "on_vmm_newcreate_delete_event" : self.close,
 
diff --git a/src/virtManager/createpool.py b/src/virtManager/createpool.py
index 6199c274b..4d740d55f 100644
--- a/src/virtManager/createpool.py
+++ b/src/virtManager/createpool.py
@@ -33,21 +33,6 @@ from virtinst import Storage
 PAGE_NAME   = 0
 PAGE_FORMAT = 1
 
-_comboentry_xml = """
-<interface>
-    <object class="GtkComboBoxEntry" id="pool-source-path">
-        <property name="visible">True</property>
-        <signal name="changed" handler="on_pool_source_path_changed"/>
-        <signal name="focus" handler="on_pool_source_path_focus"/>
-    </object>
-    <object class="GtkComboBoxEntry" id="pool-target-path">
-        <property name="visible">True</property>
-        <signal name="changed" handler="on_pool_target_path_changed"/>
-        <signal name="focus_in_event" handler="on_pool_target_path_focus_in_event"/>
-    </object>
-</interface>
-"""
-
 class vmmCreatePool(vmmGObjectUI):
     def __init__(self, conn):
         vmmGObjectUI.__init__(self,
@@ -58,12 +43,6 @@ class vmmCreatePool(vmmGObjectUI):
         self._pool = None
         self._pool_class = Storage.StoragePool
 
-        self.get_window().add_from_string(_comboentry_xml)
-        self.widget("pool-source-box").pack_start(
-            self.widget("pool-source-path"), True, True, 0)
-        self.widget("pool-target-box").pack_start(
-            self.widget("pool-target-path"), True, True, 0)
-
         self.get_window().connect_signals({
             "on_pool_forward_clicked" : self.forward,
             "on_pool_back_clicked"    : self.back,
diff --git a/src/virtManager/details.py b/src/virtManager/details.py
index 55f452668..7d4474e87 100644
--- a/src/virtManager/details.py
+++ b/src/virtManager/details.py
@@ -39,20 +39,6 @@ from virtManager import util as util
 
 import virtinst
 
-_comboentry_xml = """
-<interface>
-    <object class="GtkComboBoxText" id="cpu-model">
-        <property name="visible">True</property>
-        <property name="has_entry">True</property>
-        <signal name="changed" handler="on_cpu_model_changed"/>
-    </object>
-    <object class="GtkComboBoxText" id="disk-format">
-        <property name="visible">True</property>
-        <property name="has_entry">True</property>
-        <signal name="changed" handler="on_disk_format_changed"/>
-    </object>
-</interface>
-"""
 
 # Parameters that can be editted in the details window
 EDIT_TOTAL = 37
@@ -368,12 +354,6 @@ class vmmDetails(vmmGObjectUI):
         self.ignoreDetails = False
         self._cpu_copy_host = False
 
-        self.get_window().add_from_string(_comboentry_xml)
-        self.widget("hbox17").pack_start(self.widget("disk-format"),
-                                         False, True, 0)
-        self.widget("hbox21").pack_start(self.widget("cpu-model"),
-                                         False, True, 0)
-
         self.console = vmmConsolePages(self.vm, self.window, self.topwin)
 
         # Set default window size
diff --git a/src/vmm-add-hardware.ui b/src/vmm-add-hardware.ui
index b80019ea0..4b3a791e9 100644
--- a/src/vmm-add-hardware.ui
+++ b/src/vmm-add-hardware.ui
@@ -425,9 +425,6 @@
                                         <property name="n_columns">2</property>
                                         <property name="column_spacing">6</property>
                                         <property name="row_spacing">6</property>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
                                         <child>
                                           <object class="GtkComboBox" id="config-storage-devtype">
                                             <property name="visible">True</property>
@@ -501,6 +498,24 @@
                                             <property name="x_options">GTK_FILL</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="config-storage-format">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="has_entry">True</property>
+                                            <child internal-child="entry">
+                                              <object class="GtkEntry" id="combobox-entry">
+                                                <property name="can_focus">False</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
diff --git a/src/vmm-create-pool.ui b/src/vmm-create-pool.ui
index 1b0186d7e..3cd978262 100644
--- a/src/vmm-create-pool.ui
+++ b/src/vmm-create-pool.ui
@@ -373,6 +373,25 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkComboBox" id="pool-source-path">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="has_entry">True</property>
+                                <signal name="changed" handler="on_pool_source_path_changed" swapped="no"/>
+                                <signal name="focus" handler="on_pool_source_path_focus" swapped="no"/>
+                                <child internal-child="entry">
+                                  <object class="GtkEntry" id="combobox-entry">
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkButton" id="pool-source-button">
                                 <property name="label" translatable="yes">Bro_wse</property>
@@ -403,6 +422,25 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkComboBox" id="pool-target-path">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="has_entry">True</property>
+                                <signal name="changed" handler="on_pool_target_path_changed" swapped="no"/>
+                                <signal name="focus" handler="on_pool_target_path_focus_in_event" swapped="no"/>
+                                <child internal-child="entry">
+                                  <object class="GtkEntry" id="combobox-entry1">
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkButton" id="pool-target-button">
                                 <property name="label" translatable="yes">B_rowse</property>
diff --git a/src/vmm-create.ui b/src/vmm-create.ui
index df994d926..5e148c759 100644
--- a/src/vmm-create.ui
+++ b/src/vmm-create.ui
@@ -682,11 +682,24 @@
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="left_padding">20</property>
+                                                    <child>
+                                                      <object class="GtkComboBox" id="install-local-box">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="has_entry">True</property>
+                                                        <signal name="changed" handler="on_install_local_box_changed" swapped="no"/>
+                                                        <child internal-child="entry">
+                                                          <object class="GtkEntry" id="combobox-entry">
+                                                            <property name="can_focus">False</property>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">True</property>
                                                     <property name="fill">True</property>
-                                                    <property name="position">0</property>
+                                                    <property name="position">-1</property>
                                                   </packing>
                                                 </child>
                                                 <child>
@@ -846,7 +859,20 @@
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <placeholder/>
+                                                          <object class="GtkComboBox" id="install-ks-box">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="has_entry">True</property>
+                                                            <child internal-child="entry">
+                                                            <object class="GtkEntry" id="combobox-entry2">
+                                                            <property name="can_focus">False</property>
+                                                            </object>
+                                                            </child>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
+                                                          </packing>
                                                         </child>
                                                       </object>
                                                     </child>
@@ -869,7 +895,21 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <placeholder/>
+                                          <object class="GtkComboBox" id="install-url-box">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="has_entry">True</property>
+                                            <signal name="changed" handler="on_install_url_box_changed" swapped="no"/>
+                                            <child internal-child="entry">
+                                              <object class="GtkEntry" id="combobox-entry1">
+                                                <property name="can_focus">False</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                          </packing>
                                         </child>
                                       </object>
                                     </child>
diff --git a/src/vmm-details.ui b/src/vmm-details.ui
index 416e9ea34..d9a4fc814 100644
--- a/src/vmm-details.ui
+++ b/src/vmm-details.ui
@@ -2400,7 +2400,17 @@ I/O:</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <child>
-                                                          <placeholder/>
+                                                          <object class="GtkComboBox" id="cpu-model">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="has_entry">True</property>
+                                                            <signal name="changed" handler="on_cpu_model_changed" swapped="no"/>
+                                                            <child internal-child="entry">
+                                                            <object class="GtkEntry" id="combobox-entry">
+                                                            <property name="can_focus">False</property>
+                                                            </object>
+                                                            </child>
+                                                          </object>
                                                         </child>
                                                       </object>
                                                       <packing>
@@ -4005,7 +4015,17 @@ I/O:</property>
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <child>
-                                                            <placeholder/>
+                                                            <object class="GtkComboBox" id="disk-format">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="has_entry">True</property>
+                                                            <signal name="changed" handler="on_disk_format_changed" swapped="no"/>
+                                                            <child internal-child="entry">
+                                                            <object class="GtkEntry" id="combobox-entry1">
+                                                            <property name="can_focus">False</property>
+                                                            </object>
+                                                            </child>
+                                                            </object>
                                                             </child>
                                                           </object>
                                                           <packing>
diff --git a/src/vmm-open-connection.ui b/src/vmm-open-connection.ui
index 3efe1de76..eb0f5d76c 100644
--- a/src/vmm-open-connection.ui
+++ b/src/vmm-open-connection.ui
@@ -102,9 +102,6 @@
             <property name="n_columns">2</property>
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
-            <child>
-              <placeholder/>
-            </child>
             <child>
               <object class="GtkComboBox" id="hypervisor">
                 <property name="visible">True</property>
@@ -345,6 +342,25 @@
                 <property name="bottom_attach">4</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkComboBox" id="hostname">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_entry">True</property>
+                <signal name="changed" handler="on_hostname_combo_changed" swapped="no"/>
+                <child internal-child="entry">
+                  <object class="GtkEntry" id="combobox-entry">
+                    <property name="can_focus">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>