summaryrefslogtreecommitdiff
path: root/misc/kdepim3/patches
diff options
context:
space:
mode:
authormarkd <markd>2005-07-30 11:33:15 +0000
committermarkd <markd>2005-07-30 11:33:15 +0000
commit507af55fd9c86de522bdcef90882a7619e9a1c40 (patch)
tree1eb2d6776206646dbb165d450a0fce33e059884e /misc/kdepim3/patches
parent47c87cb37a8e344fe1df31659b9fb2988e322f34 (diff)
downloadpkgsrc-507af55fd9c86de522bdcef90882a7619e9a1c40.tar.gz
Update to KDE 3.4.2
Changes: * KAlarm: Minimise KMix window if KMix is started by KAlarm when displaying a message. * KAlarm: Prevent session restoration displaying main windows which should be hidden. * KAlarm: Prevent alarm message windows being too large for screen. * KAlarm: Change --volume command line option short form from -v to -V to avoid clash with --version. * KNode: Fix %NAME and %EMAIL custom header macros * KNode: Support news server that don't understand the LIST OVERVIEW.FMT command * KNode: Fix subject field cursor regression * Akregator: Improve rendering speed of the article list drastically (by about factor 10) * Akregator: Fix opening of non-HTML files in external applications
Diffstat (limited to 'misc/kdepim3/patches')
-rw-r--r--misc/kdepim3/patches/patch-bf72
-rw-r--r--misc/kdepim3/patches/patch-bg12
-rw-r--r--misc/kdepim3/patches/patch-bh13
-rw-r--r--misc/kdepim3/patches/patch-bi13
-rw-r--r--misc/kdepim3/patches/patch-bj31
5 files changed, 0 insertions, 141 deletions
diff --git a/misc/kdepim3/patches/patch-bf b/misc/kdepim3/patches/patch-bf
deleted file mode 100644
index 6212f034e99..00000000000
--- a/misc/kdepim3/patches/patch-bf
+++ /dev/null
@@ -1,72 +0,0 @@
-$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
deleted file mode 100644
index c22ee86d8de..00000000000
--- a/misc/kdepim3/patches/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 032b1f8d9e5..00000000000
--- a/misc/kdepim3/patches/patch-bh
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 8656c43368a..00000000000
--- a/misc/kdepim3/patches/patch-bi
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 8cb92ff0976..00000000000
--- a/misc/kdepim3/patches/patch-bj
+++ /dev/null
@@ -1,31 +0,0 @@
-$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)
- {