diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-11-22 18:13:43 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-11-22 18:13:43 +0000 |
| commit | 32175c854d19de75b8a8fea4e99fda54dd52618a (patch) | |
| tree | 7f9b492e03d50b63431c8427342403187d583648 /kde-base/okteta | |
| parent | Version bump #293523 by Florian Manschwetus and update kerberos depends #2747... (diff) | |
| download | gentoo-2-32175c854d19de75b8a8fea4e99fda54dd52618a.tar.gz gentoo-2-32175c854d19de75b8a8fea4e99fda54dd52618a.tar.bz2 gentoo-2-32175c854d19de75b8a8fea4e99fda54dd52618a.zip | |
Fix patch to apply correctly.
(Portage version: 2.2_rc51/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/okteta')
| -rw-r--r-- | kde-base/okteta/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/okteta/files/4.3.3-detect_changes_correctly.patch | 28 |
2 files changed, 19 insertions, 15 deletions
diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog index 4b8f0df8ea9b..733289914c44 100644 --- a/kde-base/okteta/ChangeLog +++ b/kde-base/okteta/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/okteta # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.29 2009/11/22 15:59:24 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.30 2009/11/22 18:13:43 scarabeus Exp $ + + 22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> + files/4.3.3-detect_changes_correctly.patch: + Fix patch to apply correctly. *okteta-4.3.3-r1 (22 Nov 2009) diff --git a/kde-base/okteta/files/4.3.3-detect_changes_correctly.patch b/kde-base/okteta/files/4.3.3-detect_changes_correctly.patch index 6f27d817e3ab..ba4b572dab00 100644 --- a/kde-base/okteta/files/4.3.3-detect_changes_correctly.patch +++ b/kde-base/okteta/files/4.3.3-detect_changes_correctly.patch @@ -1,16 +1,16 @@ -Index: branches/KDE/4.3/kdeutils/okteta/program/libkakao/core/system/kdocumentsyncmanager.cpp +Index: branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp =================================================================== ---- branches/KDE/4.3/kdeutils/okteta/program/libkakao/core/system/kdocumentsyncmanager.cpp (revision 1046928) -+++ branches/KDE/4.3/kdeutils/okteta/program/libkakao/core/system/kdocumentsyncmanager.cpp (revision 1046929) -@@ -217,9 +217,9 @@ - if( synchronizer ) - { - AbstractSyncToRemoteJob *syncJob = synchronizer->startSyncToRemote(); -- const bool syncFailed = JobManager::executeJob( syncJob, mWidget ); -+ const bool isSynced = JobManager::executeJob( syncJob, mWidget ); +--- branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp (revision 1046918) ++++ branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp (revision 1046919) +@@ -263,9 +263,11 @@ + + void PieceTableByteArrayModel::Private::openGroupedChange( const QString &description ) + { ++ const bool isModifiedBefore = isModified(); + mBeforeGroupedChangeVersionIndex = mPieceTable.appliedChangesCount(); + mPieceTable.openGroupedChange( description ); + ++ if( ! isModifiedBefore ) emit p->modifiedChanged( true ); + emit p->headVersionChanged( mPieceTable.changesCount() ); + } -- canClose = !syncFailed; -+ canClose = isSynced; - } - else - canClose = setSynchronizer( document ); |