[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kwallet/client
From:       George Staikos <staikos () kde ! org>
Date:       2004-01-07 18:42:52
Message-ID: 20040107184252.99FB693B8 () office ! kde ! org
[Download RAW message or body]

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;


[prev in list] [next in list] [prev in thread] [next in thread]