From 0717a21f6543fe2ce8d50cd2a5b7cd6ace1b937d Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 20 Sep 2014 17:21:16 -0400
Subject: [PATCH] host: Fix renaming network/storage pool

---
 virtManager/connection.py    | 21 ++++++++-------------
 virtManager/host.py          |  5 ++---
 virtManager/libvirtobject.py |  1 +
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/virtManager/connection.py b/virtManager/connection.py
index 5db43d4dd..a23811401 100644
--- a/virtManager/connection.py
+++ b/virtManager/connection.py
@@ -1072,9 +1072,8 @@ class vmmConnection(vmmGObject):
         return pollhelpers.fetch_vms(self._backend, self._vms.copy(),
                     (lambda obj, key: vmmDomain(self, obj, key)))
 
-    def _obj_signal_proxy(self, obj, signal, key):
-        ignore = obj
-        self.emit(signal, key)
+    def _obj_signal_proxy(self, obj, signal):
+        self.emit(signal, obj.get_connkey())
 
     def schedule_priority_tick(self, **kwargs):
         # args/kwargs are what is passed to def tick()
@@ -1231,10 +1230,8 @@ class vmmConnection(vmmGObject):
                 obj.cleanup()
             for connkey, obj in newNets.items():
                 logging.debug("network=%s added", obj.get_name())
-                obj.connect("started", self._obj_signal_proxy,
-                            "net-started", connkey)
-                obj.connect("stopped", self._obj_signal_proxy,
-                            "net-stopped", connkey)
+                obj.connect("started", self._obj_signal_proxy, "net-started")
+                obj.connect("stopped", self._obj_signal_proxy, "net-stopped")
                 self.emit("net-added", connkey)
 
             # Update storage pool states
@@ -1244,10 +1241,8 @@ class vmmConnection(vmmGObject):
                 obj.cleanup()
             for connkey, obj in newPools.items():
                 logging.debug("pool=%s added", obj.get_name())
-                obj.connect("started", self._obj_signal_proxy,
-                            "pool-started", connkey)
-                obj.connect("stopped", self._obj_signal_proxy,
-                            "pool-stopped", connkey)
+                obj.connect("started", self._obj_signal_proxy, "pool-started")
+                obj.connect("stopped", self._obj_signal_proxy, "pool-stopped")
                 self.emit("pool-added", connkey)
 
             # Update interface states
@@ -1258,9 +1253,9 @@ class vmmConnection(vmmGObject):
             for name, obj in newInterfaces.items():
                 logging.debug("interface=%s added", obj.get_name())
                 obj.connect("started", self._obj_signal_proxy,
-                            "interface-started", name)
+                    "interface-started")
                 obj.connect("stopped", self._obj_signal_proxy,
-                            "interface-stopped", name)
+                    "interface-stopped")
                 self.emit("interface-added", name)
 
             # Update nodedev list
diff --git a/virtManager/host.py b/virtManager/host.py
index c0b7da2d5..4c985657f 100644
--- a/virtManager/host.py
+++ b/virtManager/host.py
@@ -515,7 +515,7 @@ class vmmHost(vmmGObjectUI):
                 net.set_autostart(auto)
             if EDIT_NET_NAME in self.active_edits:
                 net.define_name(self.widget("net-name").get_text())
-                self.repopulate_networks()
+                self.idle_add(self.repopulate_networks)
             if EDIT_NET_QOS in self.active_edits:
                 in_qos = self.widget("net-qos-inbound-enable").get_active()
                 out_qos = self.widget("net-qos-outbound-enable").get_active()
@@ -946,8 +946,7 @@ class vmmHost(vmmGObjectUI):
                 pool.set_autostart(auto)
             if EDIT_POOL_NAME in self.active_edits:
                 pool.define_name(self.widget("pool-name-entry").get_text())
-                self.disable_pool_apply()
-                self.repopulate_storage_pools()
+                self.idle_add(self.repopulate_storage_pools)
         except Exception, e:
             self.err.show_err(_("Error changing pool settings: %s") % str(e))
             return
diff --git a/virtManager/libvirtobject.py b/virtManager/libvirtobject.py
index 2aaf31f6a..58accb4a0 100644
--- a/virtManager/libvirtobject.py
+++ b/virtManager/libvirtobject.py
@@ -185,6 +185,7 @@ class vmmLibvirtObject(vmmGObject):
         # Mark cached xml as invalid
         self._is_xml_valid = False
         self._xmlobj_to_define = None
+        self._name = None
 
 
     ##########################