NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

console: don't use _close_viewer directly

Browse Source 
Function _close_viewer should be always called together with setting
unavailable page.  Call only _activate_unavailable_page which does both things.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-08-17 18:31:54 +02:00
parent 354877b90e
commit da81d4c32c
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
virtManager/console.py
View File

@ -609,7 +609,8 @@ class vmmConsolePages(vmmGObjectUI):
self._close_viewer()
self.widget("console-pages").set_current_page(
_CONSOLE_PAGE_UNAVAILABLE)
self.widget("console-unavailable").set_label("<b>" + msg + "</b>")
if msg:
self.widget("console-unavailable").set_label("<b>" + msg + "</b>")
def _activate_auth_page(self, withPassword, withUsername):
(pw, username) = self.config.get_console_password(self.vm)
@ -786,7 +787,6 @@ class vmmConsolePages(vmmGObjectUI):
self._enable_modifiers()
def _viewer_auth_rejected(self, ignore, errmsg):
self._close_viewer()
self._activate_unavailable_page(errmsg)
def _viewer_auth_error(self, ignore, errmsg, viewer_will_disconnect):
@ -797,7 +797,6 @@ class vmmConsolePages(vmmGObjectUI):
# GtkVNC will disconnect after an auth error, so lets do it for
# them and re-init the viewer (which will be triggered by
# update_vm_widget_states if needed)
self._close_viewer()
self._activate_unavailable_page(errmsg)
self._update_vm_widget_states()
@ -829,9 +828,7 @@ class vmmConsolePages(vmmGObjectUI):
self._activate_unavailable_page(msg)
def _viewer_disconnected(self, ignore, errdetails, ssherr):
self.widget("console-pages").set_current_page(
_CONSOLE_PAGE_UNAVAILABLE)
self._close_viewer()
self._activate_unavailable_page(_("Viewer disconnected."))
logging.debug("Viewer disconnected")
# Make sure modifiers are set correctly
@ -1016,9 +1013,7 @@ class vmmConsolePages(vmmGObjectUI):
return self._viewer.console_get_pixbuf()
def details_close_viewer(self):
self.widget("console-pages").set_current_page(
_CONSOLE_PAGE_UNAVAILABLE)
return self._close_viewer()
return self._activate_unavailable_page(_("Viewer disconnected."))
def details_activate_default_console_page(self):
return self._activate_default_console_page()