~ubuntu-branches/ubuntu/utopic/gnome-session/utopic-proposed

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
Description: tweak the session system to make it for ubuntu.
The session contains:
 - ubuntu (unity), gnome-shell in the main gnome-session package.
 (TryExec enables to show them or not depends on the package installed)
Forwarded: Not needed

--- a/data/gnome.desktop.in
+++ b/data/gnome.desktop.in
@@ -1,7 +1,8 @@
 [Desktop Entry]
 _Name=GNOME
 _Comment=This session logs you into GNOME
-Exec=gnome-session
-TryExec=gnome-session
+Exec=gnome-session --session=gnome
+TryExec=gnome-shell
 Icon=
 Type=Application
+X-LightDM-DesktopName=GNOME
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,7 @@
 hwcompat_DATA = hardware-compatibility
 
 xsessiondir = $(datadir)/xsessions
-xsession_in_files = gnome.desktop.in
+xsession_in_files = gnome.desktop.in ubuntu.desktop.in
 
 if BUILD_SESSION_SELECTOR
 xsession_in_files += gnome-custom-session.desktop.in
@@ -26,7 +26,7 @@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 sessiondir = $(datadir)/gnome-session/sessions
-session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in
+session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in ubuntu.session.desktop.in.in
 session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
 session_DATA = $(session_in_files:.session.desktop.in=.session)
 
--- /dev/null
+++ b/data/ubuntu.session.desktop.in.in
@@ -0,0 +1,3 @@
+[GNOME Session]
+_Name=Ubuntu
+RequiredComponents=gnome-settings-daemon;compiz;
--- /dev/null
+++ b/data/ubuntu.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+_Name=Ubuntu
+_Comment=This session logs you into Ubuntu
+Exec=gnome-session --session=ubuntu
+TryExec=unity
+Icon=
+Type=Application
+X-LightDM-DesktopName=Unity