From a4e10f00c1aeea9781d76ac0f9cd8448d1bb3ec4 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 18 Jun 2012 23:51:44 +0200
Subject: [PATCH 1/3] dom0/qvm-firewall: eliminate duplicate firewall defaults
 definition (#599)

This caused ignore of different firewall defaults for TemplateVM.
---
 dom0/qvm-core/qubes.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 4624c955..1a3db454 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -2005,10 +2005,7 @@ class QubesProxyVm(QubesNetVm):
         vms = [vm for vm in self.connected_vms.values()]
         for vm in vms:
             iptables="*filter\n"
-            if vm.has_firewall():
-                conf = vm.get_firewall_conf()
-            else:
-                conf = { "rules": list(), "allow": True, "allowDns": True, "allowIcmp": True, "allowYumProxy": False }
+            conf = vm.get_firewall_conf()
 
             xid = vm.get_xid()
             if xid < 0: # VM not active ATM

From 3109deebd5af199cf48585fdc3e3572cd97f2028 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 21 Jun 2012 11:50:52 +0200
Subject: [PATCH 2/3] Revert "dom0/appmenus: do not add "Add more shortcuts"
 menu (#458)" (#548)

This reverts commit 8b613a10b4b5f5aba7c0d2f8577f2c0d3f05aae2.

Restore this option.
---
 dom0/aux-tools/create_apps_for_appvm.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom0/aux-tools/create_apps_for_appvm.sh b/dom0/aux-tools/create_apps_for_appvm.sh
index 80fdf491..0b6e53dd 100755
--- a/dom0/aux-tools/create_apps_for_appvm.sh
+++ b/dom0/aux-tools/create_apps_for_appvm.sh
@@ -42,6 +42,7 @@ if [ "$SRCDIR" != "none" ]; then
     else
         find $SRCDIR -name "*.desktop" $CHECK_WHITELISTED -exec /usr/lib/qubes/convert_apptemplate2vm.sh {} $APPSDIR $VMNAME $VMDIR \;
     fi
+    /usr/lib/qubes/convert_apptemplate2vm.sh /usr/share/qubes/qubes-appmenu-select.desktop $APPSDIR $VMNAME $VMDIR
 
     if [ "$VMTYPE" = "vm-templates" ]; then
         /usr/lib/qubes/convert_dirtemplate2vm.sh /usr/share/qubes/qubes-templatevm.directory.template $APPSDIR/$VMNAME-vm.directory $VMNAME $VMDIR

From 51f4a60a44bf2df5499494cf9c35af1082207973 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 21 Jun 2012 11:57:36 +0200
Subject: [PATCH 3/3] dom0: use new qubes-manager appmenu applet (#548)

---
 dom0/misc/qubes-appmenu-select.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom0/misc/qubes-appmenu-select.desktop b/dom0/misc/qubes-appmenu-select.desktop
index 2275f779..29f3ee1d 100644
--- a/dom0/misc/qubes-appmenu-select.desktop
+++ b/dom0/misc/qubes-appmenu-select.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Exec=qubes-appmenu-select %VMNAME%
+Exec=qubes-vm-settings %VMNAME% applications
 Icon=/usr/share/qubes/icons/qubes.png
 Terminal=false
 Name=%VMNAME%: Add more shortcuts...