[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kdm/kfrontend
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2005-03-09 13:34:17
Message-ID: 20050309133417.6635E10B25 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

My .profile has 'set show-all-if-ambiguous on' at its end, and sourcing
it apparently changes $1, so save $1 at the beginning of Xsession.


  M +5 -3      genkdmconf.c   1.106


--- kdebase/kdm/kfrontend/genkdmconf.c  #1.105:1.106
@@ -610,4 +610,6 @@ static const char def_session[] =
 "# Xsession - run as user\n"
 "\n"
+"session=$1\n"
+"\n"
 "# Note that the respective logout scripts are not sourced.\n"
 "case $SHELL in\n"
@@ -649,5 +651,5 @@ static const char def_session[] =
 "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
 "\n"
-"case $1 in\n"
+"case $session in\n"
 "  \"\")\n"
 "    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no \
valid session.\"\n" @@ -663,8 +665,8 @@ static const char def_session[] =
 "    ;;\n"
 "  *)\n"
-"    eval exec \"$1\"\n"
+"    eval exec \"$session\"\n"
 "    ;;\n"
 "esac\n"
-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check \
$DESKTOP_SESSION.desktop.\"\n"; +"exec xmessage -center -buttons OK:0 -default OK \
\"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";  
 static const char def_background[] =


[prev in list] [next in list] [prev in thread] [next in thread]