isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "main: Make sure that --mode parameter is valid"

Browse Source 
This reverts commit a7a46bbe1cac8d3512679637cd75e53e9e98c121.

Conflicts:

	js/ui/sessionMode.js
This commit is contained in:
Florian Müllner 2012-05-24 19:33:25 +02:00
parent 7ed9516884
commit a277569d31
4 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/sessionMode.js
View File

@ -75,11 +75,6 @@ const _modes = {
} }
}; };
function modeExists(mode) {
let modes = Object.getOwnPropertyNames(_modes);
return modes.indexOf(mode) != -1;
}
function listModes() { function listModes() {
let modes = Object.getOwnPropertyNames(_modes); let modes = Object.getOwnPropertyNames(_modes);
for (let i = 0; i < modes.length; i++) for (let i = 0; i < modes.length; i++)

6
src/main.c
View File

@ -393,12 +393,6 @@ main (int argc, char **argv)
_shell_global_init ("session-mode", session_mode, NULL); _shell_global_init ("session-mode", session_mode, NULL);
if (!_shell_global_has_valid_session_mode (shell_global_get ()))
{
g_printerr ("\"%s\" is not a valid mode.\n", session_mode);
exit(1);
}
ecode = meta_run (); ecode = meta_run ();
if (g_getenv ("GNOME_SHELL_ENABLE_CLEANUP")) if (g_getenv ("GNOME_SHELL_ENABLE_CLEANUP"))

1
src/shell-global-private.h
View File

@ -13,7 +13,6 @@ void _shell_global_set_plugin (ShellGlobal *global,
GjsContext *_shell_global_get_gjs_context (ShellGlobal *global); GjsContext *_shell_global_get_gjs_context (ShellGlobal *global);
gboolean _shell_global_has_valid_session_mode (ShellGlobal *global);
gboolean _shell_global_check_xdnd_event (ShellGlobal *global, gboolean _shell_global_check_xdnd_event (ShellGlobal *global,
XEvent *xev); XEvent *xev);

15
src/shell-global.c
View File

@ -585,21 +585,6 @@ shell_global_set_stage_input_mode (ShellGlobal *global,
} }
} }
gboolean
_shell_global_has_valid_session_mode (ShellGlobal *global)
{
char *script;
int status;
script = g_strdup_printf ("imports.ui.environment.init();"
"imports.ui.sessionMode.modeExists('%s') || 1;",
global->session_mode);
gjs_context_eval (global->js_context, script, -1, "<sessionMode.js>", &status, NULL);
g_free (script);
return status == 0;
}
/** /**
* shell_global_set_cursor: * shell_global_set_cursor:
* @global: A #ShellGlobal * @global: A #ShellGlobal