Update to KDE 3.4.1

Changes:
* KMail: Fix compilation on IRIX
* KMail: Send redirected messages to the correct address even if sending
  failed at first
* KMail: Fix crash when canceling KWallet password prompt
* KMail: Reduce memory consumption when importing folders
* KMail: Honor the character encoding when loading a message from a file
* KMail: Fix problem with per-identity BCC addresses
* KMail: Fix problem with inline forwarding of CC'ed messages
* KMail: Allow thread-related actions for single messages in threaded
  message list
* KMail: Show correct attachment status of imported message
* KMail: Fix attachment detection
* KMail: Fix problem with context menu for email addresses
* KMail: Show categories in the recipients picker
* KMail: Fix problem with Apply button staying disabled
* KMail: Correctly update filters filtering by status
* KMail: Fix for deletion of folders with subfolders using cached imap
* KMail: Rename temporary file used for compaction so that it doesn't
  risk appearing when kmail is killed and restarted
* KNode: Don't create empty reference headers when superseding articles
* KNode: Cleanly terminate network threads
* KNode: Respect custom color settings in the folder tree and source
  viewer
* KNode: More robust handling of optional headers in XOVER response
* KNode: Don't toggle 'sort by thread change date' when restoring
  header view layout
* KNode: Show error message on write errors
* KNode: Remove linebreaks from subject
* KNode: Don't break inline GPG signatures when forwarding messages
* KNode: Fix drag&drop crash in folder tree
* karm: Don't crash when deleting a task.
* Akregator: Don't crash when closing tab before the page is loaded.
* Akregator: Show icons on status filter combobox KMail style
* Akregator: Make reset filter button to reset status filter
* Akregator: Show window with size it was closed or with one from
  command line
* Akregator: Remove block around "Read more" link

11 files changed, 157 insertions, 50 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index ce9d9b241b2..34a12cfb875 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: Makefile,v 1.45 2005/05/31 14:48:24 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -29,6 +29,7 @@ REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/kmail-pgpidentity.pl \
 		kmail/kmail-upd-identities.pl \
 		kmail/kmail-3.4-misc.pl \
+		kmail/kmail-3.4.1-update-status-filters.pl \
 		kmail/upgrade-signature.pl \
 		kmail/upgrade-transport.pl \
 		libkdenetwork/kpgp-3.1-upgrade-address-data.pl \
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 534076c60ac..2dbb7d33a56 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2005/03/24 05:08:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.19 2005/05/31 14:48:24 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -28,7 +28,6 @@ bin/konsolekalendar
 bin/kontact
 bin/korgac
 bin/korganizer
-bin/korganizerIn
 bin/korn
 bin/kpalmdoc
 bin/kpilot
@@ -173,7 +172,6 @@ include/kpilot/pilotLocalDatabase.h
 include/kpilot/pilotRecord.h
 include/kpilot/pilotSerialDatabase.h
 include/kpilot/plugin.h
-include/kpilot/recordConduit.h
 include/kpilot/syncAction.h
 include/kpilot/uiDialog.h
 include/ksieve/error.h
@@ -718,6 +716,9 @@ share/kde/apps/akregator/articleviewer.rc
 share/kde/apps/akregator/eventsrc
 share/kde/apps/akregator/pageviewer.rc
 share/kde/apps/akregator/pics/akregator_flag.png
+share/kde/apps/akregator/pics/kmmsgflag.png
+share/kde/apps/akregator/pics/kmmsgnew.png
+share/kde/apps/akregator/pics/kmmsgunseen.png
 share/kde/apps/kaddressbook/bookmark_xxportui.rc
 share/kde/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
 share/kde/apps/kaddressbook/csv-templates/kaddressbook.desktop
@@ -798,6 +799,7 @@ share/kde/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
 share/kde/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
 share/kde/apps/kconf_update/kmail-3.3b1-misc.pl
 share/kde/apps/kconf_update/kmail-3.4-misc.pl
+share/kde/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
 share/kde/apps/kconf_update/kmail-pgpidentity.pl
 share/kde/apps/kconf_update/kmail-upd-identities.pl
 share/kde/apps/kconf_update/kmail.upd
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index f45ff2ac7f3..e03e429e76a 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.29 2005/03/23 22:07:07 markd Exp $
+$NetBSD: distinfo,v 1.30 2005/05/31 14:48:24 markd Exp $
 
-SHA1 (kdepim-3.4.0.tar.bz2) = a74877524c281bf7534d885dbc3bdb8d5bc82072
-RMD160 (kdepim-3.4.0.tar.bz2) = abc3794c45f12e29b3dc8ce3c4b570e980beb8c3
-Size (kdepim-3.4.0.tar.bz2) = 11441545 bytes
+SHA1 (kdepim-3.4.1.tar.bz2) = 42c8fb59809cd77ce9f843bf0ef661c45da0a251
+RMD160 (kdepim-3.4.1.tar.bz2) = f3dd526ca3094f42eb825ece30d0b84c047a6050
+Size (kdepim-3.4.1.tar.bz2) = 11345538 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
-SHA1 (patch-ac) = 04e40a64a131ba3505c2e1dd59792626e107a404
-SHA1 (patch-ad) = 1716e281cd2a54af8c8923881dfe0fd59e706a57
-SHA1 (patch-ae) = 44dbda64cacaabb74e1b46999b6b66e6e8ba80fa
 SHA1 (patch-ba) = f524c671e3089a73c78cb0e5a8b6e19c0ddf360c
 SHA1 (patch-bb) = 9667cce7382544a40f91b7f62f594cfc52953661
 SHA1 (patch-bc) = fc1d54789656b670345fcfaa67d0f9b8e90ffbf4
 SHA1 (patch-bd) = 7b72ab4fe60f5a4b46b8a60def67ffe4c7befe9f
+SHA1 (patch-bf) = 4523c843d7395f28bd5ed79313a463c381f846c3
+SHA1 (patch-bg) = 19c6ab47b9cbf97ea1db1237d2f32fe620e02050
+SHA1 (patch-bh) = bbd9f3ba67f0bba1f559aed4a9b4b37a1422021a
+SHA1 (patch-bi) = f669e42e4d8106ee1043a798c9ed9728acdb762a
+SHA1 (patch-bj) = cbaadf9ce9ec79580e3863a7744df3d2e0acfd9a
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
deleted file mode 100644
index 1254c221b86..00000000000
--- a/misc/kdepim3/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/03/23 22:07:08 markd Exp $
-
---- kresources/kolab/kabc/resourcekolab.cpp.orig	2005-02-04 12:12:14.000000000 +1300
-+++ kresources/kolab/kabc/resourcekolab.cpp
-@@ -80,7 +80,7 @@ KABC::ResourceKolab::ResourceKolab( cons
-     Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
-     mCachedSubresource( QString::null ), mLocked( false )
- {
--  setType( "kolab" );
-+  setType( "imap" );
- }
- 
- KABC::ResourceKolab::~ResourceKolab()
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
deleted file mode 100644
index 7c64a175627..00000000000
--- a/misc/kdepim3/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/03/23 22:07:08 markd Exp $
-
---- kresources/kolab/kcal/resourcekolab.cpp.orig	2005-02-04 12:12:14.000000000 +1300
-+++ kresources/kolab/kcal/resourcekolab.cpp
-@@ -68,7 +68,7 @@ ResourceKolab::ResourceKolab( const KCon
-   : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
-     mOpen( false )
- {
--  setType( "kolab" );
-+  setType( "imap" );
-   connect( &mResourceChangedTimer, SIGNAL( timeout() ),
-            this, SLOT( slotEmitResourceChanged() ) );
- }
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae
deleted file mode 100644
index c65442aed68..00000000000
--- a/misc/kdepim3/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/03/23 22:07:08 markd Exp $
-
---- kresources/kolab/knotes/resourcekolab.cpp.orig	2005-02-24 00:09:07.000000000 +1300
-+++ kresources/kolab/knotes/resourcekolab.cpp
-@@ -52,7 +52,7 @@ static const char* inlineMimeType = "tex
- ResourceKolab::ResourceKolab( const KConfig *config )
-   : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" )
- {
--  setType( "kolab" );
-+  setType( "imap" );
- }
- 
- ResourceKolab::~ResourceKolab()
diff --git a/misc/kdepim3/patches/patch-bf b/misc/kdepim3/patches/patch-bf
new file mode 100644
index 00000000000..6212f034e99
--- /dev/null
+++ b/misc/kdepim3/patches/patch-bf
@@ -0,0 +1,72 @@
+$NetBSD: patch-bf,v 1.1 2005/05/31 14:48:24 markd Exp $
+
+--- kpilot/conduits/memofileconduit/memofile-conduit.cc.orig	2005-05-24 00:12:37.000000000 +1200
++++ kpilot/conduits/memofileconduit/memofile-conduit.cc
+@@ -114,7 +114,7 @@ MemofileConduit::~MemofileConduit()
+ 	setFirstSync( _memofiles->isFirstSync() );
+ 	addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory));
+ 
+-	if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || isFirstSync() ) {
++	if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
+ 		addSyncLogEntry(i18n(" Copying Pilot to PC..."));
+ #ifdef DEBUG
+ 		DEBUGCONDUIT << fname << ": copying Pilot to PC." << endl;
+@@ -474,17 +474,11 @@ bool MemofileConduit::copyPCToHH()
+ 	// Note: This will reset both fCategories and fMemoAppInfo, so
+ 	//       after this, we need to reinitialize our memofiles object...
+ 	setAppInfo();
+-	cleanup();
+ 
+ 	// re-create our memofiles helper...
+ 	delete _memofiles;
+ 	_memofiles = new Memofiles(fCategories, *fMemoAppInfo, _memo_directory);
+ 
+-	// make sure we are starting with a clean database on both ends...
+-	fDatabase->deleteRecord(0, true);
+-	fLocalDatabase->deleteRecord(0, true);
+-	cleanup();
+-
+ 	_memofiles->load(true);
+ 
+ 	QPtrList<Memofile> memofiles = _memofiles->getAll();
+@@ -496,11 +490,39 @@ bool MemofileConduit::copyPCToHH()
+ 	}
+ 
+ 	_memofiles->save();
+-
++	
++	// now that we've copied from the PC to our handheld, remove anything extra from the
++	// handheld...
++	deleteUnsyncedHHRecords();
++	
+ 	return true;
+ 
+ }
+ 
++void MemofileConduit::deleteUnsyncedHHRecords()
++{
++	FUNCTIONSETUP;
++	if ( syncMode()==SyncMode::eCopyPCToHH )
++	{
++		RecordIDList ids=fDatabase->idList();
++		RecordIDList::iterator it;
++		for ( it = ids.begin(); it != ids.end(); ++it )
++		{
++			if (!_memofiles->find(*it))
++			{
++#ifdef DEBUG
++				DEBUGCONDUIT << fname
++				<< "Deleting record with ID "<<*it <<" from handheld "
++				<< "(is not on PC, and syncing with PC->HH direction)"
++				<< endl;
++#endif
++				fDatabase->deleteRecord(*it);
++				fLocalDatabase->deleteRecord(*it);
++			}
++		}
++	}
++}
++
+ int MemofileConduit::writeToPilot(Memofile * memofile)
+ {
+ 	FUNCTIONSETUP;
diff --git a/misc/kdepim3/patches/patch-bg b/misc/kdepim3/patches/patch-bg
new file mode 100644
index 00000000000..c22ee86d8de
--- /dev/null
+++ b/misc/kdepim3/patches/patch-bg
@@ -0,0 +1,12 @@
+$NetBSD: patch-bg,v 1.1 2005/05/31 14:48:24 markd Exp $
+
+--- kpilot/conduits/memofileconduit/memofile-conduit.h.orig	2005-05-24 00:12:37.000000000 +1200
++++ kpilot/conduits/memofileconduit/memofile-conduit.h
+@@ -88,6 +88,7 @@ private:
+ 
+ 	bool	copyHHToPC();
+ 	bool	copyPCToHH();
++	void	deleteUnsyncedHHRecords();
+ 	bool	sync();
+ 
+ 	int 	writeToPilot(Memofile * memofile);
diff --git a/misc/kdepim3/patches/patch-bh b/misc/kdepim3/patches/patch-bh
new file mode 100644
index 00000000000..032b1f8d9e5
--- /dev/null
+++ b/misc/kdepim3/patches/patch-bh
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1 2005/05/31 14:48:24 markd Exp $
+
+--- kpilot/lib/pilotDatabase.cc.orig	2005-05-24 00:12:43.000000000 +1200
++++ kpilot/lib/pilotDatabase.cc
+@@ -185,7 +185,7 @@ bool PilotAppInfoBase::setCategory(unsig
+ 	int len = CATEGORY_NAME_SIZE - 1;
+ 	QCString t = PilotAppCategory::codec()->fromUnicode(s,len);
+ 	memset(categoryInfo()->name[i],0,CATEGORY_NAME_SIZE);
+-	qstrncpy(categoryInfo()->name[i],t,kMin(len,(int)CATEGORY_NAME_SIZE));
++	qstrncpy(categoryInfo()->name[i],t,CATEGORY_NAME_SIZE);
+ 	return true;
+ }
+ 
diff --git a/misc/kdepim3/patches/patch-bi b/misc/kdepim3/patches/patch-bi
new file mode 100644
index 00000000000..8656c43368a
--- /dev/null
+++ b/misc/kdepim3/patches/patch-bi
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2005/05/31 14:48:24 markd Exp $
+
+--- kpilot/lib/pilotLocalDatabase.cc.orig	2005-05-24 00:12:43.000000000 +1200
++++ kpilot/lib/pilotLocalDatabase.cc
+@@ -618,7 +618,7 @@ void PilotLocalDatabase::openDatabase()
+ 
+ 	int count;
+ 	pi_file_get_entries(dbFile, &count);
+-	if (count > 0)
++	if (count >= 0)
+ 	{
+ 		KPILOT_DELETE(d);
+ 		d = new Private(count);
diff --git a/misc/kdepim3/patches/patch-bj b/misc/kdepim3/patches/patch-bj
new file mode 100644
index 00000000000..8cb92ff0976
--- /dev/null
+++ b/misc/kdepim3/patches/patch-bj
@@ -0,0 +1,31 @@
+$NetBSD: patch-bj,v 1.1 2005/05/31 14:48:24 markd Exp $
+
+--- kpilot/lib/pilotDatabase.h.orig	2005-05-24 00:12:43.000000000 +1200
++++ kpilot/lib/pilotDatabase.h
+@@ -279,9 +279,12 @@ public:
+ 		int appLen = MAX_APPINFO_SIZE;
+ 		unsigned char buffer[MAX_APPINFO_SIZE];
+ 
+-		appLen = d->readAppBlock(buffer,appLen);
+-
+-		(*unpack)(&fInfo, buffer, appLen);
++		if (d && d->isDBOpen())
++		{
++			appLen = d->readAppBlock(buffer,appLen);
++			(*unpack)(&fInfo, buffer, appLen);
++		}
++		// fInfo is just a struct, so we can point to it anyway.
+ 		init(&fInfo.category,appLen);
+ 	} ;
+ 
+@@ -289,6 +292,10 @@ public:
+ 	{
+ 		FUNCTIONSETUP;
+ 		unsigned char buffer[MAX_APPINFO_SIZE];
++		if (!d || !d->isDBOpen())
++		{
++			return -1;
++		}
+ 		int appLen = (*pack)(&fInfo, buffer, length());
+ 		if (appLen > 0)
+ 		{