From 8c45e6fa43f49ffef0bf1839f08c1610adc706cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 3 May 2014 20:57:49 +0200 Subject: [PATCH] main: Don't depend on GSystem unconditionally We only need GSystem when running under systemd. As libgsystem itself has a hard dependency on systemd, only import it when actually needed to keep working on systems where systemd is not available. https://bugzilla.gnome.org/show_bug.cgi?id=728449 --- js/ui/main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/ui/main.js b/js/ui/main.js index 1958abecd..b59646319 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -9,7 +9,6 @@ const Mainloop = imports.mainloop; const Meta = imports.gi.Meta; const Shell = imports.gi.Shell; const St = imports.gi.St; -const GSystem = imports.gi.GSystem; const Components = imports.ui.components; const CtrlAltTab = imports.ui.ctrlAltTab; @@ -214,6 +213,9 @@ function _initializeUI() { screenShield.lockIfWasLocked(); } if (LoginManager.haveSystemd() && sessionMode.currentMode === 'user') { + // Do not import globally to not depend + // on systemd on non-systemd systems. + let GSystem = imports.gi.GSystem; GSystem.log_structured_print('GNOME Shell started at ' + _startDate, ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]); } else {