rpms/kdepim/devel kdepim-3.5.7-kde#146967.patch, NONE, 1.1 kdepim.spec, 1.136, 1.137
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Nov 6 16:15:50 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9467
Modified Files:
kdepim.spec
Added Files:
kdepim-3.5.7-kde#146967.patch
Log Message:
* Tue Nov 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5.20071013.ent
- compacting mbox shows empty folder (kde#146967, rh#352391)
kdepim-3.5.7-kde#146967.patch:
--- NEW FILE kdepim-3.5.7-kde#146967.patch ---
Index: kmheaders.cpp
===================================================================
--- kmail/kmheaders.cpp (revision 680162)
+++ kmail/kmheaders.cpp (working copy)
@@ -2418,6 +2418,15 @@ int KMHeaders::currentItemIndex()
//-----------------------------------------------------------------------------
void KMHeaders::setCurrentItemByIndex(int msgIdx)
{
+ kdDebug(5006) << k_funcinfo << "idx=" << msgIdx << " size=" << mItems.size()
+ << " isopen=" << mFolder->isOpened() << endl;
+ if (!mFolder->isOpened())
+ {
+ setFolder(mFolder);
+ kdDebug(5006) << " needed setFolder(), size=" << mItems.size()
+ << " isopen=" << mFolder->isOpened() << endl;
+ }
+
if ((msgIdx >= 0) && (msgIdx < (int)mItems.size())) {
clearSelection();
bool unchanged = (currentItem() == mItems[msgIdx]);
@@ -2426,6 +2435,7 @@ void KMHeaders::setCurrentItemByIndex(in
setSelectionAnchor( currentItem() );
if (unchanged)
highlightMessage( mItems[msgIdx], false);
+ makeHeaderVisible();
}
}
@@ -2928,6 +2938,13 @@ SortCacheItem* KMHeaders::findParentBySu
bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
{
+ if (!mFolder->isOpened())
+ {
+ mFolder->open("kmheaders");
+ kdDebug(5006) << "needed reopen, isopen=" << mFolder->isOpened()
+ << " count=" << mFolder->count() << endl;
+ }
+
//all cases
Q_INT32 column, ascending, threaded, discovered_count, sorted_count, appended;
Q_INT32 deleted_count = 0;
Index: compactionjob.cpp
===================================================================
--- kmail/compactionjob.cpp (revision 680162)
+++ kmail/compactionjob.cpp (working copy)
@@ -65,7 +65,7 @@ void MboxCompactionJob::kill()
Q_ASSERT( mCancellable );
// We must close the folder if we opened it and got interrupted
if ( mFolderOpen && mSrcFolder && mSrcFolder->storage() )
- mSrcFolder->storage()->close("mboxcompactjob");
+ mSrcFolder->storage()->close("mboxcompact");
if ( mTmpFile )
fclose( mTmpFile );
@@ -124,7 +124,7 @@ int MboxCompactionJob::executeNow( bool
return errno;
}
mOpeningFolder = true; // Ignore open-notifications while opening the folder
- storage->open("mboxcompactjob");
+ storage->open("mboxcompact");
mOpeningFolder = false;
mFolderOpen = true;
mOffset = 0;
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- kdepim.spec 26 Oct 2007 14:37:54 -0000 1.136
+++ kdepim.spec 6 Nov 2007 16:15:11 -0000 1.137
@@ -30,9 +30,9 @@
%if 0%{?ent_date} > 0
Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
-Release: 4.svn%{ent_date}.ent%{?dist}
+Release: 5.svn%{ent_date}.ent%{?dist}
%else
-Release: 4%{?dist}
+Release: 5%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
%endif
Source1: cr48-app-kandy.png
@@ -42,6 +42,10 @@
Patch1: kdepim-3.4.0-kandy-icons.patch
Patch2: kdepim-xdg_open.patch
+## upstream patches
+# http://bugs.kde.org/146967 , http://bugzilla.redhat.com/352391
+Patch200: kdepim-3.5.7-kde#146967.patch
+
Provides: kdepim3 = %{version}-%{release}
%if 0%{?libs}
@@ -144,6 +148,8 @@
%patch2 -p1 -b .xdg_open
+%patch200 -p0 -b .kde#146967
+
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
@@ -266,6 +272,9 @@
%changelog
+* Tue Nov 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5.20071013.ent
+- compacting mbox shows empty folder (kde#146967, rh#352391)
+
* Wed Oct 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4.20071013.ent
- -libs: Obsoletes: %%name ... to help out multilib upgrades
More information about the fedora-extras-commits
mailing list