From 0258c7a51843538fe2634b1a3e62e9f5e5e86c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 11 Sep 2014 14:55:07 +0100 Subject: [PATCH] endSessionDialog: Use DialogType constants instead of magic numbers --- js/ui/endSessionDialog.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js index 7222f6eeb..94ff4a35a 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js @@ -134,11 +134,18 @@ const restartInstallDialogContent = { showOtherSessions: true, }; +const DialogType = { + LOGOUT: 0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */, + SHUTDOWN: 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */, + RESTART: 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */, + UPDATE_RESTART: 3 +}; + const DialogContent = { - 0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */: logoutDialogContent, - 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */: shutdownDialogContent, - 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */: restartDialogContent, - 3: restartInstallDialogContent + DialogType.LOGOUT: logoutDialogContent, + DialogType.SHUTDOWN: shutdownDialogContent, + DialogType.RESTART: restartDialogContent, + DialogType.UPDATE_RESTART: restartInstallDialogContent }; const MAX_USERS_IN_SESSION_DIALOG = 5; @@ -677,8 +684,9 @@ const EndSessionDialog = new Lang.Class({ this._totalSecondsToStayOpen = totalSecondsToStayOpen; this._type = type; - if (this._type == 2 && this._updatesFile.query_exists(null)) - this._type = 3; + if (this._type == DialogType.RESTART && + this._updatesFile.query_exists(null)) + this._type = DialogType.UPDATE_RESTART; this._applications = []; this._applicationList.destroy_all_children();