Arfrever Frehtes Taifersar Arahesis wrote on Thu, 29 May 2008 at 14:35 +0200:
> 2008-05-27 15:25:49 Stefan Sperling napisaƂ(a):
> > On Tue, May 27, 2008 at 03:15:27PM +0200, Arfrever Frehtes Taifersar Arahesis wrote:
> > > 2008-05-26 David Glasser <glasser_at_davidglasser.net>:
> > > > On Sat, May 24, 2008 at 10:07 AM, <arfrever_at_tigris.org> wrote:
> > > >> Author: arfrever
> > > >> Date: Sat May 24 10:07:45 2008
> > > >> New Revision: 31427
> > > >>
> > > >> Log:
> > > >> * subversion/libsvn_auth_kwallet/kwallet.cpp
> > > >> (kwallet_password_get, kwallet_password_set): Don't disconnect Subversion
> > > >> from KWallet because disconnection works incorrectly in KDE 4.0.4.
> > > >>
> > > >> Modified:
> > > >> trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
> > > >>
> > > >> Modified: trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
> > > >> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp?pathrev=31427&r1=31426&r2=31427
> > > >> ==============================================================================
> > > >> --- trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Sat May 24 09:27:55 2008 (r31426)
> > > >> +++ trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Sat May 24 10:07:45 2008 (r31427)
> > > >> @@ -104,8 +104,8 @@ kwallet_password_get(const char **passwo
> > > >> }
> > > >> }
> > > >> }
> > > >> - KWallet::Wallet::disconnectApplication(wallet_name,
> > > >> - QString::fromUtf8("Subversion"));
> > > >> +// KWallet::Wallet::disconnectApplication(wallet_name,
> > > >> +// QString::fromUtf8("Subversion"));
> > > >
> > > > Was this just a temporary tweak?
> > >
> > > Yes. I wait for https://bugs.kde.org/show_bug.cgi?id=162570.
> >
> > What about this patch, then, for the time being?
> >
> > Index: subversion/libsvn_auth_kwallet/kwallet.cpp
> > ===================================================================
> > --- subversion/libsvn_auth_kwallet/kwallet.cpp (revision 31465)
> > +++ subversion/libsvn_auth_kwallet/kwallet.cpp (working copy)
> > @@ -167,6 +167,9 @@
> > }
> > }
> > }
> > +// This function currently closes the wallet if no other application
> > +// is connected to the wallet. We're waiting for this to be fixed
> > +// upstream, see https://bugs.kde.org/show_bug.cgi?id=162570
> > // KWallet::Wallet::disconnectApplication(wallet_name,
> > // QString::fromUtf8("Subversion"));
> > return ret;
> >
>
> I propedited svn:log of r31427. I think that it is sufficient.
>
>
I agree with Stefan: the code should be self-contained. +1 to the
patch.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-29 19:50:41 CEST