Revert "Defer initializing UI until after the global session has loaded"

This reverts commit 0bef925b51.

Just for now.  Jasper has plans to clean up start up eventually.

https://bugzilla.gnome.org/show_bug.cgi?id=694321
This commit is contained in:
Ray Strode
2013-03-06 17:25:28 -05:00
parent 0bef925b51
commit 1dceae97c6
2 changed files with 16 additions and 15 deletions

View File

@ -158,7 +158,12 @@ function listModes() {
const SessionMode = new Lang.Class({
Name: 'SessionMode',
init: function() {
_init: function() {
global.connect('notify::session-mode', Lang.bind(this, this._sync));
this._modes = _modes;
this._modeStack = [DEFAULT_MODE];
this._sync();
_getModes(Lang.bind(this, function(modes) {
this._modes = modes;
let primary = modes[global.session_mode] &&
@ -166,8 +171,6 @@ const SessionMode = new Lang.Class({
let mode = primary ? global.session_mode : 'user';
this._modeStack = [mode];
this._sync();
this.emit('sessions-loaded');
}));
},