diff options
| author | Timothy Pearson <[email protected]> | 2013-04-25 08:34:19 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-04-25 08:34:19 -0500 |
| commit | 704eedf364cefe87cf5c63cb61a3c6051a37a585 (patch) | |
| tree | ee1ba694ad783a3a4ab4fadbb831a2e98c8e3f73 /tdm/kfrontend | |
| parent | 33dc3f2d3960e4a7e5d51b00a6e511a7e326d36f (diff) | |
| parent | 1c7bdfda1e7c768525a73d1ca104db53ff1cec10 (diff) | |
| download | tdebase-704eedf364cefe87cf5c63cb61a3c6051a37a585.tar.gz tdebase-704eedf364cefe87cf5c63cb61a3c6051a37a585.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'tdm/kfrontend')
| -rw-r--r-- | tdm/kfrontend/kgreeter.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index bffcc5d6d..0d89b065c 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -663,10 +663,12 @@ void // private KGreeter::setPrevWM( int wm ) { if (curPrev != wm) { - if (curPrev != -1) + if (curPrev != -1) { sessMenu->changeItem( curPrev, sessionTypes[curPrev].name ); - if (wm != -1) + } + if (wm != -1) { sessMenu->changeItem( wm, sessionTypes[wm].name + i18n(" (previous)") ); + } curPrev = wm; } } @@ -802,7 +804,6 @@ KGreeter::verifyOk() GSendInt( G_PutDmrc ); GSendStr( "Session" ); GSendStr( "default" ); - curWMSession = sessionTypes[curSel].type.utf8(); } GSendInt( G_Ready ); closingDown = true; @@ -812,8 +813,9 @@ KGreeter::verifyOk() void KGreeter::verifyFailed() { - if (needLoad) + if (needLoad) { slotLoadPrevWM(); + } } void |