main: Remove _initUserSession()

In Shell.SessionType.USER mode, two separate setup functions were
used during startup. With the new feature-based checks, the second
one is now almost empty, so move its remaining code into the first
function and remove it.

https://bugzilla.gnome.org/show_bug.cgi?id=676156
This commit is contained in:
Florian Müllner 2012-05-17 15:47:32 +02:00
parent ed17418101
commit f6a2c92bfa

View File

@ -85,6 +85,8 @@ function _createUserSession() {
automountManager = new AutomountManager.AutomountManager();
autorunManager = new AutorunManager.AutorunManager();
networkAgent = new NetworkAgent.NetworkAgent();
_initRecorder();
}
function _createGDMSession() {
@ -131,10 +133,6 @@ function _initRecorder() {
});
}
function _initUserSession() {
_initRecorder();
}
function start() {
// These are here so we don't break compatibility.
global.logError = window.log;
@ -217,9 +215,6 @@ function start() {
keyboard.init();
overview.init();
if (sessionMode.sessionType == Shell.SessionType.USER)
_initUserSession();
if (sessionMode.hasWorkspaces)
global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
false, -1, 1);