From c4718c16750ef055e3255c9e478cc3da0b7a0569 Mon Sep 17 00:00:00 2001
From: Jason Mehring <nrgaway@gmail.com>
Date: Tue, 4 Aug 2015 12:02:19 -0400
Subject: [PATCH] debian: Switch to using org.mate.NotificationDaemon by
 default to eliminate popups not closing

- uses 'slider' theme
---
 debian/control                             | 2 +-
 debian/qubes-core-agent.gsettings-override | 2 ++
 misc/qubes-trigger-desktop-file-install    | 5 +----
 3 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 debian/qubes-core-agent.gsettings-override

diff --git a/debian/control b/debian/control
index 5d49ca4..a282c4d 100644
--- a/debian/control
+++ b/debian/control
@@ -45,9 +45,9 @@ Recommends:
     gnome-themes-standard,
     haveged,
     libnotify-bin,
+    mate-notification-daemon,
     network-manager (>= 0.8.1-1),
     network-manager-gnome,
-    notify-osd,
     ntpdate,
     python-nautilus,
     python-xdg,
diff --git a/debian/qubes-core-agent.gsettings-override b/debian/qubes-core-agent.gsettings-override
new file mode 100644
index 0000000..66d92a8
--- /dev/null
+++ b/debian/qubes-core-agent.gsettings-override
@@ -0,0 +1,2 @@
+[org.mate.NotificationDaemon]
+theme='slider'
diff --git a/misc/qubes-trigger-desktop-file-install b/misc/qubes-trigger-desktop-file-install
index d08c674..aa50b92 100755
--- a/misc/qubes-trigger-desktop-file-install
+++ b/misc/qubes-trigger-desktop-file-install
@@ -62,6 +62,7 @@ FILES=(
     'gnome-sound-applet'
     'gnome-screensaver'
     'orca-autostart'
+    'notify-osd'
 ); install --remove-show-in --add-not-show-in X-QUBES
 
 # Desktop Entry Modification - NotShowIn=DisposableVM
@@ -91,7 +92,3 @@ FILES=('nm-applet')
 FILES=(
     'abrt-applet'
 ); install --remove-show-in
-
-# Desktop Entry Modification - Misc
-# notify-osd
-$INSTALL_CMD --remove-show-in --remove-key X-GNOME-Autostart-enabled "$(generatePath notify-osd)"