aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils/kdepim44
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils/kdepim44')
-rw-r--r--deskutils/kdepim44/distinfo4
-rw-r--r--deskutils/kdepim44/files/patch-fix-imap-resource-type-RELEASE.diff48
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filter_oe.cxx49
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filter_oe.hxx18
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.cxx15
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.hxx19
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filters.hxx63
-rw-r--r--deskutils/kdepim44/files/patch-kpilot-prerelease-fix151
-rw-r--r--deskutils/kdepim44/files/patch-kresources_groupwise_soap_stdsoap2.h14
-rw-r--r--deskutils/kdepim44/pkg-plist8
10 files changed, 322 insertions, 67 deletions
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 32357495f9ba..94268d6201ee 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdepim-3.4.0.tar.bz2) = 7f8cc9a40c0190c5a6723f6325bcba06
-SIZE (KDE/kdepim-3.4.0.tar.bz2) = 11441545
+MD5 (KDE/kdepim-3.4.1.tar.bz2) = e5515aa230558bac8651e9cd9f8f9673
+SIZE (KDE/kdepim-3.4.1.tar.bz2) = 11345538
diff --git a/deskutils/kdepim44/files/patch-fix-imap-resource-type-RELEASE.diff b/deskutils/kdepim44/files/patch-fix-imap-resource-type-RELEASE.diff
deleted file mode 100644
index a2bb0ceb69bc..000000000000
--- a/deskutils/kdepim44/files/patch-fix-imap-resource-type-RELEASE.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: kabc/resourcekolab.cpp
-===================================================================
-RCS file: /home/kde/kdepim/kresources/kolab/kabc/resourcekolab.cpp,v
-retrieving revision 1.17
-diff -u -3 -p -r1.17 resourcekolab.cpp
---- kresources/kolab/kabc/resourcekolab.cpp 19 Jan 2005 15:18:12 -0000 1.17
-+++ kresources/kolab/kabc/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000
-@@ -80,7 +80,7 @@ KABC::ResourceKolab::ResourceKolab( cons
- Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
- mCachedSubresource( QString::null ), mLocked( false )
- {
-- setType( "kolab" );
-+ setType( "imap" );
- }
-
- KABC::ResourceKolab::~ResourceKolab()
-Index: kcal/resourcekolab.cpp
-===================================================================
-RCS file: /home/kde/kdepim/kresources/kolab/kcal/resourcekolab.cpp,v
-retrieving revision 1.26
-diff -u -3 -p -r1.26 resourcekolab.cpp
---- kresources/kolab/kcal/resourcekolab.cpp 22 Jan 2005 11:19:19 -0000 1.26
-+++ kresources/kolab/kcal/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000
-@@ -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() ) );
- }
-Index: knotes/resourcekolab.cpp
-===================================================================
-RCS file: /home/kde/kdepim/kresources/kolab/knotes/resourcekolab.cpp,v
-retrieving revision 1.12
-diff -u -3 -p -r1.12 resourcekolab.cpp
---- kresources/kolab/knotes/resourcekolab.cpp 21 Feb 2005 23:33:09 -0000 1.12
-+++ kresources/kolab/knotes/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000
-@@ -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/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.cxx b/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.cxx
new file mode 100644
index 000000000000..5fa379673746
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.cxx
@@ -0,0 +1,49 @@
+--- kmailcvt/filter_oe.cxx Mon May 23 14:12:15 2005
++++ kmailcvt/filter_oe.cxx Tue Jun 21 14:50:03 2005
+@@ -389,20 +389,20 @@
+ {
+ bool found = false;
+ bool foundFilename = false;
+- QString folder = "";
++ QString folder;
+ // we must do this because folder with more than one upper letter
+ // at start have maybe not a file named like the folder !!!
+ QString search = filename.lower();
+
+ while (!found)
+ {
+- for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
+- QString tmp[4] = *it;
++ for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
++ FolderStructure tmp = *it;
+ if(foundFilename == false) {
+ QString _tmpFileName = tmp[1];
+ _tmpFileName = _tmpFileName.lower();
+ if(_tmpFileName == search) {
+- folder.prepend( "-" + tmp[0]);
++ folder.prepend( tmp[0] + QString::fromLatin1("-") );
+ search = tmp[3];
+ foundFilename = true;
+ }
+@@ -410,18 +410,18 @@
+ QString _currentID = tmp[2];
+ QString _parentID = tmp[3];
+ if(_currentID == search) {
+- if(_parentID == "") { // this is the root of the folder
++ if(_parentID.isEmpty()) { // this is the root of the folder
+ found = true;
+ break;
+ } else {
+- folder.prepend( "-" + tmp[0]);
++ folder.prepend( tmp[0] + QString::fromLatin1("-") );
+ search = tmp[3];
+ }
+ }
+ }
+ }
+ // need to break the while loop maybe in some cases
+- if((foundFilename == false) && (folder == "")) return folder;
++ if((foundFilename == false) && (folder.isEmpty())) return folder;
+ }
+ return folder;
+ }
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.hxx b/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.hxx
new file mode 100644
index 000000000000..4abb9299b210
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.hxx
@@ -0,0 +1,18 @@
+Index: filter_oe.hxx
+===================================================================
+--- kmailcvt/filter_oe.hxx (revision 427509)
++++ kmailcvt/filter_oe.hxx (working copy)
+@@ -63,8 +63,12 @@
+ bool parsedFolder;
+ /** true if the current parsing file is the folder file */
+ bool currentIsFolderFile;
++
++ /** Folder structure here has 4 entries. */
++ typedef FolderStructureBase<4> FolderStructure;
+ /** matrix with information about the folder structure*/
+- QValueList<QString[4]> folderStructure;
++ QValueList<FolderStructure> folderStructure;
++ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
+
+ /** name of the current folder */
+ QString folderName;
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.cxx b/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.cxx
new file mode 100644
index 000000000000..2536ed1244ff
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.cxx
@@ -0,0 +1,15 @@
+Index: filter_pmail.cxx
+===================================================================
+--- kmailcvt/filter_pmail.cxx (revision 427509)
++++ kmailcvt/filter_pmail.cxx (working copy)
+@@ -325,8 +325,8 @@
+
+ while (!found)
+ {
+- for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
+- QString tmp[5] = *it;
++ for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
++ FolderStructure tmp = *it;
+
+ QString _ID = tmp[2];
+ if(_ID == search) { \ No newline at end of file
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.hxx b/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.hxx
new file mode 100644
index 000000000000..ac1e772c28ea
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.hxx
@@ -0,0 +1,19 @@
+Index: filter_pmail.hxx
+===================================================================
+--- kmailcvt/filter_pmail.hxx (revision 427509)
++++ kmailcvt/filter_pmail.hxx (working copy)
+@@ -50,8 +50,12 @@
+ QDir dir;
+ /** pointer to the info */
+ FilterInfo * inf;
+- /** QStringList with the foldernames, First String contains the ID, the second the folder */
+- QValueList<QString[5]> folderMatrix;
++
++ /** Folder structure here has 5 entries. */
++ typedef FolderStructureBase<5> FolderStructure;
++ /** List with the foldernames, First String contains the ID, the second the folder. Rest have no semantics at all but are essential anyway. */
++ QValueList<FolderStructure> folderMatrix;
++ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
+
+ bool folderParsed;
+ \ No newline at end of file
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filters.hxx b/deskutils/kdepim44/files/patch-kmailcvt-filters.hxx
new file mode 100644
index 000000000000..44a41ff10007
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kmailcvt-filters.hxx
@@ -0,0 +1,63 @@
+Index: filters.hxx
+===================================================================
+--- kmailcvt/filters.hxx (revision 427509)
++++ kmailcvt/filters.hxx (working copy)
+@@ -86,7 +86,58 @@
+ QString m_info;
+ };
+
++/** Glorified QString[N] for (a) understandability (b) older gcc
++* compatibility, see for instance
++* http://mail.kde.org/pipermail/kmail-devel/2005-April/017690.html
++*/
++template <unsigned int size> class FolderStructureBase
++{
++public:
++ typedef QString NString[size];
++ /** Constructor. Need a default constructor for QValueList. */
++ FolderStructureBase() {} ;
+
++ /** Constructor. Turn N QStrings into a folder structure
++ * description.
++ */
++ FolderStructureBase(const NString &s)
++ {
++ for(unsigned int i=0; i<size; i++) d[i]=s[i];
++ } ;
++
++ /** Copy Constructor. */
++ FolderStructureBase(const FolderStructureBase &s)
++ {
++ for(unsigned int i=0; i<size; i++) d[i]=s[i];
++ } ;
++
++ /** Assignment operator. Does the same thing as
++ * the copy constructor.
++ */
++ FolderStructureBase &operator =(const FolderStructureBase &s)
++ {
++ for(unsigned int i=0; i<size; i++) d[i]=s[i];
++ return *this;
++ } ;
++
++ /** Access the different fields. There doesn't seem to
++ * be a real semantics for the fields.
++ */
++ const QString operator [](unsigned int i) const
++ {
++ if (i<size) return d[i]; else return QString::null;
++ } ;
++
++ /** Access the different fields, for writing. */
++ QString &operator [](unsigned int i)
++ {
++ Q_ASSERT(i<size);
++ if (i<size) return d[i]; else return d[0];
++ } ;
++private:
++ QString d[size];
++} ;
++
+ #endif
+
+ // vim: ts=2 sw=2 et \ No newline at end of file
diff --git a/deskutils/kdepim44/files/patch-kpilot-prerelease-fix b/deskutils/kdepim44/files/patch-kpilot-prerelease-fix
new file mode 100644
index 000000000000..ec52774a7d7a
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kpilot-prerelease-fix
@@ -0,0 +1,151 @@
+Index: conduits/memofileconduit/memofile-conduit.cc
+===================================================================
+--- kpilot/conduits/memofileconduit/memofile-conduit.cc (.../tags/KDE/3.4.1/kdepim/kpilot) (revision 418726)
++++ kpilot/conduits/memofileconduit/memofile-conduit.cc (.../branches/KDE/3.4/kdepim/kpilot) (revision 418726)
+@@ -114,7 +114,7 @@
+ 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 @@
+ // 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 @@
+ }
+
+ _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;
+Index: conduits/memofileconduit/memofile-conduit.h
+===================================================================
+--- kpilot/conduits/memofileconduit/memofile-conduit.h (.../tags/KDE/3.4.1/kdepim/kpilot) (revision 418726)
++++ kpilot/conduits/memofileconduit/memofile-conduit.h (.../branches/KDE/3.4/kdepim/kpilot) (revision 418726)
+@@ -88,6 +88,7 @@
+
+ bool copyHHToPC();
+ bool copyPCToHH();
++ void deleteUnsyncedHHRecords();
+ bool sync();
+
+ int writeToPilot(Memofile * memofile);
+Index: lib/pilotDatabase.cc
+===================================================================
+--- kpilot/lib/pilotDatabase.cc (.../tags/KDE/3.4.1/kdepim/kpilot) (revision 418726)
++++ kpilot/lib/pilotDatabase.cc (.../branches/KDE/3.4/kdepim/kpilot) (revision 418726)
+@@ -185,7 +185,7 @@
+ 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;
+ }
+
+Index: lib/data/MemoDB.pdb
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: lib/data/MemoDB.pdb
+___________________________________________________________________
+Name: svn:mime-type
+ + application/octet-stream
+
+Index: lib/pilotLocalDatabase.cc
+===================================================================
+--- kpilot/lib/pilotLocalDatabase.cc (.../tags/KDE/3.4.1/kdepim/kpilot) (revision 418726)
++++ kpilot/lib/pilotLocalDatabase.cc (.../branches/KDE/3.4/kdepim/kpilot) (revision 418726)
+@@ -618,7 +618,7 @@
+
+ int count;
+ pi_file_get_entries(dbFile, &count);
+- if (count > 0)
++ if (count >= 0)
+ {
+ KPILOT_DELETE(d);
+ d = new Private(count);
+Index: lib/pilotDatabase.h
+===================================================================
+--- kpilot/lib/pilotDatabase.h (.../tags/KDE/3.4.1/kdepim/kpilot) (revision 418726)
++++ kpilot/lib/pilotDatabase.h (.../branches/KDE/3.4/kdepim/kpilot) (revision 418726)
+@@ -279,9 +279,12 @@
+ 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 @@
+ {
+ FUNCTIONSETUP;
+ unsigned char buffer[MAX_APPINFO_SIZE];
++ if (!d || !d->isDBOpen())
++ {
++ return -1;
++ }
+ int appLen = (*pack)(&fInfo, buffer, length());
+ if (appLen > 0)
+ {
diff --git a/deskutils/kdepim44/files/patch-kresources_groupwise_soap_stdsoap2.h b/deskutils/kdepim44/files/patch-kresources_groupwise_soap_stdsoap2.h
deleted file mode 100644
index 0997658eb3dc..000000000000
--- a/deskutils/kdepim44/files/patch-kresources_groupwise_soap_stdsoap2.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- kresources/groupwise/soap/stdsoap2.h 2004/12/03 17:15:43 1.2
-+++ kresources/groupwise/soap/stdsoap2.h 2005/04/28 13:00:14 1.2.2.2
-@@ -163,10 +163,6 @@
- # define HP_UX
- #endif
-
--#ifdef __alpha
--# define TRU64
--#endif
--
- #ifdef __MVS__
- # define OS390
- #endif
-
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index 1b7c5ff8bd23..62c4a8321ffc 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -27,7 +27,6 @@ bin/konsolekalendar
bin/kontact
bin/korgac
bin/korganizer
-bin/korganizerIn
bin/korn
bin/kpalmdoc
bin/kpilot
@@ -172,7 +171,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
@@ -499,7 +497,7 @@ lib/libakregatorprivate.la
lib/libakregatorprivate.so
lib/libgpgme++.la
lib/libgpgme++.so
-lib/libgpgme++.so.1
+lib/libgpgme++.so.2
lib/libkabc_groupdav.la
lib/libkabc_groupdav.so
lib/libkabc_groupdav.so.1
@@ -694,6 +692,9 @@ share/apps/akregator/articleviewer.rc
share/apps/akregator/eventsrc
share/apps/akregator/pageviewer.rc
share/apps/akregator/pics/akregator_flag.png
+share/apps/akregator/pics/kmmsgflag.png
+share/apps/akregator/pics/kmmsgnew.png
+share/apps/akregator/pics/kmmsgunseen.png
share/apps/kaddressbook/bookmark_xxportui.rc
share/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
share/apps/kaddressbook/csv-templates/kaddressbook.desktop
@@ -774,6 +775,7 @@ share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
share/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
share/apps/kconf_update/kmail-3.3b1-misc.pl
share/apps/kconf_update/kmail-3.4-misc.pl
+share/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
share/apps/kconf_update/kmail-pgpidentity.pl
share/apps/kconf_update/kmail-upd-identities.pl
share/apps/kconf_update/kmail.upd
generated by cgit (git 2.34.1) at 2024-11-24 19:19:27 +0800