Update to KDE 3.5.1

Changes:
* KAlarm
  o Fix email attachments being forgotten when saving alarms
  o Make autoclose of message windows work
  o Display alarm message windows within current screen in multi-head
    systems
  o Fix toolbar configuration being lost after quitting KAlarm
  o Fix New From Template not creating alarm if template contents are
    not changed
  o Fix configuration dialog not fitting in 1024x768 screen in some
    translations
* KMail
  o KMail crashes while inserting files
  o KMail composer crashes when inserting file
  o KMail crashes when inserting files into email messages
  o autocomplete in composer completes section title instead of
    email-address
  o The item "network state" in the KMail file menu is very confusing
  o Crash when applying pipe through filters
  o subfolders and included mails lost when moving folder to
    cachedimap account
  o Cannot create new folders with IMAP using Dovecot-imapd, regression
    from 3.4.X
  o Retrieving folder contents screen is irritating
  o Interpret old-fashioned time zone in email Date header
  o HTML formatting is lost when saving in drafts folder
  o composer kaddressbook no adresses at first launch
* KOrganizer
  o libkholidays bug in Belgian version
  o HTML export does not include location field
* Kontact
  o Mistake in reporting upcoming German Holidays on Overview page
  o Summary for "special dates" shows wrong time spans
* KAddressBook
  o Allow the selection/copy of the formatted address
  o URL images not working in KAddressBook
  o Photo image location field is nonfunctional
  o Contact's photos are not cleared in "Contact Editor" extension bar
  o Need an easy way to copy and paste an address from the editor window
  o Exporting contacts to vcard generates _.vcf for EVERY contact
    without a real name
  o kaddressbook hangs on loading vcard
* KNotes
  o Possibility to sort knotes list of notes titles
  o separate "Clear" action visually from Cut/Copy/Paste since it's not
    doing anything with the clipboard
  o added a "Do not show again" box to the delete note dialog
  o actually set the "Keep Above/Below" bit when creating a note on
    startup
  o race condition when using NETRootInfo::moveResizeRequest
  o line breaks not rendered properly in edit view
  o KNotes via network does not work properly
  o Confusing error requester while sending to self
  o Renaming a note opening it and editing its title does not rename it
    in the kontact notes view
* Akregator
  o Do not open binary files in the HTML viewer but externally. Fix
    "Save Link As" for binary files
  o  Fix article order in Combined View: sort by date
  o Fix parsing of Atom 1.0 feeds with escaped HTML in it: Don't show
    tags as text
  o Select next item in article list when deleting the selected article
  o Avoid crashes as happening when moving a folder and deleting a
    subitem afterwards
  o Fix problems with keyboard navigation getting stuck on duplicated
    articles and prevent creation of new items when selecting an unread
    dupe
  o Don't try to reload broken feeds every minute
  o CDATA in feed is not handled correctly
* KNode
  o Respect background color settings when article viewer is empty
  o Fix crash on startup if auto mark-as-read is disabled
  o Reset busy cursor when folder loading fails.

8 files changed, 5 insertions, 225 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index d2f3b582e6d..b9c1a2dc492 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2006/01/24 07:32:24 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2006/01/31 22:37:34 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 9f902b3ed0d..3cd9c80de4b 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.38 2006/01/07 21:55:23 rillig Exp $
+$NetBSD: distinfo,v 1.39 2006/01/31 22:37:34 markd Exp $
 
-SHA1 (kdepim-3.5.0.tar.bz2) = fb98ea719990bf1169289ca5012ad75ac261f488
-RMD160 (kdepim-3.5.0.tar.bz2) = 8a41dedd61f8607520d9bcfe49baadeb2b47d845
-Size (kdepim-3.5.0.tar.bz2) = 12865623 bytes
+SHA1 (kdepim-3.5.1.tar.bz2) = 746a46e909c973175c134f040c5d137e60b64777
+RMD160 (kdepim-3.5.1.tar.bz2) = 9270aea41b18ffe3465ccafccb4283fdd5c8a2b2
+Size (kdepim-3.5.1.tar.bz2) = 12885355 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
-SHA1 (patch-ac) = fe390dca8f1464166e9d515bf3071a5cff0eb793
-SHA1 (patch-ad) = 2d37bf3b0263291be65861ae633839a86558170a
-SHA1 (patch-ae) = 3814c6778417503fa088e689df16d36b2e2d1d2c
-SHA1 (patch-af) = f72f09de9dfe811fd1324906cfb8a0801dce5454
-SHA1 (patch-ag) = 7c3974ddf207367015ffd1ac6ec2ceffa840febf
-SHA1 (patch-ah) = ffe68d07a0d49555b30ccd322c14f646bf2972cd
 SHA1 (patch-ai) = e323770b352d0a3876f8380bb31aa30615866dd4
 SHA1 (patch-aj) = 1fd187c4c9ddb4f6380265853feb7eb04cf4b740
 SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
deleted file mode 100644
index b1176598953..00000000000
--- a/misc/kdepim3/patches/patch-ac
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2005/12/11 11:40:02 markd Exp $
-
---- kmail/actionscheduler.cpp.orig	2005-09-10 20:24:02.000000000 +1200
-+++ kmail/actionscheduler.cpp
-@@ -570,7 +570,7 @@ void ActionScheduler::filterMessage()
-        (!mAccount ||
- 	(mAccount && (*mFilterIt).applyOnAccount(mAccountId)))) ||
-       ((mSet & KMFilterMgr::Explicit) && (*mFilterIt).applyOnExplicit())) {
--      
-+
-       // filter is applicable
-     if ( FilterLog::instance()->isLogging() ) {
-       QString logText( i18n( "<b>Evaluating filter rules:</b> " ) );
-@@ -646,8 +646,11 @@ void ActionScheduler::moveMessage()
-   if (!orgMsg || !orgMsg->parent()) {
-     // Original message is gone, no point filtering it anymore
-     mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
-+    kdDebug(5006) << "The original serial number is missing. "
-+                  << "Cannot complete the filtering." << endl;
-     mExecutingLock = false;
-     processMessageTimer->start( 0, true );
-+    return;
-   } else {
-     if (!folder) // no filter folder specified leave in current place
-       folder = orgMsg->parent();
-@@ -659,7 +662,7 @@ void ActionScheduler::moveMessage()
-   mSrcFolder->addMsg( msg );
-   mIgnore = false;
- 
--  if (msg && kmkernel->folderIsTrash( folder ))
-+  if (msg && folder && kmkernel->folderIsTrash( folder ))
-     KMFilterAction::sendMDN( msg, KMime::MDN::Deleted );
- 
-   timeOutTime = QTime::currentTime();
-@@ -722,8 +725,6 @@ void ActionScheduler::moveMessageFinishe
- 
- void ActionScheduler::copyMessageFinished( KMCommand *command )
- {
--  // FIXME remove the debug output
--  kdDebug(5006) << "##### ActionScheduler::copyMessageFinished( KMCommand *command )" << endl;
-   if ( command->result() != KMCommand::OK )
-     actionMessage( KMFilterAction::ErrorButGoOn );
-   else 
-@@ -803,4 +804,11 @@ bool ActionScheduler::isEnabled()
-     return sEnabled;
- }
- 
-+bool ActionScheduler::ignoreChanges( bool ignore )
-+{
-+  bool oldValue = mIgnore;
-+  mIgnore = ignore;
-+  return oldValue;
-+}
-+
- #include "actionscheduler.moc"
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
deleted file mode 100644
index a320d6c8370..00000000000
--- a/misc/kdepim3/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2005/12/11 11:40:02 markd Exp $
-
---- kmail/actionscheduler.h.orig	2005-09-10 20:24:02.000000000 +1200
-+++ kmail/actionscheduler.h
-@@ -77,10 +77,10 @@ public:
-    of messages left to process is empty */
-   void setFilterList( QValueList<KMFilter*> filters );
- 
--  /* Set the id of the account associated with this scheduler */
-+  /** Set the id of the account associated with this scheduler */
-   void setAccountId( uint id  ) { mAccountId = id; mAccount = true; }
- 
--  /* Clear the id of the account associated with this scheduler */
-+  /** Clear the id of the account associated with this scheduler */
-   void clearAccountId() { mAccountId = 0; mAccount = false; }
- 
-   /** Queue a message for filtering */
-@@ -88,9 +88,16 @@ public:
-   void execFilters(const QPtrList<KMMsgBase> msgList);
-   void execFilters(KMMsgBase* msgBase);
-   void execFilters(Q_UINT32 serNum);
-+
-   static QString debug();
-   static bool isEnabled();
- 
-+  /** Allow or deny manipulations on the message to be filtered.
-+      This is needed when using pipe-through filters, because the
-+      changes made by the filter have to be written back.
-+      The old value before applying the new value is returned. */
-+  bool ignoreChanges( bool ignore );
-+
- signals:
-   /** Emitted when filtering is completed */
-   void result(ReturnCode);
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae
deleted file mode 100644
index addda33b815..00000000000
--- a/misc/kdepim3/patches/patch-ae
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2005/12/11 11:40:02 markd Exp $
-
---- kmail/kmcommands.cpp.orig	2005-10-11 04:02:11.000000000 +1300
-+++ kmail/kmcommands.cpp
-@@ -1496,30 +1496,30 @@ KMMetaFilterActionCommand::KMMetaFilterA
- 
- void KMMetaFilterActionCommand::start()
- {
--#if 0 // use action scheduler
--  KMFilterMgr::FilterSet set = KMFilterMgr::All;
--  QPtrList<KMFilter> filters;
--  filters.append( mFilter );
--  ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
--  scheduler->setAlwaysMatch( true );
--  scheduler->setAutoDestruct( true );
--
--  int contentX, contentY;
--  HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
--  QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
--  mHeaders->finalizeMove( nextItem, contentX, contentY );
--
--
--  for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
--    scheduler->execFilters( msg );
--#else
--  KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
--  *mHeaders->selectedMsgs(), mFilter);
--  filterCommand->start();
--  int contentX, contentY;
--  HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
--  mHeaders->finalizeMove( item, contentX, contentY );
--#endif
-+  if (ActionScheduler::isEnabled() ) {
-+    // use action scheduler
-+    KMFilterMgr::FilterSet set = KMFilterMgr::All;
-+    QValueList<KMFilter*> filters;
-+    filters.append( mFilter );
-+    ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
-+    scheduler->setAlwaysMatch( true );
-+    scheduler->setAutoDestruct( true );
-+
-+    int contentX, contentY;
-+    HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
-+    QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
-+    mHeaders->finalizeMove( nextItem, contentX, contentY );
-+
-+    for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
-+      scheduler->execFilters( msg );
-+  } else {
-+    KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
-+    *mHeaders->selectedMsgs(), mFilter);
-+    filterCommand->start();
-+    int contentX, contentY;
-+    HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
-+    mHeaders->finalizeMove( item, contentX, contentY );
-+  }
- }
- 
- FolderShortcutCommand::FolderShortcutCommand( KMMainWidget *mainwidget,
diff --git a/misc/kdepim3/patches/patch-af b/misc/kdepim3/patches/patch-af
deleted file mode 100644
index 4845355805c..00000000000
--- a/misc/kdepim3/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.3 2005/12/11 11:40:02 markd Exp $
-
---- kmail/kmfilteraction.cpp.orig	2005-09-10 20:24:02.000000000 +1200
-+++ kmail/kmfilteraction.cpp
-@@ -1617,6 +1617,9 @@ class PipeJob : public KPIM::ThreadWeave
-       FILE *p;
-       QByteArray ba;
- 
-+      // backup the serial number in case the header gets lost
-+      QString origSerNum = mMsg->headerField( "X-KMail-Filtered" );
-+
-       p = popen(QFile::encodeName(mCmd), "r");
-       int len =100;
-       char buffer[100];
-@@ -1630,7 +1633,20 @@ class PipeJob : public KPIM::ThreadWeave
-       pclose(p);
-       if ( !ba.isEmpty() ) {
-         KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", QString(ba).latin1() );
-+        KMFolder *filterFolder =  mMsg->parent();
-+        ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() );
-+
-         mMsg->fromByteArray( ba );
-+        if ( !origSerNum.isEmpty() )
-+          mMsg->setHeaderField( "X-KMail-Filtered", origSerNum );
-+        if ( filterFolder && handler ) {
-+          bool oldStatus = handler->ignoreChanges( true );
-+          filterFolder->take( filterFolder->find( mMsg ) );
-+          filterFolder->addMsg( mMsg );
-+          handler->ignoreChanges( oldStatus );
-+        } else {
-+          kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl;
-+        }
-       }
- 
-       KPIM::ThreadWeaver::debug (1, "PipeJob::run: done.\n" );
diff --git a/misc/kdepim3/patches/patch-ag b/misc/kdepim3/patches/patch-ag
deleted file mode 100644
index 0858d5412a0..00000000000
--- a/misc/kdepim3/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2005/12/11 11:40:02 markd Exp $
-
---- kmail/kmkernel.cpp.orig	2005-11-09 11:33:29.000000000 +1300
-+++ kmail/kmkernel.cpp
-@@ -1432,11 +1432,11 @@ void KMKernel::init()
-   the_msgIndex = 0;
- #endif
- 
--#if 0
-+//#if 0
-   the_weaver =  new KPIM::ThreadWeaver::Weaver( this );
-   the_weaverLogger = new KPIM::ThreadWeaver::WeaverThreadLogger(this);
-   the_weaverLogger->attach (the_weaver);
--#endif
-+//#endif
- 
-   connect( the_folderMgr, SIGNAL( folderRemoved(KMFolder*) ),
-            this, SIGNAL( folderRemoved(KMFolder*) ) );
diff --git a/misc/kdepim3/patches/patch-ah b/misc/kdepim3/patches/patch-ah
deleted file mode 100644
index 2bfa6a6db65..00000000000
--- a/misc/kdepim3/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2005/12/11 11:40:02 markd Exp $
-
---- kmail/kmversion.h.orig	2005-11-09 11:33:29.000000000 +1300
-+++ kmail/kmversion.h
-@@ -3,6 +3,6 @@
- #ifndef kmversion_h
- #define kmversion_h
- 
--#define KMAIL_VERSION "1.9"
-+#define KMAIL_VERSION "1.9.1"
- 
- #endif /*kmversion_h*/