diff --git a/qubesmanager/main.py b/qubesmanager/main.py index 5ad358a..7beb2ed 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("---") @@ -1056,7 +1056,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow): if vm.qid == 0: subprocess.check_call (["/usr/bin/qvm-dom0-update", "--gui"]) else: - qubesutils.run_in_vm(vm, "user:gpk-update-viewer", verbose=False, autostart=True) + vm.run("user:gpk-update-viewer", verbose=False, autostart=True) except Exception as ex: thread_monitor.set_error_msg(str(ex)) thread_monitor.set_finished() diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index 77edc86..a2f7cb4 100644 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -151,7 +151,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)) @@ -196,9 +196,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) diff --git a/rpm_spec/qmgr.spec b/rpm_spec/qmgr.spec index e45f853..e3bf07d 100644 --- a/rpm_spec/qmgr.spec +++ b/rpm_spec/qmgr.spec @@ -4,14 +4,15 @@ Name: qubes-manager Version: %{version} -Release: 1 +Release: 3 Summary: The Graphical Qubes VM Manager. Group: Qubes Vendor: Invisible Things Lab License: GPL URL: http://fixme -Requires: python, PyQt4, qubes-core-dom0 >= 1.3.1, kdebase +Requires: python, PyQt4, qubes-core-dom0 >= 1.7.12, kdebase +Requires: pmount BuildRequires: PyQt4-devel AutoReq: 0 diff --git a/version b/version index 26aaba0..6085e94 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.0 +1.2.1