rpms/kdepim/devel kdepim-3.5.2-avscripts-typo.patch, NONE, 1.1 kdepim-3.5.2-crash-kde#125723.patch, NONE, 1.1 kdepim-3.5.2-crash-proko2.patch, NONE, 1.1 kdepim-3.5.2-kmail-crash-#126571.patch, NONE, 1.1 kdepim-3.5.2-kmail-encoding.patch, NONE, 1.1 kdepim.spec, 1.80, 1.81
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 4 12:47:01 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30549
Modified Files:
kdepim.spec
Added Files:
kdepim-3.5.2-avscripts-typo.patch
kdepim-3.5.2-crash-kde#125723.patch
kdepim-3.5.2-crash-proko2.patch
kdepim-3.5.2-kmail-crash-#126571.patch
kdepim-3.5.2-kmail-encoding.patch
Log Message:
- fix crash from proko2
- possibly fix crash while selecting mail in mail header view
- fix #122571, kmail doesn't remember "fallback character encoding" setting
- fix #126571, kmail crashes when pressing "Send again..." in drafts folder
- fix syntax error in /usr/bin/kmail_clamav.sh
kdepim-3.5.2-avscripts-typo.patch:
kmail_clamav.sh | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdepim-3.5.2-avscripts-typo.patch ---
--- kdepim-3.5.2/kmail/avscripts/kmail_clamav.sh.orig 2006-05-03 15:58:08.000000000 +0200
+++ kdepim-3.5.2/kmail/avscripts/kmail_clamav.sh 2006-05-03 15:58:28.000000000 +0200
@@ -35,7 +35,7 @@
cat > $TEMPFILE
# check for a running daemon
-if [ `ps -eo comm|grep clamd` = "clamd" ]; then
+if [ "`ps -eo comm|grep clamd`" = "clamd" ]; then
chmod a+r $TEMPFILE
CLAMCOMANDO="clamdscan --stdout --no-summary "
else
kdepim-3.5.2-crash-kde#125723.patch:
imapjob.cpp | 63 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 34 insertions(+), 29 deletions(-)
--- NEW FILE kdepim-3.5.2-crash-kde#125723.patch ---
--- kdepim-3.5.2/kmail/imapjob.cpp.orig 2006-05-03 14:05:40.000000000 +0200
+++ kdepim-3.5.2/kmail/imapjob.cpp 2006-05-03 14:12:27.000000000 +0200
@@ -97,11 +97,12 @@
// imap folder, use its account for keeping track of the job. Otherwise,
// this is a get job and the src folder is an imap one. Use its account
// then.
- KMAcctImap *account;
+ KMAcctImap *account = 0;
if (folder) {
account = folder->account();
} else {
- account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
+ if ( msg_parent && msg_parent->storage() )
+ account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
}
if ( !account ||
account->makeConnection() == ImapAccountBase::Error ) {
@@ -223,21 +224,23 @@
if ( mDestFolder )
{
KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
- if ( account && mJob ) {
- ImapAccountBase::JobIterator it = account->findJob( mJob );
- if ( it != account->jobsEnd() ) {
- if( (*it).progressItem ) {
- (*it).progressItem->setComplete();
- (*it).progressItem = 0;
- }
- if ( !(*it).msgList.isEmpty() ) {
- for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
- mit.current()->setTransferInProgress( false );
+ if ( account ) {
+ if ( mJob ) {
+ ImapAccountBase::JobIterator it = account->findJob( mJob );
+ if ( it != account->jobsEnd() ) {
+ if( (*it).progressItem ) {
+ (*it).progressItem->setComplete();
+ (*it).progressItem = 0;
+ }
+ if ( !(*it).msgList.isEmpty() ) {
+ for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
+ mit.current()->setTransferInProgress( false );
+ }
}
+ account->removeJob( mJob );
}
- account->removeJob( mJob );
+ account->mJobList.remove( this );
}
- account->mJobList.remove( this );
mDestFolder->close();
}
@@ -245,21 +248,23 @@
if (!mDestFolder || mDestFolder != mSrcFolder) {
if (! (mSrcFolder->folderType() == KMFolderTypeImap) ) return;
KMAcctImap *account = static_cast<KMFolderImap*>(mSrcFolder->storage())->account();
- if ( account && mJob ) {
- ImapAccountBase::JobIterator it = account->findJob( mJob );
- if ( it != account->jobsEnd() ) {
- if( (*it).progressItem ) {
- (*it).progressItem->setComplete();
- (*it).progressItem = 0;
- }
- if ( !(*it).msgList.isEmpty() ) {
- for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
- mit.current()->setTransferInProgress( false );
+ if ( account ) {
+ if ( mJob ) {
+ ImapAccountBase::JobIterator it = account->findJob( mJob );
+ if ( it != account->jobsEnd() ) {
+ if( (*it).progressItem ) {
+ (*it).progressItem->setComplete();
+ (*it).progressItem = 0;
+ }
+ if ( !(*it).msgList.isEmpty() ) {
+ for ( QPtrListIterator<KMMessage> mit( (*it).msgList ); mit.current(); ++mit )
+ mit.current()->setTransferInProgress( false );
+ }
}
+ account->removeJob( mJob ); // remove the associated kio job
}
- account->removeJob( mJob ); // remove the associated kio job
+ account->mJobList.remove( this ); // remove the folderjob
}
- account->mJobList.remove( this ); // remove the folderjob
}
mSrcFolder->close();
}
@@ -270,15 +275,15 @@
void ImapJob::slotGetNextMessage()
{
KMMessage *msg = mMsgList.first();
- KMFolderImap *msgParent = static_cast<KMFolderImap*>(msg->storage());
- KMAcctImap *account = msgParent->account();
- if ( msg->UID() == 0 )
+ KMFolderImap *msgParent = msg ? static_cast<KMFolderImap*>(msg->storage()) : 0;
+ if ( !msg || msg->UID() == 0 || !msgParent )
{
// broken message
emit messageRetrieved( 0 );
deleteLater();
return;
}
+ KMAcctImap *account = msgParent->account();
KURL url = account->getUrl();
QString path = msgParent->imapPath() + ";UID=" + QString::number(msg->UID());
ImapAccountBase::jobData jd;
kdepim-3.5.2-crash-proko2.patch:
kmfoldercachedimap.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE kdepim-3.5.2-crash-proko2.patch ---
--- kdepim-3.5.2/kmail/kmfoldercachedimap.cpp.crash 2006-05-03 12:24:50.000000000 +0200
+++ kdepim-3.5.2/kmail/kmfoldercachedimap.cpp 2006-05-03 12:25:41.000000000 +0200
@@ -539,8 +539,11 @@
mRecurse = recurse;
assert( account() );
- mAccount->mailCheckProgressItem()->reset();
- mAccount->mailCheckProgressItem()->setTotalItems( 100 );
+ ProgressItem *progressItem = mAccount->mailCheckProgressItem();
+ if ( progressItem ) {
+ progressItem->reset();
+ progressItem->setTotalItems( 100 );
+ }
mProgress = 0;
#if 0
kdepim-3.5.2-kmail-crash-#126571.patch:
kmmainwidget.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE kdepim-3.5.2-kmail-crash-#126571.patch ---
--- kdepim-3.5.2/kmail/kmmainwidget.cpp.orig 2006-05-03 15:20:00.000000000 +0200
+++ kdepim-3.5.2/kmail/kmmainwidget.cpp 2006-05-03 15:20:06.000000000 +0200
@@ -3001,9 +3019,9 @@
mSendAgainAction->setEnabled( single_actions &&
( mHeaders->currentMsg() && mHeaders->currentMsg()->isSent() )
- || ( mFolder && kmkernel->folderIsDraftOrOutbox( mFolder ) )
- || ( mFolder && kmkernel->folderIsSentMailFolder( mFolder ) )
- );
+ || ( mFolder && mHeaders->currentMsg() &&
+ ( kmkernel->folderIsDraftOrOutbox( mFolder )
+ || kmkernel->folderIsSentMailFolder( mFolder ) ) ) );
mSaveAsAction->setEnabled( mass_actions );
bool mails = mFolder && mFolder->count();
bool enable_goto_unread = mails
kdepim-3.5.2-kmail-encoding.patch:
configuredialog.cpp | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdepim-3.5.2-kmail-encoding.patch ---
--- kdepim-3.5.2/kmail/configuredialog.cpp.orig 2006-05-03 14:48:54.000000000 +0200
+++ kdepim-3.5.2/kmail/configuredialog.cpp 2006-05-03 14:49:21.000000000 +0200
@@ -2276,7 +2276,7 @@
const QString encoding = KGlobal::charsets()->encodingForName(*it);
if ( encoding == "iso-8859-15" )
indexOfLatin9 = i;
- if( false && encoding == currentEncoding )
+ if( encoding == currentEncoding )
{
mCharsetCombo->setCurrentItem( i );
found = true;
Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdepim.spec 3 May 2006 09:52:25 -0000 1.80
+++ kdepim.spec 4 May 2006 12:46:57 -0000 1.81
@@ -35,6 +35,11 @@
# upstream patches
Patch100: kdepim-3.5.2-crash-bz190491.patch
+Patch101: kdepim-3.5.2-crash-proko2.patch
+Patch102: kdepim-3.5.2-crash-kde#125723.patch
+Patch103: kdepim-3.5.2-kmail-encoding.patch
+Patch104: kdepim-3.5.2-kmail-crash-#126571.patch
+Patch105: kdepim-3.5.2-avscripts-typo.patch
Requires: kdebase >= %{kdebase_epoch}:%{version}
Requires(post,postun): /sbin/ldconfig
@@ -119,6 +124,11 @@
# upstream patches
%patch100 -p1 -b .crash-bz#190491
+%patch101 -p1 -b .proko2
+%patch102 -p1 -b .crash-kde#125723
+%patch103 -p1 -b .kmail-encoding
+%patch104 -p1 -b .kmail-crash-#126571
+%patch105 -p1 -b .avscripts-typo
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -210,6 +220,11 @@
%changelog
* Wed May 03 2006 Than Ngo <than at redhat.com> 6:3.5.2-2
- fix #190491, korganizer crashes whenever New Event selected
+- fix crash from proko2
+- possibly fix crash while selecting mail in mail header view
+- fix #122571, kmail doesn't remember "fallback character encoding" setting
+- fix #126571, kmail crashes when pressing "Send again..." in drafts folder
+- fix syntax error in /usr/bin/kmail_clamav.sh
* Wed Mar 29 2006 Than Ngo <than at redhat.com> 6:3.5.2-1
- update to 3.5.2
More information about the fedora-cvs-commits
mailing list