Update to KDE 3.5.1.

14 files changed, 76 insertions, 890 deletions

diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 883705d0b1f0..5faa42cb5708 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.0.tar.bz2) = d6b2cbe8b7d15166eff261f20ece2718
-SHA256 (KDE/kdeutils-3.5.0.tar.bz2) = 23eeb281e6c361f62b0911cac9be782ba32f62a48a2931c972872b2a2e8c3625
-SIZE (KDE/kdeutils-3.5.0.tar.bz2) = 2958132
+MD5 (KDE/kdeutils-3.5.1.tar.bz2) = 1286c6a09b04452adfe492de2fad79bd
+SHA256 (KDE/kdeutils-3.5.1.tar.bz2) = 4d94e79f4fff451474ce94d354ac8b591114d5c7ac1644dbd3852ee97e773ca5
+SIZE (KDE/kdeutils-3.5.1.tar.bz2) = 2974660
diff --git a/deskutils/kcharselect/files/patch-ark-filelistview.cpp b/deskutils/kcharselect/files/patch-ark-filelistview.cpp
deleted file mode 100644
index dadc8edc030e..000000000000
--- a/deskutils/kcharselect/files/patch-ark-filelistview.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ark/filelistview.cpp.orig	Mon Dec 19 15:40:44 2005
-+++ ark/filelistview.cpp	Mon Dec 19 15:41:20 2005
-@@ -260,7 +260,7 @@
- 				 * the next item is the next sibling of its parent, and so on.
- 				 */
- 				FileLVI *nitem = static_cast<FileLVI*>( item->nextSibling() );
--				while ( !nitem and item->parent() )
-+				while ( !nitem && item->parent() )
- 				{
- 					item = static_cast<FileLVI*>( item->parent() );
- 					nitem = static_cast<FileLVI*>( item->parent()->nextSibling() );
diff --git a/deskutils/kcharselect/files/patch-kcalc_knumber-knumber_priv.cpp b/deskutils/kcharselect/files/patch-kcalc_knumber-knumber_priv.cpp
deleted file mode 100644
index 9e1b5377f7d1..000000000000
--- a/deskutils/kcharselect/files/patch-kcalc_knumber-knumber_priv.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- kcalc/knumber/knumber_priv.cpp.orig	Tue Dec 20 14:54:29 2005
-+++ kcalc/knumber/knumber_priv.cpp	Tue Dec 20 14:59:11 2005
-@@ -20,6 +20,9 @@
- #include <math.h>
- #include <config.h>
- 
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
- #include <qregexp.h>
- #include <qstring.h>
- 
diff --git a/deskutils/kcharselect/files/patch-post-3.5.0-superkaramba b/deskutils/kcharselect/files/patch-post-3.5.0-superkaramba
deleted file mode 100644
index e2d73f7d566b..000000000000
--- a/deskutils/kcharselect/files/patch-post-3.5.0-superkaramba
+++ /dev/null
@@ -1,156 +0,0 @@
---- superkaramba/src/memsensor.cpp.orig	Wed Dec 21 12:35:21 2005
-+++ superkaramba/src/memsensor.cpp	Wed Dec 21 12:41:09 2005
-@@ -14,7 +14,7 @@
- #include <qstring.h>
- #include <qregexp.h>
- 
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- #include <sys/time.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-@@ -32,14 +32,14 @@
- #include <sys/swap.h>
- #endif
- 
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
- /* define pagetok in terms of pageshift */
- #define pagetok(size) ((size) << pageshift)
- #endif
- 
- MemSensor::MemSensor(int msec) : Sensor(msec)
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-    /* get the page size with "getpagesize" and calculate pageshift from it */
-     int pagesize = getpagesize();
-     pageshift = 0;
-@@ -51,7 +51,7 @@
- 
-     /* we only need the amount of log(2)1024 for our conversion */
-     pageshift -= 10;
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     connect(&ksp, SIGNAL(receivedStdout(KProcess *, char *, int )),
-             this,SLOT(receivedStdout(KProcess *, char *, int )));
-     connect(&ksp, SIGNAL(processExited(KProcess *)),
-@@ -62,7 +62,7 @@
-     MaxSet = false;
- 
-     readValues();
--# elif defined __FreeBSD__
-+# elif defined Q_OS_FREEBSD
-     kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
- # endif
- #else
-@@ -73,7 +73,7 @@
- MemSensor::~MemSensor()
- {}
- 
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- void MemSensor::receivedStdout(KProcess *, char *buffer, int len )
- {
-     buffer[len] = 0;
-@@ -87,7 +87,7 @@
- 
- void MemSensor::processExited(KProcess *)
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     QStringList stringList = QStringList::split('\n',sensorResult);
-     sensorResult = "";
-     QStringList itemsList = QStringList::split(' ', stringList[1]);
-@@ -99,7 +99,7 @@
- 
- int MemSensor::getMemTotal()
- {
--#if defined __FreeBSD || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -114,7 +114,7 @@
- 
- int MemSensor::getMemFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -138,7 +138,7 @@
- 
- int MemSensor::getBuffers()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -159,7 +159,7 @@
- 
- int MemSensor::getCached()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -179,7 +179,7 @@
- 
- int MemSensor::getSwapTotal()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
-     return(swapTotal);
- # else
-@@ -221,7 +221,7 @@
- 
- int MemSensor::getSwapFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
-     return(swapTotal - swapUsed);
- # else
-@@ -266,8 +266,8 @@
- 
- void MemSensor::readValues()
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     ksp.clearArguments();
-     ksp << "swapinfo";
-     ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
-@@ -291,7 +291,7 @@
-     SensorParams *sp;
-     Meter *meter;
-     QObjectListIt it( *objList );
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     bool set = false;
- #endif
-     int totalMem = getMemTotal();
-@@ -303,7 +303,7 @@
-     while (it != 0)
-     {
-         sp = (SensorParams*)(*it);
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-         if ( (!MaxSet) && (totalSwap > 0) ) {
-            setMaxValue(sp);
-            bool set = true;
-@@ -331,7 +331,7 @@
-         meter->setValue(format);
-         ++it;
-     }
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     if (set)
-         MaxSet = true;
- #endif
diff --git a/deskutils/kcharselect/files/patch-post-3.5.1-superkaramba b/deskutils/kcharselect/files/patch-post-3.5.1-superkaramba
new file mode 100644
index 000000000000..264523346184
--- /dev/null
+++ b/deskutils/kcharselect/files/patch-post-3.5.1-superkaramba
@@ -0,0 +1,64 @@
+--- superkaramba/src/karamba.cpp.orig	Sun Jan 29 20:28:05 2006
++++ superkaramba/src/karamba.cpp	Sun Jan 29 20:55:33 2006
+@@ -544,7 +544,7 @@
+         QFileInfo info(path);
+         if( info.isRelative())
+           path = m_theme.path() +"/" + path;
+-        (new karamba( path, false ))->show();
++        (new karamba( path, QString() ))->show();
+       }
+ 
+       if(lineParser.meter() == "<GROUP>")
+--- superkaramba/src/karambaapp.cpp.orig	Sun Jan 29 21:01:46 2006
++++ superkaramba/src/karambaapp.cpp	Sun Jan 29 21:02:23 2006
+@@ -279,7 +279,7 @@
+   {
+     karamba *mainWin = 0;
+ 
+-    mainWin = new karamba(*it , false);
++    mainWin = new karamba(*it , QString());
+     mainWin->show();
+     result = true;
+   }
+--- superkaramba/src/karambainterface.cpp.orig	Sun Jan 29 21:00:35 2006
++++ superkaramba/src/karambainterface.cpp	Sun Jan 29 21:01:06 2006
+@@ -72,7 +72,7 @@
+   QFileInfo file(filename);
+   if(file.exists())
+   {
+-    (new karamba(filename, false))->show();
++    (new karamba(filename, QString()))->show();
+   }
+ }
+ 
+--- superkaramba/src/misc_python.cpp.orig	Sun Jan 29 20:58:06 2006
++++ superkaramba/src/misc_python.cpp	Sun Jan 29 20:58:23 2006
+@@ -459,7 +459,7 @@
+ 
+   if( file.exists() )
+     {
+-      currTheme = new karamba( filename, false );
++      currTheme = new karamba( filename, QString() );
+       currTheme->show();
+     }
+ 
+--- superkaramba/src/themesdlg.cpp.orig	Sun Jan 29 21:03:36 2006
++++ superkaramba/src/themesdlg.cpp	Sun Jan 29 21:04:22 2006
+@@ -195,7 +195,7 @@
+     ThemeFile* tf = w->themeFile();
+     if(tf)
+     {
+-      (new karamba(tf->file(), false))->show();
++      (new karamba(tf->file(), QString()))->show();
+     }
+   }
+ }
+@@ -210,7 +210,7 @@
+   {
+     ThemeFile file(*it);
+     if(file.isValid())
+-      (new karamba(*it, false))->show();
++      (new karamba(*it, QString()))->show();
+   }
+ }
+ 
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index e00ad639d113..083a6748d9f7 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.0.tar.bz2) = e19a2a40e422ecd483884ce6e9ac8925
-SHA256 (KDE/kdepim-3.5.0.tar.bz2) = d7e3aa6783275df1ace9c3ab5164afd9017067bd9006b7af722fbe89062033c4
-SIZE (KDE/kdepim-3.5.0.tar.bz2) = 12865623
+MD5 (KDE/kdepim-3.5.1.tar.bz2) = 8e87c9cbe1f0c0f983f94d804a5bc8f9
+SHA256 (KDE/kdepim-3.5.1.tar.bz2) = 7705986fbfe8036ca1ead6c0e360a39325057bb3adb676c80b454619710b0995
+SIZE (KDE/kdepim-3.5.1.tar.bz2) = 12885355
diff --git a/deskutils/kdepim3/files/patch-kioslaves_mbox-readmbox.cc b/deskutils/kdepim3/files/patch-kioslaves_mbox-readmbox.cc
deleted file mode 100644
index 7da32fe405fb..000000000000
--- a/deskutils/kdepim3/files/patch-kioslaves_mbox-readmbox.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- kioslaves/mbox/readmbox.cc.orig	Sun Dec 18 15:43:49 2005
-+++ kioslaves/mbox/readmbox.cc	Sun Dec 18 15:58:15 2005
-@@ -16,6 +16,8 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
-+#include <config.h>
-+
- #include "readmbox.h"
- 
- #include "mbox.h"
-@@ -28,6 +30,10 @@
- #include <qfileinfo.h>
- #include <qstring.h>
- #include <qtextstream.h>
-+
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
- 
- #include <utime.h>
- 
diff --git a/deskutils/kdepim3/files/patch-post-3.5.0-kmail b/deskutils/kdepim3/files/patch-post-3.5.0-kmail
deleted file mode 100644
index 6e0112c92e74..000000000000
--- a/deskutils/kdepim3/files/patch-post-3.5.0-kmail
+++ /dev/null
@@ -1,211 +0,0 @@
-Index: kmcommands.cpp
-===================================================================
---- kmail/kmcommands.cpp	(Revision 487211)
-+++ kmail/kmcommands.cpp	(Arbeitskopie)
-@@ -1496,30 +1496,30 @@
- 
- 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 );
-+  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 );
-+    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
-+    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,
-Index: kmkernel.cpp
-===================================================================
---- kmail/kmkernel.cpp	(Revision 487211)
-+++ kmail/kmkernel.cpp	(Arbeitskopie)
-@@ -1432,11 +1432,11 @@
-   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*) ) );
-Index: kmfilteraction.cpp
-===================================================================
---- kmail/kmfilteraction.cpp	(Revision 487211)
-+++ kmail/kmfilteraction.cpp	(Arbeitskopie)
-@@ -1617,6 +1617,9 @@
-       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 @@
-       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" );
-Index: actionscheduler.h
-===================================================================
---- kmail/actionscheduler.h	(Revision 487211)
-+++ kmail/actionscheduler.h	(Arbeitskopie)
-@@ -77,10 +77,10 @@
-    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 @@
-   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);
-Index: actionscheduler.cpp
-===================================================================
---- kmail/actionscheduler.cpp	(Revision 487211)
-+++ kmail/actionscheduler.cpp	(Arbeitskopie)
-@@ -570,7 +570,7 @@
-        (!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 @@
-   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 @@
-   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::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 @@
-     return sEnabled;
- }
- 
-+bool ActionScheduler::ignoreChanges( bool ignore )
-+{
-+  bool oldValue = mIgnore;
-+  mIgnore = ignore;
-+  return oldValue;
-+}
-+
- #include "actionscheduler.moc"
-Index: kmversion.h
-===================================================================
---- kmail/kmversion.h	(Revision 487211)
-+++ kmail/kmversion.h	(Arbeitskopie)
-@@ -3,6 +3,6 @@
- #ifndef kmversion_h
- #define kmversion_h
- 
--#define KMAIL_VERSION "1.9"
-+#define KMAIL_VERSION "1.9.1"
- 
- #endif /*kmversion_h*/
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index e00ad639d113..083a6748d9f7 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.0.tar.bz2) = e19a2a40e422ecd483884ce6e9ac8925
-SHA256 (KDE/kdepim-3.5.0.tar.bz2) = d7e3aa6783275df1ace9c3ab5164afd9017067bd9006b7af722fbe89062033c4
-SIZE (KDE/kdepim-3.5.0.tar.bz2) = 12865623
+MD5 (KDE/kdepim-3.5.1.tar.bz2) = 8e87c9cbe1f0c0f983f94d804a5bc8f9
+SHA256 (KDE/kdepim-3.5.1.tar.bz2) = 7705986fbfe8036ca1ead6c0e360a39325057bb3adb676c80b454619710b0995
+SIZE (KDE/kdepim-3.5.1.tar.bz2) = 12885355
diff --git a/deskutils/kdepim4/files/patch-kioslaves_mbox-readmbox.cc b/deskutils/kdepim4/files/patch-kioslaves_mbox-readmbox.cc
deleted file mode 100644
index 7da32fe405fb..000000000000
--- a/deskutils/kdepim4/files/patch-kioslaves_mbox-readmbox.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- kioslaves/mbox/readmbox.cc.orig	Sun Dec 18 15:43:49 2005
-+++ kioslaves/mbox/readmbox.cc	Sun Dec 18 15:58:15 2005
-@@ -16,6 +16,8 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
-+#include <config.h>
-+
- #include "readmbox.h"
- 
- #include "mbox.h"
-@@ -28,6 +30,10 @@
- #include <qfileinfo.h>
- #include <qstring.h>
- #include <qtextstream.h>
-+
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
- 
- #include <utime.h>
- 
diff --git a/deskutils/kdepim4/files/patch-post-3.5.0-kmail b/deskutils/kdepim4/files/patch-post-3.5.0-kmail
deleted file mode 100644
index 6e0112c92e74..000000000000
--- a/deskutils/kdepim4/files/patch-post-3.5.0-kmail
+++ /dev/null
@@ -1,211 +0,0 @@
-Index: kmcommands.cpp
-===================================================================
---- kmail/kmcommands.cpp	(Revision 487211)
-+++ kmail/kmcommands.cpp	(Arbeitskopie)
-@@ -1496,30 +1496,30 @@
- 
- 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 );
-+  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 );
-+    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
-+    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,
-Index: kmkernel.cpp
-===================================================================
---- kmail/kmkernel.cpp	(Revision 487211)
-+++ kmail/kmkernel.cpp	(Arbeitskopie)
-@@ -1432,11 +1432,11 @@
-   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*) ) );
-Index: kmfilteraction.cpp
-===================================================================
---- kmail/kmfilteraction.cpp	(Revision 487211)
-+++ kmail/kmfilteraction.cpp	(Arbeitskopie)
-@@ -1617,6 +1617,9 @@
-       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 @@
-       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" );
-Index: actionscheduler.h
-===================================================================
---- kmail/actionscheduler.h	(Revision 487211)
-+++ kmail/actionscheduler.h	(Arbeitskopie)
-@@ -77,10 +77,10 @@
-    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 @@
-   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);
-Index: actionscheduler.cpp
-===================================================================
---- kmail/actionscheduler.cpp	(Revision 487211)
-+++ kmail/actionscheduler.cpp	(Arbeitskopie)
-@@ -570,7 +570,7 @@
-        (!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 @@
-   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 @@
-   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::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 @@
-     return sEnabled;
- }
- 
-+bool ActionScheduler::ignoreChanges( bool ignore )
-+{
-+  bool oldValue = mIgnore;
-+  mIgnore = ignore;
-+  return oldValue;
-+}
-+
- #include "actionscheduler.moc"
-Index: kmversion.h
-===================================================================
---- kmail/kmversion.h	(Revision 487211)
-+++ kmail/kmversion.h	(Arbeitskopie)
-@@ -3,6 +3,6 @@
- #ifndef kmversion_h
- #define kmversion_h
- 
--#define KMAIL_VERSION "1.9"
-+#define KMAIL_VERSION "1.9.1"
- 
- #endif /*kmversion_h*/
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index e00ad639d113..083a6748d9f7 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.0.tar.bz2) = e19a2a40e422ecd483884ce6e9ac8925
-SHA256 (KDE/kdepim-3.5.0.tar.bz2) = d7e3aa6783275df1ace9c3ab5164afd9017067bd9006b7af722fbe89062033c4
-SIZE (KDE/kdepim-3.5.0.tar.bz2) = 12865623
+MD5 (KDE/kdepim-3.5.1.tar.bz2) = 8e87c9cbe1f0c0f983f94d804a5bc8f9
+SHA256 (KDE/kdepim-3.5.1.tar.bz2) = 7705986fbfe8036ca1ead6c0e360a39325057bb3adb676c80b454619710b0995
+SIZE (KDE/kdepim-3.5.1.tar.bz2) = 12885355
diff --git a/deskutils/kdepim44/files/patch-kioslaves_mbox-readmbox.cc b/deskutils/kdepim44/files/patch-kioslaves_mbox-readmbox.cc
deleted file mode 100644
index 7da32fe405fb..000000000000
--- a/deskutils/kdepim44/files/patch-kioslaves_mbox-readmbox.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- kioslaves/mbox/readmbox.cc.orig	Sun Dec 18 15:43:49 2005
-+++ kioslaves/mbox/readmbox.cc	Sun Dec 18 15:58:15 2005
-@@ -16,6 +16,8 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
-+#include <config.h>
-+
- #include "readmbox.h"
- 
- #include "mbox.h"
-@@ -28,6 +30,10 @@
- #include <qfileinfo.h>
- #include <qstring.h>
- #include <qtextstream.h>
-+
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
- 
- #include <utime.h>
- 
diff --git a/deskutils/kdepim44/files/patch-post-3.5.0-kmail b/deskutils/kdepim44/files/patch-post-3.5.0-kmail
deleted file mode 100644
index 6e0112c92e74..000000000000
--- a/deskutils/kdepim44/files/patch-post-3.5.0-kmail
+++ /dev/null
@@ -1,211 +0,0 @@
-Index: kmcommands.cpp
-===================================================================
---- kmail/kmcommands.cpp	(Revision 487211)
-+++ kmail/kmcommands.cpp	(Arbeitskopie)
-@@ -1496,30 +1496,30 @@
- 
- 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 );
-+  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 );
-+    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
-+    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,
-Index: kmkernel.cpp
-===================================================================
---- kmail/kmkernel.cpp	(Revision 487211)
-+++ kmail/kmkernel.cpp	(Arbeitskopie)
-@@ -1432,11 +1432,11 @@
-   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*) ) );
-Index: kmfilteraction.cpp
-===================================================================
---- kmail/kmfilteraction.cpp	(Revision 487211)
-+++ kmail/kmfilteraction.cpp	(Arbeitskopie)
-@@ -1617,6 +1617,9 @@
-       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 @@
-       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" );
-Index: actionscheduler.h
-===================================================================
---- kmail/actionscheduler.h	(Revision 487211)
-+++ kmail/actionscheduler.h	(Arbeitskopie)
-@@ -77,10 +77,10 @@
-    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 @@
-   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);
-Index: actionscheduler.cpp
-===================================================================
---- kmail/actionscheduler.cpp	(Revision 487211)
-+++ kmail/actionscheduler.cpp	(Arbeitskopie)
-@@ -570,7 +570,7 @@
-        (!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 @@
-   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 @@
-   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::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 @@
-     return sEnabled;
- }
- 
-+bool ActionScheduler::ignoreChanges( bool ignore )
-+{
-+  bool oldValue = mIgnore;
-+  mIgnore = ignore;
-+  return oldValue;
-+}
-+
- #include "actionscheduler.moc"
-Index: kmversion.h
-===================================================================
---- kmail/kmversion.h	(Revision 487211)
-+++ kmail/kmversion.h	(Arbeitskopie)
-@@ -3,6 +3,6 @@
- #ifndef kmversion_h
- #define kmversion_h
- 
--#define KMAIL_VERSION "1.9"
-+#define KMAIL_VERSION "1.9.1"
- 
- #endif /*kmversion_h*/