From 72fea97066fd8b87c3048d6f1778c43dd17745ef Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sun, 4 Mar 2012 22:02:27 +0100 Subject: [PATCH] follow API change: netvm_vm -> netvm --- qubesmanager/main.py | 4 ++-- qubesmanager/settings.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qubesmanager/main.py b/qubesmanager/main.py index 1ed9384..9627b79 100755 --- a/qubesmanager/main.py +++ b/qubesmanager/main.py @@ -191,8 +191,8 @@ class VmNetvmItem (QTableWidgetItem): if vm.is_netvm() and not vm.is_proxyvm(): self.setText("n/a") - elif vm.netvm_vm is not None: - self.setText(vm.netvm_vm.name) + elif vm.netvm is not None: + self.setText(vm.netvm.name) else: self.setText("---") diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index 9ca2475..9a4aa22 100644 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -150,7 +150,7 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): def current_tab_changed(self, idx): if idx == self.tabs_indices["firewall"]: - if self.vm.netvm_vm is not None and not self.vm.netvm_vm.is_proxyvm(): + if self.vm.netvm is not None and not self.vm.netvm.is_proxyvm(): QMessageBox.warning (None, "VM configuration problem!", "The '{0}' AppVM is not network connected to a FirewallVM!

".format(self.vm.name) +\ "You may edit the '{0}' VM firewall rules, but these will not take any effect until you connect it to a working Firewall VM.".format(self.vm.name)) @@ -195,9 +195,9 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): self.netvm_idx = 0 for (i, vm) in enumerate(netvm_list): text = vm.name - if vm is self.qvm_collection.get_default_netvm_vm(): + if vm is self.qvm_collection.get_default_netvm(): text += " (default)" - if vm.qid == self.vm.netvm_vm.qid: + if vm.qid == self.vm.netvm.qid: self.netvm_idx = i text += " (current)" self.netVM.insertItem(i, text)