diff options
author | Timothy Pearson <[email protected]> | 2012-04-26 14:44:25 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-04-26 14:44:25 -0500 |
commit | e92e82b761f92754db582b5e98c0b3e788eba7d9 (patch) | |
tree | 2d433106b37e7de14c90d87a84c45c9b81a9ab96 /kdesktop/lock/lockdlg.cc | |
parent | 9187194ce10d7f7297404d0108976960fe463c26 (diff) | |
download | tdebase-e92e82b761f92754db582b5e98c0b3e788eba7d9.tar.gz tdebase-e92e82b761f92754db582b5e98c0b3e788eba7d9.zip |
Fix a number of minor flaws in the lock dialog system
If SAK usage is enabled, override TDM theme
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 1ae046520..6081ea0f8 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()) |