summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/blacklists/desktop-sessions/filter10
-rw-r--r--server/blacklists/desktop-sessions/unity/unity-apps2
2 files changed, 10 insertions, 2 deletions
diff --git a/server/blacklists/desktop-sessions/filter b/server/blacklists/desktop-sessions/filter
index aafd1156..9281a412 100644
--- a/server/blacklists/desktop-sessions/filter
+++ b/server/blacklists/desktop-sessions/filter
@@ -1,5 +1,11 @@
- /usr/share/xsessions/*
-+ /usr/share/xsessions/gnome.desktop
-+ /usr/share/xsessions/kde-plasma.desktop
+ /usr/share/xsessions/ubuntu.desktop
+ /usr/share/xsessions/xfce.desktop
+
+# TODO: until gnome-shell conflicts with unity gets fixed
+# for ubuntu 14.04, filter it.
+# + /usr/share/xsessions/gnome.desktop
+
+# gnome-session-fallback for the good ol' gnome2 session
++ /usr/share/xsessions/gnome-fallback.desktop
++ /usr/share/xsessions/kde-plasma.desktop
diff --git a/server/blacklists/desktop-sessions/unity/unity-apps b/server/blacklists/desktop-sessions/unity/unity-apps
new file mode 100644
index 00000000..1f68f3c9
--- /dev/null
+++ b/server/blacklists/desktop-sessions/unity/unity-apps
@@ -0,0 +1,2 @@
+- /usr/share/applications/ubuntu-software-center.desktop
+- /usr/share/applications/ubuntu-amazon-default.desktop