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

global: Add session-mode property

Browse Source 
Add a session-mode property on ShellGlobal which corresponds to the
new --mode switch. Make the existing ShellGlobal:session-type property
readonly and base it on ShellGlobal:session-mode to avoid conflicts.

https://bugzilla.gnome.org/show_bug.cgi?id=676156
This commit is contained in:
Florian Müllner
2012-05-16 23:11:57 +02:00
parent 5617f91281
commit 940ddb104c
3 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -277,7 +277,6 @@ main (int argc, char **argv)
{
GOptionContext *ctx;
GError *error = NULL;
ShellSessionType session_type;
int ecode;
TpDebugSender *sender;
@ -331,14 +330,10 @@ main (int argc, char **argv)
g_log_set_default_handler (default_log_handler, sender);
/* Initialize the global object */
if (g_strcmp0 (session_mode, "gdm") == 0)
session_type = SHELL_SESSION_GDM;
else if (is_gdm_mode)
session_type = SHELL_SESSION_GDM;
else
session_type = SHELL_SESSION_USER;
if (session_mode == NULL)
session_mode = is_gdm_mode ? "gdm" : "user";
_shell_global_init ("session-type", session_type, NULL);
_shell_global_init ("session-mode", session_mode, NULL);
ecode = meta_run ();