cleanup: Use destructuring for imports from GI

This is *much* nicer than repetitive "imports.gi" lines ...

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/399

HACKING.md

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

js/extensionPrefs/main.js

@@ -1,10 +1,5 @@
 const Gettext = imports.gettext;
-const GLib = imports.gi.GLib;
+const { Gdk, GLib, Gio, GObject, Gtk, Pango } = imports.gi;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Gdk = imports.gi.Gdk;
-const Pango = imports.gi.Pango;
 const Format = imports.format;
 
 const _ = Gettext.gettext;

js/gdm/authPrompt.js

@@ -1,15 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Pango, Shell, St } = imports.gi;
-const Pango = imports.gi.Pango;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
 const Params = imports.misc.params;
-const Shell = imports.gi.Shell;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;

js/gdm/loginDialog.js

@@ -16,18 +16,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const AccountsService = imports.gi.AccountsService;
+const { AccountsService, Atk, Clutter, Gdm, Gio,
-const Atk = imports.gi.Atk;
+        GLib, GObject, Meta, Pango, Shell, St } = imports.gi;
-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 Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const AuthPrompt = imports.gdm.authPrompt;
 const Batch = imports.gdm.batch;

js/gdm/util.js

@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Signals = imports.signals;
 
 const Batch = imports.gdm.batch;

js/misc/fileUtils.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
+const { Gio, GLib } = imports.gi;
-const GLib = imports.gi.GLib;
 const Config = imports.misc.config;
 
 function collectFromDatadirs(subdir, includeUserDir, processFile) {

js/misc/ibusManager.js

@@ -1,11 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
+const { Gio, GLib, IBus } = imports.gi;
-const GLib = imports.gi.GLib;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
-const IBus = imports.gi.IBus;
 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
 
 // Ensure runtime version matches

js/misc/inputMethod.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const Clutter = imports.gi.Clutter;
+const { Clutter, GObject, IBus } = imports.gi;
-const GObject = imports.gi.GObject;
+
-const IBus = imports.gi.IBus;
 const Keyboard = imports.ui.status.keyboard;
 
 var InputMethod = GObject.registerClass(

js/misc/introspect.js

@@ -1,7 +1,4 @@
-const Gio = imports.gi.Gio;
+const { Gio, GLib, Meta, Shell } = imports.gi;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 
 const INTROSPECT_SCHEMA = 'org.gnome.shell';
 const INTROSPECT_KEY = 'introspect';

js/misc/keyboardManager.js

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

js/misc/loginManager.js

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

js/misc/modemManager.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
+const { Gio, NMA } = imports.gi;
-const NMA = imports.gi.NMA;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;

js/misc/objectManager.js

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

js/misc/systemActions.js

@@ -1,10 +1,4 @@
-const AccountsService = imports.gi.AccountsService;
+const { AccountsService, Clutter, Gdm, Gio, GLib, GObject, Meta } = imports.gi;
-const Clutter = imports.gi.Clutter;
-const Gdm = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
-const GObject = imports.gi.GObject;
 
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;

js/misc/util.js

@@ -1,14 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

js/misc/weather.js

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

js/perf/hwtest.js

@@ -1,9 +1,6 @@
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, Gtk, Shell } = imports.gi;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
-const Shell = imports.gi.Shell;
 
 let METRICS = {
     timeToDesktop:

js/portalHelper/main.js

@@ -1,12 +1,6 @@
 const Format = imports.format;
 const Gettext = imports.gettext;
-const GLib = imports.gi.GLib;
+const { Gio, GLib, GObject, Gtk, Pango, Soup, WebKit2: WebKit } = imports.gi;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Pango = imports.gi.Pango;
-const Soup = imports.gi.Soup;
-const WebKit = imports.gi.WebKit2;
 
 const _ = Gettext.gettext;
 

js/ui/accessDialog.js

@@ -1,7 +1,4 @@
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, Shell } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;

js/ui/altTab.js

@@ -1,14 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;

js/ui/animation.js

@@ -1,9 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
+const { GLib, Gio, St } = imports.gi;
-const Gio = imports.gi.Gio;
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;
 
 const Tweener = imports.ui.tweener;
 

js/ui/appDisplay.js

@@ -1,13 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
 const Mainloop = imports.mainloop;
 
 const AppFavorites = imports.ui.appFavorites;

js/ui/audioDeviceSelection.js

@@ -1,9 +1,4 @@
-const Clutter = imports.gi.Clutter;
+const { Clutter, 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 Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;

js/ui/background.js

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

js/ui/backgroundMenu.js

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

js/ui/barLevel.js

@@ -1,8 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Atk = imports.gi.Atk;
+const { Atk, Clutter, St } = imports.gi;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
 const Signals = imports.signals;
 
 var BarLevel = class {

js/ui/boxpointer.js

@@ -1,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GObject, Meta, Shell, St } = imports.gi;
-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 Tweener = imports.ui.tweener;

js/ui/calendar.js

@@ -1,11 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const St = imports.gi.St;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;

js/ui/checkBox.js

@@ -1,6 +1,4 @@
-const Clutter = imports.gi.Clutter;
+const { Clutter, Pango, St } = imports.gi;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
 
 var CheckBox = class CheckBox {
     constructor(label) {

js/ui/closeDialog.js

@@ -1,11 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, Meta, Shell } = imports.gi;
-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 Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

js/ui/components/automountManager.js

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

js/ui/components/autorunManager.js

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

js/ui/components/keyring.js

@@ -1,12 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Shell = imports.gi.Shell;
+const { Clutter, Gcr, Gio, GObject, Pango, Shell, St } = imports.gi;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Pango = imports.gi.Pango;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Gcr = imports.gi.Gcr;
 
 const Animation = imports.ui.animation;
 const Dialog = imports.ui.dialog;

js/ui/components/networkAgent.js

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

js/ui/components/polkitAgent.js

@@ -1,15 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const { AccountsService, Clutter, Gio, GLib,
+        Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const AccountsService = imports.gi.AccountsService;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Pango = imports.gi.Pango;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Polkit = imports.gi.Polkit;
-const PolkitAgent = imports.gi.PolkitAgent;
 
 const Animation = imports.ui.animation;
 const Dialog = imports.ui.dialog;

js/ui/components/telepathyClient.js

@@ -1,18 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;
 
 var Tpl = null;
 var Tp = null;
 try {
-    Tpl = imports.gi.TelepathyLogger;
+    ({ TelepathyGLib: Tp, TelepathyLogger: Tpl } = imports.gi);
-    Tp = imports.gi.TelepathyGLib;
 } catch(e) {
     log('Telepathy is not available, chat integration will be disabled.');
 }

js/ui/ctrlAltTab.js

@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Meta, Shell, St } = imports.gi;
-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,13 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Signals = imports.signals;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 const Mainloop = imports.mainloop;
+const Signals = imports.signals;
 
 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;

js/ui/dateMenu.js

@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
+const { Clutter, GLib, GnomeDesktop,
-const GnomeDesktop = imports.gi.GnomeDesktop;
+        GObject, GWeather, Shell, St } = imports.gi;
-const GObject = imports.gi.GObject;
-const GWeather = imports.gi.GWeather;
-const Clutter = imports.gi.Clutter;
-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,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GObject, Pango, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
 
 var Dialog = GObject.registerClass(
 class Dialog extends St.Widget {

js/ui/dnd.js

@@ -1,15 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, Meta, Shell, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const St = imports.gi.St;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const Tweener = imports.ui.tweener;
-const Main = imports.ui.main;
 
+const Main = imports.ui.main;
 const Params = imports.misc.params;
+const Tweener = imports.ui.tweener;
 
 // Time to scale down to maxDragActorSize
 var SCALE_ANIMATION_TIME = 0.25;

js/ui/edgeDragAction.js

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

js/ui/endSessionDialog.js

@@ -18,14 +18,8 @@
 
 const Mainloop = imports.mainloop;
 
-const AccountsService = imports.gi.AccountsService;
+const { AccountsService, Clutter, Gio,
-const Clutter = imports.gi.Clutter;
+        GLib, Pango, Polkit, Shell, St }  = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Pango = imports.gi.Pango;
-const Polkit = imports.gi.Polkit;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;

js/ui/environment.js

@@ -9,11 +9,8 @@ imports.gi.versions.Gtk = '3.0';
 imports.gi.versions.TelepathyGLib = '0.12';
 imports.gi.versions.TelepathyLogger = '0.2';
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 // We can't import shell JS modules yet, because they may have
 // variable initializations, etc, that depend on init() already having

js/ui/extensionDownloader.js

@@ -1,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, Soup, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Soup = imports.gi.Soup;
-const St = imports.gi.St;
 
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;

js/ui/extensionSystem.js

@@ -1,10 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const { Gio, St } = imports.gi;
 const Signals = imports.signals;
 
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
-
 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 

js/ui/grabHelper.js

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

js/ui/ibusCandidatePopup.js

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

js/ui/iconGrid.js

@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GObject, Meta, St } = imports.gi;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
 
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;

js/ui/inhibitShortcutsDialog.js

@@ -1,9 +1,4 @@
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GObject, Gtk, Meta, Shell } = imports.gi;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

js/ui/kbdA11yDialog.js

@@ -1,6 +1,5 @@
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GObject } = imports.gi;
-const Gio = imports.gi.Gio;
+
-const GObject = imports.gi.GObject;
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
 

js/ui/keyboard.js

@@ -1,14 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, Meta, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
 const Signals = imports.signals;
-const St = imports.gi.St;
-const InputSourceManager = imports.ui.status.keyboard;
 
+const InputSourceManager = imports.ui.status.keyboard;
 const IBusManager = imports.misc.ibusManager;
 const BoxPointer = imports.ui.boxpointer;
 const Layout = imports.ui.layout;

js/ui/layout.js

@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Background = imports.ui.background;
 const BackgroundMenu = imports.ui.backgroundMenu;

js/ui/lightbox.js

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

js/ui/lookingGlass.js

@@ -1,16 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Cogl, Gio, GLib,
-const Cogl = imports.gi.Cogl;
+        GObject, Meta, Pango, Shell, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const Mainloop = imports.mainloop;
+const Signals = imports.signals;
 const System = imports.system;
 
 const History = imports.misc.history;
@@ -24,15 +17,9 @@ const JsParse = imports.misc.jsParse;
 const CHEVRON = '>>> ';
 
 /* Imports...feel free to add here as needed */
-var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
+var commandHeader = 'const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell } = imports.gi; ' +
-                    'const GLib = imports.gi.GLib; ' +
-                    'const GObject = imports.gi.GObject; ' +
-                    'const Gio = imports.gi.Gio; ' +
-                    'const Gtk = imports.gi.Gtk; ' +
-                    'const Mainloop = imports.mainloop; ' +
-                    'const Meta = imports.gi.Meta; ' +
-                    'const Shell = imports.gi.Shell; ' +
                     'const Main = imports.ui.main; ' +
+                    'const Mainloop = imports.mainloop; ' +
                     'const Tweener = imports.ui.tweener; ' +
                     /* Utility functions...we should probably be able to use these
                      * in the shell core code too. */

js/ui/magnifier.js

@@ -1,16 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Atspi = imports.gi.Atspi;
+const { Atspi, Clutter, Cogl, GDesktopEnums,
-const Clutter = imports.gi.Clutter;
+        Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
-const Cogl = imports.gi.Cogl;
-const GDesktopEnums = imports.gi.GDesktopEnums;
-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 Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 
 const Background = imports.ui.background;

js/ui/main.js

@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Mainloop = imports.mainloop;
-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,14 +1,7 @@
-const Atk = imports.gi.Atk;
+const { Atk, Clutter, Gio, GLib, GObject, Meta, Pango, St } = imports.gi;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const Tweener = imports.ui.tweener;

js/ui/messageTray.js

@@ -1,14 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const GnomeSession = imports.misc.gnomeSession;

js/ui/modalDialog.js

@@ -1,17 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Atk, Clutter, Shell, St } = imports.gi;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const Atk = imports.gi.Atk;
-
-const Params = imports.misc.params;
 
 const Dialog = imports.ui.dialog;
 const Layout = imports.ui.layout;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
+const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
 var OPEN_AND_CLOSE_TIME = 0.1;

js/ui/mpris.js

@@ -1,7 +1,5 @@
-const Gio = imports.gi.Gio;
+const { Gio, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const Main = imports.ui.main;

js/ui/notificationDaemon.js

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

js/ui/osdMonitorLabeler.js

@@ -1,11 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, Meta, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
 
 const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
 
 var FADE_TIME = 0.1;
 

js/ui/osdWindow.js

@@ -1,16 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, GObject, Meta, St } = imports.gi;
-const GLib = imports.gi.GLib;
+const Mainloop = imports.mainloop;
-const GObject = imports.gi.GObject;
-const St = imports.gi.St;
 
 const BarLevel = imports.ui.barLevel;
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
-const Mainloop = imports.mainloop;
 const Tweener = imports.ui.tweener;
-const Meta = imports.gi.Meta;
 
 var HIDE_TIMEOUT = 1500;
 var FADE_TIME = 0.1;

js/ui/overview.js

@@ -1,12 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, Meta, Shell, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;

js/ui/overviewControls.js

@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GObject = imports.gi.GObject;
+const { Clutter, GObject, Meta, St } = imports.gi;
-const Clutter = imports.gi.Clutter;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
 
 const Dash = imports.ui.dash;
 const Main = imports.ui.main;

js/ui/padOsd.js

@@ -1,15 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Meta = imports.gi.Meta;
+const { Atk, Clutter, GDesktopEnums, Gio,
-const Clutter = imports.gi.Clutter;
+        GLib, GObject, Gtk, Meta, Rsvg, St } = imports.gi;
-const St = imports.gi.St;
-const Rsvg = imports.gi.Rsvg;
-const GObject = imports.gi.GObject;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Gio = imports.gi.Gio;
-const GDesktopEnums = imports.gi.GDesktopEnums;
-const Atk = imports.gi.Atk;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

js/ui/pageIndicators.js

@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GObject, St } = imports.gi;
-const GObject = imports.gi.GObject;
-const St = imports.gi.St;
 
 const Tweener = imports.ui.tweener;
 const { ANIMATION_TIME_OUT, ANIMATION_MAX_DELAY_OUT_FOR_ITEM, AnimationDirection } = imports.ui.iconGrid;

js/ui/panel.js

@@ -1,16 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const { Atk, Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
 const Cairo = imports.cairo;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const Animation = imports.ui.animation;
 const Config = imports.misc.config;

js/ui/panelMenu.js

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

js/ui/pointerWatcher.js

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

js/ui/popupMenu.js

@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Atk, Clutter, Gio, GObject, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const BoxPointer = imports.ui.boxpointer;
 const GrabHelper = imports.ui.grabHelper;

js/ui/remoteSearch.js

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

js/ui/runDialog.js

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

js/ui/screenShield.js

@@ -1,18 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const AccountsService = imports.gi.AccountsService;
+const { AccountsService, Clutter, Cogl, Gio, GLib,
+        GnomeDesktop, GObject, Meta, Shell, St } = imports.gi;
 const Cairo = imports.cairo;
-const Cogl = imports.gi.Cogl;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
-const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 const TweenerEquations = imports.tweener.equations;
 
 const Background = imports.ui.background;

js/ui/screencast.js

@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
+const { Gio, GLib, Shell } = imports.gi;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

js/ui/screenshot.js

@@ -1,13 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, Gtk, Meta, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const GrabHelper = imports.ui.grabHelper;
 const Lightbox = imports.ui.lightbox;

js/ui/scripting.js

@@ -1,10 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
+const { Gio, GLib, Meta, Shell } = imports.gi;
-const GLib = imports.gi.GLib;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

js/ui/search.js

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

js/ui/shellDBus.js

@@ -1,10 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
+const { Gio, GLib, Meta, Shell } = imports.gi;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const ExtensionSystem = imports.ui.extensionSystem;

js/ui/shellEntry.js

@@ -1,13 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Shell, St } = imports.gi;
-const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;
-const Shell = imports.gi.Shell;
 
 var EntryMenu = class extends PopupMenu.PopupMenu {
     constructor(entry) {

js/ui/shellMountOperation.js

@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;

js/ui/slider.js

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

js/ui/status/accessibility.js

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

js/ui/status/bluetooth.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
+const { Gio, GnomeBluetooth } = imports.gi;
-const GnomeBluetooth = imports.gi.GnomeBluetooth;
 
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;

js/ui/status/brightness.js

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

js/ui/status/keyboard.js

@@ -1,15 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, IBus, Meta, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const IBus = imports.gi.IBus;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
 const Gettext = imports.gettext;
+const Signals = imports.signals;
 
 const IBusManager = imports.misc.ibusManager;
 const KeyboardManager = imports.misc.keyboardManager;

js/ui/status/location.js

@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, Shell } = imports.gi;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
@@ -10,7 +8,6 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ModalDialog = imports.ui.modalDialog;
 const PermissionStore = imports.misc.permissionStore;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;

js/ui/status/network.js

@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, NM, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
 const Mainloop = imports.mainloop;
-const NM = imports.gi.NM;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const Main = imports.ui.main;

js/ui/status/power.js

@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
+const { Clutter, Gio, St, UPowerGlib: UPower } = imports.gi;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const UPower = imports.gi.UPowerGlib;
 
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;

js/ui/status/system.js

@@ -1,12 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const AccountsService = imports.gi.AccountsService;
+const { AccountsService, Clutter, Gio, GLib, GObject, Shell, St } = 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 GObject = imports.gi.GObject;
 
 const BoxPointer = imports.ui.boxpointer;
 const SystemActions = imports.misc.systemActions;

js/ui/status/thunderbolt.js

@@ -2,10 +2,7 @@
 
 // the following is a modified version of bolt/contrib/js/client.js
 
-const Gio = imports.gi.Gio;
+const { Gio, GLib, Polkit, Shell } = imports.gi;
-const GLib = imports.gi.GLib;
-const Polkit = imports.gi.Polkit;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

js/ui/status/volume.js

@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, Gvc, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const Gvc = imports.gi.Gvc;
-const St = imports.gi.St;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;

js/ui/switchMonitor.js

@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GObject, Meta, St } = imports.gi;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
 
 const SwitcherPopup = imports.ui.switcherPopup;
 

js/ui/switcherPopup.js

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

js/ui/tweener.js

@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, Shell, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 const Signals = imports.signals;
 const Tweener = imports.tweener.tweener;
 

js/ui/unlockDialog.js

@@ -1,15 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const AccountsService = imports.gi.AccountsService;
+const { AccountsService, Atk, Clutter,
-const Atk = imports.gi.Atk;
+        Gdm, Gio, GLib, Meta, Shell, St } = imports.gi;
-const Clutter = imports.gi.Clutter;
-const Gdm  = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;

js/ui/userWidget.js

@@ -2,10 +2,7 @@
 //
 // A widget showing the user avatar and name
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GLib, GObject, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const St = imports.gi.St;
 
 const Params = imports.misc.params;
 

js/ui/viewSelector.js

@@ -1,12 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GObject, Meta, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const Meta = imports.gi.Meta;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const GObject = imports.gi.GObject;
 
 const AppDisplay = imports.ui.appDisplay;
 const Main = imports.ui.main;

js/ui/windowManager.js

@@ -1,13 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const AltTab = imports.ui.altTab;