Merge lp:~tombeckmann/elementaryos/pantheon-xsession-settings-fix-startup into lp:~elementary-os/elementaryos/pantheon-xsession-settings-bzr

Proposed by Tom Beckmann
Status: Merged
Approved by: Cody Garver
Approved revision: 60
Merged at revision: 61
Proposed branch: lp:~tombeckmann/elementaryos/pantheon-xsession-settings-fix-startup
Merge into: lp:~elementary-os/elementaryos/pantheon-xsession-settings-bzr
Diff against target: 12 lines (+1/-3)
1 file modified
debian/pantheon.session (+1/-3)
To merge this branch: bzr merge lp:~tombeckmann/elementaryos/pantheon-xsession-settings-fix-startup
Reviewer Review Type Date Requested Status
Sergey "Shnatsel" Davidoff (community) Approve
Review via email: mp+195511@code.launchpad.net

Commit message

Shift RequiredComponents now that Gala supports Mutter 3.8

Description of the change

Together with the most recent commit to the gala mutter3.8 branch which is also waiting for review, this will fix the problems we had at startup. Gala was blocking cerbere from being started, which it no longer does. But apparently this change to the pantheon.session file is also required for gala being started. The order and structure of the file now corresponds to the one for gnome-shell and the gnome-fallback sessions.

To post a comment you must log in.
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/pantheon.session'
2--- debian/pantheon.session 2013-10-01 19:45:05 +0000
3+++ debian/pantheon.session 2013-11-17 12:49:28 +0000
4@@ -1,7 +1,5 @@
5 [GNOME Session]
6 Name=Pantheon
7-RequiredComponents=gnome-settings-daemon;
8-RequiredProviders=windowmanager;
9-DefaultProvider-windowmanager=gala
10+RequiredComponents=gala;gnome-settings-daemon;
11 FallbackSession=ubuntu
12 DesktopName=Pantheon

Subscribers

People subscribed via source and target branches