From: Dana Jansens <danakj@orodu.net>
Date: Wed, 3 Dec 2014 21:39:59 +0000 (-0800)
Subject: Update the gnome-session support for version 3.9.90 in Ubuntu Trusty
X-Git-Tag: release-3.6.0~5
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=288ef5896bfa2720718e462313acf69ea95a3086

Update the gnome-session support for version 3.9.90 in Ubuntu Trusty

This change is not backward compatible unfortunately. The format of
the gnome-session .session files has changed, such that every part
of the session is now listed on the RequiredComponents line.
---

diff --git a/data/gnome-session/openbox-gnome-fallback.session b/data/gnome-session/openbox-gnome-fallback.session
index 156f2c3..0909fa7 100644
--- a/data/gnome-session/openbox-gnome-fallback.session
+++ b/data/gnome-session/openbox-gnome-fallback.session
@@ -1,6 +1,4 @@
 [GNOME Session]
 Name=GNOME/Openbox fallback (Safe Mode)
-RequiredComponents=gnome-settings-daemon;
-RequiredProviders=windowmanager;
-DefaultProvider-windowmanager=openbox
+RequiredComponents=openbox;gnome-settings-daemon
 DesktopName=GNOME
diff --git a/data/gnome-session/openbox-gnome.session b/data/gnome-session/openbox-gnome.session
index 3399c2c..ffeccdb 100644
--- a/data/gnome-session/openbox-gnome.session
+++ b/data/gnome-session/openbox-gnome.session
@@ -1,9 +1,4 @@
 [GNOME Session]
 Name=GNOME/Openbox
-RequiredComponents=gnome-settings-daemon;
-# Try load with the gnome-panel and use the fallback if we can't load a panel
-RequiredProviders=windowmanager;panel
-DefaultProvider-windowmanager=openbox
-DefaultProvider-panel=gnome-panel
-FallbackSession=openbox-gnome-fallback
+RequiredComponents=openbox;gnome-settings-daemon;gnome-panel;nautilus-classic;gnome-flashback-services
 DesktopName=GNOME