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:
parent
ed17418101
commit
f6a2c92bfa
@ -85,6 +85,8 @@ function _createUserSession() {
|
|||||||
automountManager = new AutomountManager.AutomountManager();
|
automountManager = new AutomountManager.AutomountManager();
|
||||||
autorunManager = new AutorunManager.AutorunManager();
|
autorunManager = new AutorunManager.AutorunManager();
|
||||||
networkAgent = new NetworkAgent.NetworkAgent();
|
networkAgent = new NetworkAgent.NetworkAgent();
|
||||||
|
|
||||||
|
_initRecorder();
|
||||||
}
|
}
|
||||||
|
|
||||||
function _createGDMSession() {
|
function _createGDMSession() {
|
||||||
@ -131,10 +133,6 @@ function _initRecorder() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function _initUserSession() {
|
|
||||||
_initRecorder();
|
|
||||||
}
|
|
||||||
|
|
||||||
function start() {
|
function start() {
|
||||||
// These are here so we don't break compatibility.
|
// These are here so we don't break compatibility.
|
||||||
global.logError = window.log;
|
global.logError = window.log;
|
||||||
@ -217,9 +215,6 @@ function start() {
|
|||||||
keyboard.init();
|
keyboard.init();
|
||||||
overview.init();
|
overview.init();
|
||||||
|
|
||||||
if (sessionMode.sessionType == Shell.SessionType.USER)
|
|
||||||
_initUserSession();
|
|
||||||
|
|
||||||
if (sessionMode.hasWorkspaces)
|
if (sessionMode.hasWorkspaces)
|
||||||
global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
|
global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
|
||||||
false, -1, 1);
|
false, -1, 1);
|
||||||
|
Loading…
Reference in New Issue
Block a user