js: Split gi imports to be on new lines to prepare for ES modules

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2794>

HACKING.md

@@ -79,7 +79,9 @@ e.g. `imports.ui.popupMenu`.
 Each import block should be sorted alphabetically. Don't import modules you
 don't use.
 ```javascript
-    const { GLib, Gio, St } = imports.gi;
+    const GLib = imports.gi.GLib;
+    const Gio = imports.gi.Gio;
+    const St = imports.gi.St;
 
     const Main = imports.ui.main;
     const Params = imports.misc.params;

js/gdm/authList.js

@@ -17,7 +17,10 @@
  */
 /* exported AuthList */
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const SCROLL_ANIMATION_TIME = 500;
 

js/gdm/authPrompt.js

@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported AuthPrompt */
 
-const { Clutter, GLib, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const AuthList = imports.gdm.authList;

js/gdm/batch.js

@@ -45,7 +45,7 @@
  */
 /* exported ConcurrentBatch, ConsecutiveBatch */
 
-const { GObject } = imports.gi;
+const GObject = imports.gi.GObject;
 const Signals = imports.misc.signals;
 
 var Task = class extends Signals.EventEmitter {

js/gdm/loginDialog.js

@@ -17,10 +17,17 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const {
+const AccountsService = imports.gi.AccountsService;
-    AccountsService, Atk, Clutter, Gdm, Gio,
+const Atk = imports.gi.Atk;
-    GLib, GObject, Meta, Pango, Shell, St,
+const Clutter = imports.gi.Clutter;
-} = imports.gi;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AuthPrompt = imports.gdm.authPrompt;
 const Batch = imports.gdm.batch;

js/gdm/util.js

@@ -3,7 +3,10 @@
             DISABLE_USER_LIST_KEY, fadeInActor, fadeOutActor, cloneAndFadeOutActor,
             ShellUserVerifier */
 
-const { Clutter, Gdm, Gio, GLib } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Signals = imports.misc.signals;
 
 const Batch = imports.gdm.batch;

js/misc/dbusUtils.js

@@ -2,7 +2,8 @@
 /* exported loadInterfaceXML, loadSubInterfaceXML */
 
 const Config = imports.misc.config;
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 
 let _ifaceResource = null;
 

js/misc/extensionUtils.js

@@ -7,7 +7,8 @@
 // Common utils for the extension system and the extension
 // preferences tool
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 
 const Gettext = imports.gettext;
 

js/misc/fileUtils.js

@@ -2,7 +2,8 @@
 /* exported collectFromDatadirs, recursivelyDeleteDir,
             recursivelyMoveDir, loadInterfaceXML, loadSubInterfaceXML */
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 
 var { loadInterfaceXML } = imports.misc.dbusUtils;
 

js/misc/ibusManager.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getIBusManager */
 
-const { Gio, GLib, IBus, Meta, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const IBus = imports.gi.IBus;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 const Signals = imports.misc.signals;
 const BoxPointer = imports.ui.boxpointer;
 

js/misc/inputMethod.js

@@ -1,6 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported InputMethod */
-const { Clutter, GLib, Gio, GObject, IBus } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const IBus = imports.gi.IBus;
 
 const Keyboard = imports.ui.status.keyboard;
 const Main = imports.ui.main;

js/misc/introspect.js

@@ -1,5 +1,9 @@
 /* exported IntrospectService */
-const { Gio, GLib, Meta, Shell, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const APP_ALLOWLIST = [
     'org.freedesktop.impl.portal.desktop.gtk',

js/misc/keyboardManager.js

@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getKeyboardManager, holdKeyboard, releaseKeyboard */
 
-const { GLib, GnomeDesktop } = imports.gi;
+const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
 
 const Main = imports.ui.main;
 

js/misc/loginManager.js

@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported canLock, getLoginManager, registerSessionWithGDM */
 
-const { GLib, Gio } = imports.gi;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
 const Signals = imports.misc.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;

js/misc/modemManager.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ModemBase, ModemGsm, ModemCdma, BroadbandModem  */
 
-const {Gio, GObject, NM, NMA4} = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const NM = imports.gi.NM;
+const NMA4 = imports.gi.NMA4;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 

js/misc/objectManager.js

@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ObjectManager */
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Params = imports.misc.params;
 const Signals = imports.misc.signals;
 

js/misc/parentalControlsManager.js

@@ -23,7 +23,9 @@
 
 /* exported getDefault */
 
-const { Gio, GObject, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
 
 // We require libmalcontent ≥ 0.6.0
 const HAVE_MALCONTENT = imports.package.checkSymbol(

js/misc/signalTracker.js

@@ -1,5 +1,5 @@
 /* exported TransientSignalHolder, connectObject, disconnectObject */
-const { GObject } = imports.gi;
+const GObject = imports.gi.GObject;
 
 const destroyableTypes = [];
 

js/misc/systemActions.js

@@ -1,5 +1,10 @@
 /* exported getDefault */
-const {AccountsService, Clutter, Gdm, Gio, GLib, GObject} = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
 
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;

js/misc/util.js

@@ -4,7 +4,12 @@
             ensureActorVisibleInScrollView, wiggle, lerp, GNOMEversionCompare,
             DBusSenderChecker, Highlighter */
 
-const { Clutter, Gio, GLib, Shell, St, GnomeDesktop } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const GnomeDesktop = imports.gi.GnomeDesktop;
 const Gettext = imports.gettext;
 
 const Main = imports.ui.main;

js/misc/weather.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WeatherClient */
 
-const { Geoclue, Gio, GLib, GWeather, Shell } = imports.gi;
+const Geoclue = imports.gi.Geoclue;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GWeather = imports.gi.GWeather;
+const Shell = imports.gi.Shell;
 const Signals = imports.misc.signals;
 
 const PermissionStore = imports.misc.permissionStore;

js/perf/basic.js

@@ -5,7 +5,7 @@
 */
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_"] }] */
 
-const { St } = imports.gi;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;

js/perf/closeWithActiveWindows.js

@@ -2,7 +2,7 @@
 /* exported run */
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^malloc", "^glx", "^clutter"] }] */
 
-const {Clutter} = imports.gi;
+const Clutter = imports.gi.Clutter;
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

js/perf/headlessStart.js

@@ -4,7 +4,9 @@
 */
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_"] }] */
 
-const {GLib, MetaTest, Shell} = imports.gi;
+const GLib = imports.gi.GLib;
+const MetaTest = imports.gi.MetaTest;
+const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

js/perf/hwtest.js

@@ -7,7 +7,9 @@
             script_geditLaunch, script_geditFirstFrame,
             clutter_stagePaintStart, clutter_paintCompletedTimestamp */
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^clutter"] }] */
-const { Clutter, Gio, Shell } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const Shell = imports.gi.Shell;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
 

js/ui/accessDialog.js

@@ -1,5 +1,11 @@
 /* exported AccessDialogDBus */
-const { Clutter, Gio, GLib, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;

js/ui/altTab.js

@@ -2,7 +2,14 @@
 /* exported AppSwitcherPopup, GroupCyclerPopup, WindowSwitcherPopup,
             WindowCyclerPopup */
 
-const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;

js/ui/animation.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Animation, AnimatedIcon, Spinner */
 
-const { Clutter, GLib, GObject, Gio, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gio = imports.gi.Gio;
+const St = imports.gi.St;
 
 const Params = imports.misc.params;
 

js/ui/appDisplay.js

@@ -1,9 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported AppDisplay, AppSearchProvider */
 
-const {
+const Clutter = imports.gi.Clutter;
-    Clutter, Gio, GLib, GObject, Graphene, Pango, Shell, St,
+const Gio = imports.gi.Gio;
-} = imports.gi;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppFavorites = imports.ui.appFavorites;
 const { AppMenu } = imports.ui.appMenu;

js/ui/appMenu.js

@@ -1,6 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported AppMenu */
-const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppFavorites = imports.ui.appFavorites;
 const Main = imports.ui.main;

js/ui/audioDeviceSelection.js

@@ -1,5 +1,11 @@
 /* exported AudioDeviceSelectionDBus */
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

js/ui/background.js

@@ -94,7 +94,14 @@
 //     MetaBackgroundImage         MetaBackgroundImage
 //     MetaBackgroundImage         MetaBackgroundImage
 
-const {Clutter, GDesktopEnums, Gio, GLib, GObject, GnomeBG, GnomeDesktop, Meta} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GDesktopEnums = imports.gi.GDesktopEnums;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const GnomeBG = imports.gi.GnomeBG;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const Meta = imports.gi.Meta;
 const Signals = imports.misc.signals;
 
 const LoginManager = imports.misc.loginManager;

js/ui/backgroundMenu.js

@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported addBackgroundMenu */
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

js/ui/barLevel.js

@@ -1,7 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported BarLevel */
 
-const { Atk, Clutter, GObject, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 var BarLevel = GObject.registerClass({
     Properties: {

js/ui/boxpointer.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported BoxPointer */
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 

js/ui/calendar.js

@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Calendar, CalendarMessageList, DBusEventSource */
 
-const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;

js/ui/checkBox.js

@@ -1,5 +1,9 @@
 /* exported CheckBox */
-const { Atk, Clutter, GObject, Pango, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 var CheckBox = GObject.registerClass(
 class CheckBox extends St.Button {

js/ui/closeDialog.js

@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported CloseDialog */
 
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

js/ui/components/automountManager.js

@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Params = imports.misc.params;
 
 const GnomeSession = imports.misc.gnomeSession;

js/ui/components/autorunManager.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Clutter, Gio, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;

js/ui/components/keyring.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Clutter, Gcr, Gio, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gcr = imports.gi.Gcr;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

js/ui/components/networkAgent.js

@@ -1,7 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const NM = imports.gi.NM;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Dialog = imports.ui.dialog;

js/ui/components/polkitAgent.js

@@ -1,10 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const {
+const AccountsService = imports.gi.AccountsService;
-    AccountsService, Clutter, GLib, GObject,
+const Clutter = imports.gi.Clutter;
-    Pango, PolkitAgent, Polkit, Shell, St,
+const GLib = imports.gi.GLib;
-} = imports.gi;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const PolkitAgent = imports.gi.PolkitAgent;
+const Polkit = imports.gi.Polkit;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

js/ui/components/telepathyClient.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Clutter, Gio, GLib, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 var Tpl = null;
 var Tp = null;

js/ui/ctrlAltTab.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported CtrlAltTabManager */
 
-const { Clutter, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;

js/ui/dash.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Dash */
 
-const { Clutter, GLib, GObject, Graphene, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;

js/ui/dateMenu.js

@@ -1,10 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported DateMenuButton */
 
-const {
+const Clutter = imports.gi.Clutter;
-    Clutter, Gio, GLib, GnomeDesktop,
+const Gio = imports.gi.Gio;
-    GObject, GWeather, Pango, Shell, St,
+const GLib = imports.gi.GLib;
-} = imports.gi;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const GObject = imports.gi.GObject;
+const GWeather = imports.gi.GWeather;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Util = imports.misc.util;
 const Main = imports.ui.main;

js/ui/dialog.js

@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Dialog, MessageDialogContent, ListSection, ListSectionItem */
 
-const { Clutter, GLib, GObject, Meta, Pango, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 function _setLabel(label, value) {
     label.set({

js/ui/dnd.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported addDragMonitor, removeDragMonitor, makeDraggable */
 
-const { Clutter, GLib, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Main = imports.ui.main;

js/ui/edgeDragAction.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported EdgeDragAction */
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 

js/ui/endSessionDialog.js

@@ -17,10 +17,16 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const {
+const AccountsService = imports.gi.AccountsService;
-    AccountsService, Clutter, Gio, GLib, GObject,
+const Clutter = imports.gi.Clutter;
-    Pango, Polkit, Shell, St, UPowerGlib: UPower,
+const Gio = imports.gi.Gio;
-} = imports.gi;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Polkit = imports.gi.Polkit;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const UPower = imports.gi.UPowerGlib;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;

js/ui/environment.js

@@ -33,7 +33,15 @@ imports.gi.versions.TelepathyGLib = '0.12';
 imports.gi.versions.TelepathyLogger = '0.2';
 imports.gi.versions.UPowerGlib = '1.0';
 
-const {Clutter, Gdk, Gio, GLib, GObject, Meta, Polkit, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Polkit = imports.gi.Polkit;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Gettext = imports.gettext;
 const System = imports.system;
 const SignalTracker = imports.misc.signalTracker;

js/ui/extensionDownloader.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported init, installExtension, uninstallExtension, checkForUpdates */
 
-const { Clutter, Gio, GLib, GObject, Soup } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Soup = imports.gi.Soup;
 
 const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;

js/ui/extensionSystem.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported init connect disconnect ExtensionManager */
 
-const { GLib, Gio, GObject, Shell, St } = imports.gi;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const ExtensionDownloader = imports.ui.extensionDownloader;

js/ui/grabHelper.js

@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported GrabHelper */
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

js/ui/ibusCandidatePopup.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported CandidatePopup */
 
-const { Clutter, GObject, IBus, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const IBus = imports.gi.IBus;
+const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

js/ui/iconGrid.js

@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported BaseIcon, IconGrid, IconGridLayout */
 
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Params = imports.misc.params;
 const Main = imports.ui.main;

js/ui/inhibitShortcutsDialog.js

@@ -1,5 +1,10 @@
 /* exported InhibitShortcutsDialog */
-const {Clutter, GObject, Meta, Pango, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

js/ui/kbdA11yDialog.js

@@ -1,5 +1,8 @@
 /* exported KbdA11yDialog */
-const { Clutter, Gio, GObject, Meta } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

js/ui/keyboard.js

@@ -1,7 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported KeyboardManager */
 
-const {Clutter, Gio, GLib, GObject, Graphene, IBus, Meta, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const IBus = imports.gi.IBus;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const EdgeDragAction = imports.ui.edgeDragAction;

js/ui/layout.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported MonitorConstraint, LayoutManager */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Background = imports.ui.background;

js/ui/lightbox.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Lightbox */
 
-const { Clutter, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Params = imports.misc.params;
 

js/ui/locatePointer.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported LocatePointer */
 
-const { Gio } = imports.gi;
+const Gio = imports.gi.Gio;
 const Ripples = imports.ui.ripples;
 const Main = imports.ui.main;
 

js/ui/lookingGlass.js

@@ -1,9 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported LookingGlass */
 
-const {
+const Clutter = imports.gi.Clutter;
-    Clutter, Cogl, Gio, GLib, GObject, Graphene, Meta, Pango, Shell, St,
+const Cogl = imports.gi.Cogl;
-} = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 const System = imports.system;
 

js/ui/magnifier.js

@@ -1,9 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Magnifier */
 
-const {
+const Atspi = imports.gi.Atspi;
-    Atspi, Clutter, GDesktopEnums, Gio, GLib, GObject, Meta, Shell, St,
+const Clutter = imports.gi.Clutter;
-} = imports.gi;
+const GDesktopEnums = imports.gi.GDesktopEnums;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Background = imports.ui.background;

js/ui/main.js

@@ -9,7 +9,13 @@
             createLookingGlass, initializeDeferredWork,
             getStyleVariant, getThemeStylesheet, setThemeStylesheet, screenshotUI */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AccessDialog = imports.ui.accessDialog;
 const AudioDeviceSelection = imports.ui.audioDeviceSelection;

js/ui/messageList.js

@@ -1,7 +1,13 @@
 /* exported MessageListSection */
-const {
+const Atk = imports.gi.Atk;
-    Atk, Clutter, Gio, GLib, GObject, Graphene, Meta, Pango, St,
+const Clutter = imports.gi.Clutter;
-} = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 

js/ui/messageTray.js

@@ -3,7 +3,13 @@
    NotificationApplicationPolicy, Source, SourceActor,
    SystemNotificationSource, MessageTray */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const GnomeSession = imports.misc.gnomeSession;

js/ui/modalDialog.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ModalDialog */
 
-const { Atk, Clutter, GObject, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Layout = imports.ui.layout;

js/ui/mpris.js

@@ -1,5 +1,8 @@
 /* exported MediaSection */
-const { Gio, GObject, Shell, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Main = imports.ui.main;

js/ui/notificationDaemon.js

@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported NotificationDaemon */
 
-const { GdkPixbuf, Gio, GLib, GObject, Shell, St } = imports.gi;
+const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Config = imports.misc.config;
 const Main = imports.ui.main;

js/ui/osdMonitorLabeler.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported OsdMonitorLabeler */
 
-const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 

js/ui/osdWindow.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported OsdWindowManager */
 
-const { Clutter, GLib, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const BarLevel = imports.ui.barLevel;
 const Layout = imports.ui.layout;

js/ui/overview.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Overview, ANIMATION_TIME */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 // Time for initial animation going into Overview mode;

js/ui/overviewControls.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ControlsManager */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const Dash = imports.ui.dash;

js/ui/padOsd.js

@@ -1,10 +1,17 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported PadOsd, PadOsdService */
 
-const {
+const Atk = imports.gi.Atk;
-    Atk, Clutter, GDesktopEnums, Gio,
+const Clutter = imports.gi.Clutter;
-    GLib, GObject, Meta, Pango, Rsvg, St,
+const GDesktopEnums = imports.gi.GDesktopEnums;
-} = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Rsvg = imports.gi.Rsvg;
+const St = imports.gi.St;
+
 const Signals = imports.misc.signals;
 
 const Main = imports.ui.main;

js/ui/pageIndicators.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported PageIndicators */
 
-const { Clutter, Graphene, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Graphene = imports.gi.Graphene;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const INDICATOR_INACTIVE_OPACITY = 128;
 const INDICATOR_INACTIVE_OPACITY_HOVER = 255;

js/ui/panel.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Panel */
 
-const { Atk, Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const { AppMenu } = imports.ui.appMenu;

js/ui/panelMenu.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Button, SystemIndicator */
 
-const { Atk, Clutter, GObject, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

js/ui/pointerA11yTimeout.js

@@ -1,5 +1,8 @@
 /* exported PointerA11yTimeout */
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 const Main = imports.ui.main;
 const Cairo = imports.cairo;
 

js/ui/pointerWatcher.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getPointerWatcher */
 
-const { GLib } = imports.gi;
+const GLib = imports.gi.GLib;
 
 // We stop polling if the user is idle for more than this amount of time
 var IDLE_TIME = 1000;

js/ui/popupMenu.js

@@ -3,7 +3,13 @@
             PopupImageMenuItem, PopupMenu, PopupDummyMenu, PopupSubMenu,
             PopupMenuSection, PopupSubMenuMenuItem, PopupMenuManager */
 
-const { Atk, Clutter, Gio, GObject, Graphene, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const BoxPointer = imports.ui.boxpointer;

js/ui/quickSettings.js

@@ -1,5 +1,13 @@
 /* exported QuickToggle, QuickMenuToggle, QuickSlider, QuickSettingsMenu, SystemIndicator */
-const {Atk, Clutter, Gio, GLib, GObject, Graphene, Meta, Pango, St} = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;

js/ui/remoteSearch.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported loadRemoteSearchProviders */
 
-const { GdkPixbuf, Gio, GLib, Shell, St } = imports.gi;
+const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const FileUtils = imports.misc.fileUtils;
 

js/ui/ripples.js

@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Ripples */
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 // Shamelessly copied from the layout "hotcorner" ripples implementation
 var Ripples = class Ripples {

js/ui/runDialog.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported RunDialog */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

js/ui/screenShield.js

@@ -1,10 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ScreenShield */
 
-const {
+const AccountsService = imports.gi.AccountsService;
-    AccountsService, Clutter, Gio,
+const Clutter = imports.gi.Clutter;
-    GLib, Graphene, Meta, Shell, St,
+const Gio = imports.gi.Gio;
-} = imports.gi;
+const GLib = imports.gi.GLib;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
 const Signals = imports.misc.signals;
 
 const GnomeSession = imports.misc.gnomeSession;

js/ui/screenshot.js

@@ -1,7 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ScreenshotService, ScreenshotUI, showScreenshotUI, captureScreenshot */
 
-const {Clutter, Cogl, Gio, GObject, GLib, Graphene, Meta, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Cogl = imports.gi.Cogl;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const GLib = imports.gi.GLib;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const GrabHelper = imports.ui.grabHelper;
 const Layout = imports.ui.layout;

js/ui/scripting.js

@@ -3,7 +3,10 @@
             destroyTestWindows, defineScriptEvent, scriptEvent,
             collectStatistics, runPerfScript, disableHelperAutoExit */
 
-const { Gio, GLib, Meta, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const Main = imports.ui.main;

js/ui/search.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported SearchResultsView */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const IconGrid = imports.ui.iconGrid;

js/ui/searchController.js

@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported SearchController */
 
-const { Clutter, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Search = imports.ui.search;

js/ui/shellDBus.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported GnomeShell, ScreenSaverDBus */
 
-const { Gio, GLib, Meta, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const ExtensionDownloader = imports.ui.extensionDownloader;

js/ui/shellEntry.js

@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported addContextMenu CapsLockWarning */
 
-const { Clutter, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

js/ui/shellMountOperation.js

@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ShellMountOperation, GnomeShellMountOpHandler */
 
-const { Clutter, Gio, GLib, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const CheckBox = imports.ui.checkBox;

js/ui/slider.js

@@ -1,7 +1,9 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported Slider */
 
-const { Atk, Clutter, GObject } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
 
 const BarLevel = imports.ui.barLevel;
 

js/ui/status/accessibility.js

@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ATIndicator */
 
-const { Gio, GLib, GObject, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

js/ui/status/autoRotate.js

@@ -1,5 +1,7 @@
 /* exported Indicator */
-const {Gio, GObject} = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+
 
 const SystemActions = imports.misc.systemActions;
 

js/ui/status/backgroundApps.js

@@ -1,5 +1,10 @@
 /* exported Indicator */
-const {Clutter, Gio, GLib, GObject, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;

js/ui/status/bluetooth.js

@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Gio, GLib, GnomeBluetooth, GObject, Pango, St} = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GnomeBluetooth = imports.gi.GnomeBluetooth;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 const {Spinner} = imports.ui.animation;
 const PopupMenu = imports.ui.popupMenu;

js/ui/status/brightness.js

@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Gio, GObject} = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+
 
 const {QuickSlider, SystemIndicator} = imports.ui.quickSettings;