From 179e94fda5288381d2fdff0eb914c0d71ec26f03 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 8 Nov 2012 11:02:17 +0100
Subject: [PATCH] engine: Don't rewrite connection list when we read stored
 URIs

---
 src/virt-manager.py.in     |  2 +-
 src/virtManager/engine.py  | 73 ++++++++++++++++++++------------------
 src/virtManager/manager.py |  1 -
 3 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/virt-manager.py.in b/src/virt-manager.py.in
index a1d22500b..909fbaee2 100755
--- a/src/virt-manager.py.in
+++ b/src/virt-manager.py.in
@@ -195,7 +195,7 @@ def show_engine(engine, show, uri, uuid, no_conn_auto):
     engine.show_manager()
 
     if uri:
-        conn = engine.add_conn(uri)
+        conn = engine.add_conn_to_ui(uri)
 
         if conn and show:
             conn.connect_opt_out("state-changed",
diff --git a/src/virtManager/engine.py b/src/virtManager/engine.py
index 962b4df22..5c6a0864d 100644
--- a/src/virtManager/engine.py
+++ b/src/virtManager/engine.py
@@ -203,10 +203,11 @@ class vmmEngine(vmmGObject):
 
     def load_stored_uris(self):
         uris = self.config.get_conn_uris()
-        if uris != None:
-            logging.debug("About to connect to uris %s", uris)
-            for uri in uris:
-                self.add_conn(uri)
+        if not uris:
+            return
+        logging.debug("About to connect to uris %s", uris)
+        for uri in uris:
+            self.add_conn_to_ui(uri)
 
     def autostart_conns(self):
         for uri in self.conns:
@@ -214,31 +215,6 @@ class vmmEngine(vmmGObject):
             if conn.get_autoconnect():
                 self.connect_to_uri(uri)
 
-    def connect_to_uri(self, uri, autoconnect=None, do_start=True):
-        try:
-            conn = self._check_conn(uri)
-            if not conn:
-                # Unknown connection, add it
-                conn = self.add_conn(uri)
-
-            if autoconnect is not None:
-                conn.set_autoconnect(bool(autoconnect))
-
-            self.show_manager()
-            if do_start:
-                conn.open()
-            return conn
-        except Exception:
-            logging.exception("Error connecting to %s", uri)
-            return None
-
-    def _do_connect(self, src_ignore, uri):
-        return self.connect_to_uri(uri)
-
-    def _connect_cancelled(self, src):
-        if len(self.conns.keys()) == 0:
-            self.exit_app(src)
-
 
     def _do_vm_removed(self, conn, vmuuid):
         hvuri = conn.get_uri()
@@ -424,7 +400,9 @@ class vmmEngine(vmmGObject):
         self.connect("conn-removed", self.inspection.conn_removed)
         return
 
-    def add_conn(self, uri):
+
+    def add_conn_to_ui(self, uri):
+        # Public method called from virt-manager.py
         conn = self._check_conn(uri)
         if conn:
             return conn
@@ -441,10 +419,30 @@ class vmmEngine(vmmGObject):
         conn.connect("state-changed", self._do_conn_changed)
         conn.tick()
         self.emit("conn-added", conn)
-        self.config.add_conn(conn.get_uri())
 
         return conn
 
+
+    def connect_to_uri(self, uri, autoconnect=None, do_start=True):
+        # Public method called from virt-manager.py
+        try:
+            conn = self.add_conn_to_ui(uri)
+
+            if conn.get_uri() not in (self.config.get_conn_uris() or []):
+                self.config.add_conn(conn.get_uri())
+
+            if autoconnect is not None:
+                conn.set_autoconnect(bool(autoconnect))
+
+            self.show_manager()
+            if do_start:
+                conn.open()
+            return conn
+        except Exception:
+            logging.exception("Error connecting to %s", uri)
+            return None
+
+
     def cleanup_conn(self, uri):
         try:
             if self.conns[uri]["windowHost"]:
@@ -552,20 +550,26 @@ class vmmEngine(vmmGObject):
         except Exception, e:
             src.err.show_err(_("Error launching host dialog: %s") % str(e))
 
+
     def _get_connect_dialog(self):
         if self.windowConnect:
             return self.windowConnect
 
-        def connect_wrap(src, uri, autoconnect):
+        def completed(src, uri, autoconnect):
             ignore = src
             return self.connect_to_uri(uri, autoconnect)
 
+        def cancelled(src):
+            if len(self.conns.keys()) == 0:
+                self.exit_app(src)
+
         obj = vmmConnect()
-        obj.connect("completed", connect_wrap)
-        obj.connect("cancelled", self._connect_cancelled)
+        obj.connect("completed", completed)
+        obj.connect("cancelled", cancelled)
         self.windowConnect = obj
         return self.windowConnect
 
+
     def _do_show_connect(self, src):
         try:
             self._get_connect_dialog().show(src.topwin)
@@ -642,7 +646,6 @@ class vmmEngine(vmmGObject):
         obj.connect("action-show-about", self._do_show_about)
         obj.connect("action-show-host", self._do_show_host)
         obj.connect("action-show-connect", self._do_show_connect)
-        obj.connect("action-connect", self._do_connect)
         obj.connect("action-exit-app", self.exit_app)
         obj.connect("manager-opened", self.increment_window_counter)
         obj.connect("manager-closed", self.decrement_window_counter)
diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py
index 88868c9d0..272a04db4 100644
--- a/src/virtManager/manager.py
+++ b/src/virtManager/manager.py
@@ -91,7 +91,6 @@ class vmmManager(vmmGObjectUI):
         "action-reboot-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
         "action-destroy-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
         "action-save-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
-        "action-connect": (GObject.SignalFlags.RUN_FIRST, None, [str]),
         "action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
         "action-migrate-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
         "action-clone-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),