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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Volker Krause <volker.krause () rwth-aachen ! de>
Date:       2006-10-09 16:56:49
Message-ID: 1160413009.962831.5562.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 593959 by vkrause:

Forward port SVN commit 593938 by vkrause:

Try harder to find an appropriate parent for the kwallet password
dialog.

Based on a suggestion of Lubos, should fix #133861 and might also help
with #131756.


 M  +8 -2      kmkernel.cpp  


--- trunk/KDE/kdepim/kmail/kmkernel.cpp #593958:593959
@@ -2141,9 +2141,15 @@
   if ( !Wallet::isEnabled() || walletOpenFailed )
     return 0;
 
+  // find an appropriate parent window for the wallet dialog
+  WId window = 0;
+  if ( qApp->activeWindow() )
+    window = qApp->activeWindow()->winId();
+  else if ( getKMMainWidget() )
+    window = getKMMainWidget()->topLevelWidget()->winId();
+
   delete mWallet;
-  mWallet = Wallet::openWallet( Wallet::NetworkWallet(),
-        getKMMainWidget() ? getKMMainWidget()->topLevelWidget()->winId() : 0 );
+  mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
 
   if ( !mWallet ) {
     walletOpenFailed = true;
[prev in list] [next in list] [prev in thread] [next in thread]