tag 606949 + squeeze sid patch fixed-upstream forwarded 606949 https://bugs.kde.org/226270 thanks
This was already fixed in kde in r1151086 [1]. I tested it using the attached patch for the kdenetwork 4.4.5-2 package. It is quite irritating that I usually cannot enter my password in kwallet before kopete asks me directly for _all_ my instant messaging account related passwords. This makes kwallet in combination with kopete unusable for me. [1] http://websvn.kde.org/branches/KDE/4.5/kdenetwork/kopete/libkopete/kopetewalletmanager.cpp?r1=1143427&r2=1151086&pathrev=1151086&view=patch
diff -Nru kdenetwork-4.4.5/debian/changelog kdenetwork-4.4.5/debian/changelog --- kdenetwork-4.4.5/debian/changelog 2010-11-28 16:44:33.000000000 +0100 +++ kdenetwork-4.4.5/debian/changelog 2011-02-11 14:27:11.000000000 +0100 @@ -1,3 +1,10 @@ +kdenetwork (4:4.4.5-2kwallettimeout) squeeze-proposed-updates; urgency=low + + * debian/patches: + - Add 04_kwallettimeout.diff, Disable kwallet timeout for kopete + + -- Emil Langrock <emil.langr...@gmx.de> Fri, 11 Feb 2011 14:26:22 +0100 + kdenetwork (4:4.4.5-2) unstable; urgency=low * Point debian/control Vcs fields to the new Git repository. diff -Nru kdenetwork-4.4.5/debian/patches/04_kwallettimeout.diff kdenetwork-4.4.5/debian/patches/04_kwallettimeout.diff --- kdenetwork-4.4.5/debian/patches/04_kwallettimeout.diff 1970-01-01 01:00:00.000000000 +0100 +++ kdenetwork-4.4.5/debian/patches/04_kwallettimeout.diff 2011-02-11 14:25:44.000000000 +0100 @@ -0,0 +1,73 @@ +--- a/kopete/libkopete/kopetewalletmanager.cpp 2010/06/27 18:59:06 1143427 ++++ b/kopete/libkopete/kopetewalletmanager.cpp 2010/07/17 18:52:43 1151086 +@@ -25,8 +25,6 @@ + #include <qwidget.h> + #include <qapplication.h> + +-#define KWALLET_TIMEOUT 15000 +- + static WId mainWindowID() + { + if ( QWidget *w = Kopete::UI::Global::mainWidget() ) +@@ -37,7 +35,7 @@ + class Kopete::WalletManager::Private + { + public: +- Private() : wallet(0), signal(0), firstTry(true) {} ++ Private() : wallet(0), signal(0) {} + ~Private() { delete wallet; delete signal; } + + KWallet::Wallet *wallet; +@@ -50,16 +48,11 @@ + // instead, we store a KopeteWalletSignal which we connect to, and create + // a new one for each set of requests. + KopeteWalletSignal *signal; +- +- bool firstTry; +- QTimer timeoutTimer; + }; + + Kopete::WalletManager::WalletManager() + : d( new Private ) + { +- d->timeoutTimer.setSingleShot( true ); +- connect( &(d->timeoutTimer), SIGNAL(timeout()), this, SLOT(slotWalletChangedStatus()) ); + } + + Kopete::WalletManager::~WalletManager() +@@ -115,15 +108,12 @@ + return; + } + +- d->firstTry = true; +- d->timeoutTimer.start( KWALLET_TIMEOUT ); + connect( d->wallet, SIGNAL(walletOpened(bool)), SLOT(slotWalletChangedStatus()) ); + } + + void Kopete::WalletManager::slotWalletChangedStatus() + { + kDebug(14010) << " isOpen: " << d->wallet->isOpen(); +- d->timeoutTimer.stop(); + + if( d->wallet->isOpen() ) + { +@@ -149,18 +139,7 @@ + delete d->wallet; + d->wallet = 0; + +- if ( d->firstTry ) +- { +- // Try again if it's the first failure +- kDebug(14010) << "wallet open timeout"; +- openWalletInner(); +- d->firstTry = false; +- return; +- } +- else +- { +- kWarning(14010) << "wallet open error"; +- } ++ kWarning(14010) << "wallet open error"; + } + + emitWalletOpened( d->wallet ); diff -Nru kdenetwork-4.4.5/debian/patches/series kdenetwork-4.4.5/debian/patches/series --- kdenetwork-4.4.5/debian/patches/series 2010-11-28 14:38:27.000000000 +0100 +++ kdenetwork-4.4.5/debian/patches/series 2011-02-11 14:21:59.000000000 +0100 @@ -1,3 +1,4 @@ 01_backport_use_system_libktorrent.diff 02_debian_libktorrent_porting.diff 03_kopete_icq_login_fix.diff +04_kwallettimeout.diff