From 2141138a6f10f55afca05942a3908a3932ebd157 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 14 Jun 2013 09:03:05 -0400 Subject: [PATCH] gdm: move batch.js to misc/ batch.js has nothing to do with GDM, other than it's used by the login dialog. We eventually want to get rid of it entirely, but in the mean time move it to misc/ for clarity. --- js/Makefile.am | 2 +- js/gdm/loginDialog.js | 2 +- js/gdm/util.js | 2 +- js/{gdm => misc}/batch.js | 0 js/ui/unlockDialog.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename js/{gdm => misc}/batch.js (100%) diff --git a/js/Makefile.am b/js/Makefile.am index d4fbd86ef..87b95fd0b 100644 --- a/js/Makefile.am +++ b/js/Makefile.am @@ -17,13 +17,13 @@ misc/config.js: misc/config.js.in Makefile jsdir = $(pkgdatadir)/js nobase_dist_js_DATA = \ - gdm/batch.js \ gdm/fingerprint.js \ gdm/loginDialog.js \ gdm/powerMenu.js \ gdm/realmd.js \ gdm/util.js \ extensionPrefs/main.js \ + misc/batch.js \ misc/config.js \ misc/extensionUtils.js \ misc/fileUtils.js \ diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js index 84324300d..281f5573c 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js @@ -34,7 +34,7 @@ const Shell = imports.gi.Shell; const St = imports.gi.St; const Gdm = imports.gi.Gdm; -const Batch = imports.gdm.batch; +const Batch = imports.misc.batch; const Fprint = imports.gdm.fingerprint; const GdmUtil = imports.gdm.util; const Main = imports.ui.main; diff --git a/js/gdm/util.js b/js/gdm/util.js index 6075e660f..57aa5f4be 100644 --- a/js/gdm/util.js +++ b/js/gdm/util.js @@ -7,7 +7,7 @@ const Lang = imports.lang; const Mainloop = imports.mainloop; const Signals = imports.signals; -const Batch = imports.gdm.batch; +const Batch = imports.misc.batch; const Fprint = imports.gdm.fingerprint; const Main = imports.ui.main; const Params = imports.misc.params; diff --git a/js/gdm/batch.js b/js/misc/batch.js similarity index 100% rename from js/gdm/batch.js rename to js/misc/batch.js diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js index 2ce8b5b3f..563f6af4b 100644 --- a/js/ui/unlockDialog.js +++ b/js/ui/unlockDialog.js @@ -15,7 +15,7 @@ const ModalDialog = imports.ui.modalDialog; const ShellEntry = imports.ui.shellEntry; const UserWidget = imports.ui.userWidget; -const Batch = imports.gdm.batch; +const Batch = imports.misc.batch; const GdmUtil = imports.gdm.util; // The timeout before going back automatically to the lock screen (in seconds)