Blob Blame History Raw
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1200502173 18000
# Node ID dbd25721f588ab3662ab28b3f675f1e7bf071376
# Parent  49c55daf788d3ba7dc7dfd270b2b607b9cb6c7ae
Adding a bridged network device was broken, adding the display name and not the interface name. Fix similar to cset 597. Fixes bug 392881.

diff -r 49c55daf788d -r dbd25721f588 src/virtManager/addhardware.py
--- a/src/virtManager/addhardware.py	Tue Jan 15 08:58:32 2008 -0500
+++ b/src/virtManager/addhardware.py	Wed Jan 16 11:49:33 2008 -0500
@@ -122,12 +122,12 @@ class vmmAddHardware(gobject.GObject):
         network_list.add_attribute(text, 'text', 1)
 
         device_list = self.window.get_widget("net-device")
-        device_model = gtk.ListStore(str, bool)
+        device_model = gtk.ListStore(str, str, bool)
         device_list.set_model(device_model)
         text = gtk.CellRendererText()
         device_list.pack_start(text, True)
-        device_list.add_attribute(text, 'text', 0)
-        device_list.add_attribute(text, 'sensitive', 1)
+        device_list.add_attribute(text, 'text', 1)
+        device_list.add_attribute(text, 'sensitive', 2)
 
         target_list = self.window.get_widget("target-device")
         target_model = gtk.ListStore(str, int, str, str, str)
@@ -820,9 +820,9 @@ class vmmAddHardware(gobject.GObject):
             net = self.vm.get_connection().get_net_device(name)
             if net.is_shared():
                 hasShared = True
-                model.append(["%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True])
+                model.append([net.get_bridge(), "%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True])
             else:
-                model.append(["%s (%s)" % (net.get_name(), _("Not bridged")), False])
+                model.append([net.get_bridge(), "%s (%s)" % (net.get_name(), _("Not bridged")), False])
         return hasShared
 
     def populate_target_device_model(self, model):