From 36a44bbf0042cdd1aac7d970dd117422b86297a2 Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 9 Mar 2004 12:13:45 +0000 Subject: Update to KDE 3.2.1. Changes: KAlarm: Fix freeze at login KAlarm: Fix alarms being missed at login KAlarm: Fix memory leaks KAlarm: Fix errors saving the expired alarms calendar KAlarm: Fix scheduleCommand() and scheduleEmail() DCOP handling KAlarm: Prevent email alarms from being sent if no 'From' address is configured KAlarm: Omit 'Bcc' when sending email alarms if no 'Bcc' address is configured KAlarm: Sound file chooser dialog now shows all audio file types KMail: Don't save messages to disk with world-readable permissions set by default. KMail: Fix bug #69418 (filters don't work anymore as in 3.1.4) KMail: Fix bug #73307 (Expire on exit does not work if confirmation is enabled) KMail: Fix 'Copy Link Location' in a detached reader. KMail: Fix bug #73310 (sending a new mail while forgetting the receiver and/or the subject the composing window is minimized and hidden) KMail: Fix bug #73602 (Message body lines starting with "From " are incorrectly parsed as message seperator in mbox folders) KMail: Fix bug #72808 (reply to myself is broken / empty To: address field) KMail: Fix bug #62919 (reply all should not use From when ReplyTo is set (except for mailing list messages)) KMail: If one uses reply-all for replying to a message from oneself then now the first other recipient is added to To:; previously To: was empty because the own address (which was the sender address) is removed from the list of recipients and all other recipients were listed in the Cc: header. KMail: Fix bug #73527 (filter-Window is switch in the background when "rename filter"-Dialog appears. (just within Kontact)) KMail: Correct the sizes shown in the message structure viewer for IMAP messages. KMail: Fix critical bug #71866 (conversion of pop filter settings dangerous) KMail: Fix critical bug which caused whole IMAP folders to be deleted when messages were filtered through spamc or other external applications. KMail: Fix a crash during startup with invalid IMAP folders. KMail: Fix bug #74272 (Cannot subscribe to cyrus imap "sharedprefix" folders) KMail: Don't activate reader window on kmail --check. KMail: Fix saving of multipart/signed message parts inside multipart/mixed message parts. KMail: Don't disable sign/encrypt if we're using S/MIME and no OpenPGP key has been specified for this identity. KMail: Fix bug #74591 (kmail crashes after retrieving imap folders) KMail: Fix bug #74380 (Change of the account symbolic name caused loss of the sent and drafts folders) KMail: Fix bug #70558 (IDN domains are shown ACE-encoded in the statusbar) KMail: Fix problems with changed sort order after arrival of new mail or closing config dialog. KMail: Fix bug #75024 (search for or also returns read emails) KMail: Fix bug #70459 (Keyboard shortcuts for Forward, etc. don't work in Kontact after another component has been selected) KMail: Fix signature creation time validation. Visible bug was that for signatures made in January, the printing of the creation time was suppressed. KMail: Fix passive popup placement and taskbar flashing of new mail notification in Kontact KMail: Fix bug #75983 (moved IMAP messages lose attachments) KNode: Prevent unnecessary wallet openings when closing KNode --- misc/kdepim3/Makefile | 3 +-- misc/kdepim3/distinfo | 8 +++----- misc/kdepim3/patches/patch-aa | 46 ------------------------------------------- misc/kdepim3/patches/patch-ab | 35 -------------------------------- 4 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 misc/kdepim3/patches/patch-aa delete mode 100644 misc/kdepim3/patches/patch-ab (limited to 'misc/kdepim3') diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index 103a85a11a1..e6adf780fc4 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2004/03/08 19:40:41 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2004/03/09 12:13:45 markd Exp $ DISTNAME= kdepim-${_KDE_VERSION} -PKGREVISION= 2 CATEGORIES= misc COMMENT= Personal Information Management tools for the KDE desktop diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo index ae375d6e62a..be3e4bc449e 100644 --- a/misc/kdepim3/distinfo +++ b/misc/kdepim3/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.17 2004/02/06 10:48:58 markd Exp $ +$NetBSD: distinfo,v 1.18 2004/03/09 12:13:45 markd Exp $ -SHA1 (kdepim-3.2.0.tar.bz2) = 4e7e4cd82ef4d3383f7aa668ebf23bf77a52a8d0 -Size (kdepim-3.2.0.tar.bz2) = 7707960 bytes -SHA1 (patch-aa) = d40f652d29053fca907812ca1a1e2e01d88b2b99 -SHA1 (patch-ab) = 2b922ea7f7b0d8a82bd7c68af56c17e18101cbf1 +SHA1 (kdepim-3.2.1.tar.bz2) = 697400b43aeae6dcff04a098e606ba290e107827 +Size (kdepim-3.2.1.tar.bz2) = 7754558 bytes SHA1 (patch-ai) = 6ff4270a5fd119e7d9c7240f40e60e868e691c3b diff --git a/misc/kdepim3/patches/patch-aa b/misc/kdepim3/patches/patch-aa deleted file mode 100644 index 0be2651bc61..00000000000 --- a/misc/kdepim3/patches/patch-aa +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2004/02/06 10:48:58 markd Exp $ - ---- kmail/kmfilter.cpp.orig 2003-11-30 22:49:22.000000000 +1300 -+++ kmail/kmfilter.cpp -@@ -147,9 +147,18 @@ void KMFilter::readConfig(KConfig* confi - // that the pattern is purified. - mPattern.readConfig(config); - -- if (bPopFilter) -+ if (bPopFilter) { - // get the action description... -- mAction = (KMPopFilterAction) config->readNumEntry( "action" ); -+ QString action = config->readEntry( "action" ); -+ if ( action == "down" ) -+ mAction = Down; -+ else if ( action == "later" ) -+ mAction = Later; -+ else if ( action == "delete" ) -+ mAction = Delete; -+ else -+ mAction = NoAction; -+ } - else { - QStringList sets = config->readListEntry("apply-on"); - if ( sets.isEmpty() && !config->hasKey("apply-on") ) { -@@ -210,7 +219,19 @@ void KMFilter::writeConfig(KConfig* conf - mPattern.writeConfig(config); - - if (bPopFilter) { -- config->writeEntry( "action", mAction ); -+ switch ( mAction ) { -+ case Down: -+ config->writeEntry( "action", "down" ); -+ break; -+ case Later: -+ config->writeEntry( "action", "later" ); -+ break; -+ case Delete: -+ config->writeEntry( "action", "delete" ); -+ break; -+ default: -+ config->writeEntry( "action", "" ); -+ } - } else { - QStringList sets; - if ( bApplyOnInbound ) diff --git a/misc/kdepim3/patches/patch-ab b/misc/kdepim3/patches/patch-ab deleted file mode 100644 index 87a58414b72..00000000000 --- a/misc/kdepim3/patches/patch-ab +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2004/02/06 10:48:58 markd Exp $ - ---- kmail/kmfolderimap.cpp.orig 2004-01-18 01:55:08.000000000 +1300 -+++ kmail/kmfolderimap.cpp -@@ -1207,7 +1207,16 @@ void KMFolderImap::deleteMessage(KMMessa - { - KURL url = mAccount->getUrl(); - KMFolderImap *msg_parent = static_cast(msg->parent()); -- url.setPath(msg_parent->imapPath() + ";UID=" + msg->headerField("X-UID")); -+ QString uid = msg->headerField("X-UID"); -+ /* If the uid is empty the delete job below will nuke all mail in the -+ folder, so we better safeguard against that. See ::expungeFolder, as -+ to why. :( */ -+ if ( uid.isEmpty() ) { -+ kdDebug( 5006 ) << "KMFolderImap::deleteMessage: Attempt to delete " -+ "an empty UID. Aborting." << endl; -+ return; -+ } -+ url.setPath(msg_parent->imapPath() + ";UID=" + uid ); - if ( mAccount->makeConnection() != ImapAccountBase::Connected ) - return; - KIO::SimpleJob *job = KIO::file_delete(url, FALSE); -@@ -1228,7 +1237,11 @@ void KMFolderImap::deleteMessage(QPtrLis - KMFolderImap *msg_parent = static_cast(msgList.first()->parent()); - for ( QStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) - { -- url.setPath(msg_parent->imapPath() + ";UID=" + *it); -+ QString uid = *it; -+ // Don't delete with no uid, that nukes the folder. Should not happen, but -+ // better safe than sorry. -+ if ( uid.isEmpty() ) continue; -+ url.setPath(msg_parent->imapPath() + ";UID=" + uid); - if ( mAccount->makeConnection() != ImapAccountBase::Connected ) - return; - KIO::SimpleJob *job = KIO::file_delete(url, FALSE); -- cgit v1.2.3