From kde-commits  Tue Dec 30 23:02:35 2003
From: Daniel Molkentin <molkentin () kde ! org>
Date: Tue, 30 Dec 2003 23:02:35 +0000
To: kde-commits
Subject: kdelibs/kwallet/client
Message-Id: <20031230230235.D86E493FC () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=107282539115675

CVS commit by danimo: 

Fix kontact locking up when knode asks for a password. The #if was inserted
long ago as a compile fix, but it seems the callExt version seems to make more
trouble than it solves. George, can you shed some light into this?

CCMAIL:staikos@kde.org


  M +1 -8      kwallet.cc   1.42


--- kdelibs/kwallet/client/kwallet.cc  #1.41:1.42
@@ -169,11 +169,4 @@ 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));
@@ -181,5 +174,5 @@ Wallet *Wallet::openWallet(const QString
                 r = DCOPRef("kded", "kwalletd").call("open", name, uint(w));
         }
-#endif
+
         if (r.isValid()) {
                 int drc = -1;