From kde-commits Wed Jan 07 18:42:52 2004 From: George Staikos Date: Wed, 07 Jan 2004 18:42:52 +0000 To: kde-commits Subject: kdelibs/kwallet/client Message-Id: <20040107184252.99FB693B8 () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=107350101114777 CVS commit by staikos: I guess I have to revert it myself. I think your problems lie elsewhere. This commit prevents konqueror from locking up when kwallet is accessed. M +8 -1 kwallet.cc 1.43 --- kdelibs/kwallet/client/kwallet.cc #1.42:1.43 @@ -169,4 +169,11 @@ Wallet *Wallet::openWallet(const QString DCOPReply r; +#if KDE_IS_VERSION(3,1,90) + if (isPath) { + r = DCOPRef("kded", "kwalletd").callExt("openPath", DCOPRef::UseEventLoop, -1, name, uint(w)); + } else { + r = DCOPRef("kded", "kwalletd").callExt("open", DCOPRef::UseEventLoop, -1, name, uint(w)); + } +#else if (isPath) { r = DCOPRef("kded", "kwalletd").call("openPath", name, uint(w)); @@ -174,5 +181,5 @@ Wallet *Wallet::openWallet(const QString r = DCOPRef("kded", "kwalletd").call("open", name, uint(w)); } - +#endif if (r.isValid()) { int drc = -1;