From e2f6c00817eedffd56ee6b3ca8c7795ba8885e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Sun, 16 Jul 2017 16:36:36 +0200
Subject: [PATCH] fixes to system menu

Added global settings and create VM shortcuts to menu; replaced Add New Shortcut with vm settings in VM menu.
---
 org.qubesos.QubesManager.conf                 | 15 -------------
 org.qubesos.QubesManager.xml                  | 22 -------------------
 qubes-global-settings.desktop                 | 10 +++++++++
 ...manager.desktop => qubes-vm-create.desktop |  8 +++----
 rpm_spec/qmgr.spec                            | 13 ++++-------
 5 files changed, 18 insertions(+), 50 deletions(-)
 delete mode 100644 org.qubesos.QubesManager.conf
 delete mode 100644 org.qubesos.QubesManager.xml
 create mode 100644 qubes-global-settings.desktop
 rename qubes-manager.desktop => qubes-vm-create.desktop (57%)

diff --git a/org.qubesos.QubesManager.conf b/org.qubesos.QubesManager.conf
deleted file mode 100644
index 5bc7dad..0000000
--- a/org.qubesos.QubesManager.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- This config allows anyone to control QubesManager -->
-
-  <policy context="default">
-    <allow send_destination="org.qubesos.QubesManager"/>
-  </policy>
-
-  <policy group="qubes">
-    <allow own="org.qubesos.QubesManager"/>
-  </policy>
-</busconfig>
-
diff --git a/org.qubesos.QubesManager.xml b/org.qubesos.QubesManager.xml
deleted file mode 100644
index d4f5f3e..0000000
--- a/org.qubesos.QubesManager.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.qubesos.QubesManager">
-    <method name="notify_error">
-      <arg name="vmname" type="s" direction="in"/>
-      <arg name="message" type="s" direction="in"/>
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-    <method name="clear_error_exact">
-      <arg name="vmname" type="s" direction="in"/>
-      <arg name="message" type="s" direction="in"/>
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-    <method name="clear_error">
-      <arg name="vmname" type="s" direction="in"/>
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-    <method name="show_manager">
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-  </interface>
-</node>
diff --git a/qubes-global-settings.desktop b/qubes-global-settings.desktop
new file mode 100644
index 0000000..110d418
--- /dev/null
+++ b/qubes-global-settings.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Exec=qubes-global-settings
+Path=/user/bin
+Icon=qubes-manager
+Terminal=false
+Name=Qubes Global Settings
+GenericName=Qubes Global Settings
+StartupNotify=false
+Categories=System;
diff --git a/qubes-manager.desktop b/qubes-vm-create.desktop
similarity index 57%
rename from qubes-manager.desktop
rename to qubes-vm-create.desktop
index 9994c70..1fa0d7b 100644
--- a/qubes-manager.desktop
+++ b/qubes-vm-create.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
-Exec=qubes-manager
-Path=/var/lib/qubes
+Exec=qubes-vm-create
+Path=/usr/bin
 Icon=qubes-manager
 Terminal=false
-Name=Qubes VM Manager
-GenericName=Qubes VM Manager
+Name=Create Qubes VM
+GenericName=Create Qubes VM
 StartupNotify=false
 Categories=System;X-Xfce-Toplevel;
diff --git a/rpm_spec/qmgr.spec b/rpm_spec/qmgr.spec
index 70b7a0c..6c4302f 100644
--- a/rpm_spec/qmgr.spec
+++ b/rpm_spec/qmgr.spec
@@ -42,12 +42,9 @@ cp qubesmanager/mount_for_backup.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
 cp qubesmanager/qvm_about.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications
-cp qubes-manager.desktop $RPM_BUILD_ROOT/usr/share/applications
-mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart/
-cp qubes-manager.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/
+cp qubes-global-settings.desktop $RPM_BUILD_ROOT/usr/share/applications/
+cp qubes-vm-create.desktop $RPM_BUILD_ROOT/usr/share/applications/
 
-install -D org.qubesos.QubesManager.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d/org.qubesos.QubesManager.conf
-install -D org.qubesos.QubesManager.xml $RPM_BUILD_ROOT/usr/share/dbus-1/interfaces/org.qubesos.QubesManager.xml
 
 %post
 update-desktop-database &> /dev/null || :
@@ -108,7 +105,5 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{python3_sitelib}/qubesmanager-*.egg-info
 %{python3_sitelib}/qubesmanager-*.egg-info/*
 
-/usr/share/applications/qubes-manager.desktop
-/etc/xdg/autostart/qubes-manager.desktop
-/etc/dbus-1/system.d/org.qubesos.QubesManager.conf
-/usr/share/dbus-1/interfaces/org.qubesos.QubesManager.xml
+/usr/share/applications/qubes-global-settings.desktop
+/usr/share/applications/qubes-vm-create.desktop