diff options
| author | Timothy Pearson <[email protected]> | 2012-04-26 14:44:25 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-03 03:27:14 +0200 |
| commit | 6db29f067a886035aa5f1c3d59c28b2917d3038d (patch) | |
| tree | 094d8fac77cf136894737a6c8d3c0b23b54834ca /kdesktop/lock/lockdlg.cc | |
| parent | 806153dfd6948a44d5a61e8c3fb6b6c21c00fe4a (diff) | |
| download | tdebase-6db29f067a886035aa5f1c3d59c28b2917d3038d.tar.gz tdebase-6db29f067a886035aa5f1c3d59c28b2917d3038d.zip | |
Fix a number of minor flaws in the lock dialog system
If SAK usage is enabled, override KDM theme
(cherry picked from commit e92e82b761f92754db582b5e98c0b3e788eba7d9)
Diffstat (limited to 'kdesktop/lock/lockdlg.cc')
| -rw-r--r-- | kdesktop/lock/lockdlg.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index b2d1fda55..5d35709b3 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -225,8 +225,15 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) DCOPRef kxkb("kxkb", "kxkb"); if( !kxkb.isNull() ) { - layoutsList = kxkb.call("getLayoutsList"); - TQString currentLayout = kxkb.call("getCurrentLayout"); + DCOPReply reply = kxkb.call("getLayoutsList"); + if (reply.isValid()) { + layoutsList = reply; + } + reply = kxkb.call("getCurrentLayout"); + TQString currentLayout; + if (reply.isValid()) { + reply.get(currentLayout); + } if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) { currLayout = layoutsList.find(currentLayout); if (currLayout == layoutsList.end()) |