Author: glen Date: Mon Jan 18 22:53:17 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated
---- Files affected:
packages/kdepim:
kdepim-branch.diff (1.69 -> 1.70)
---- Diffs:
================================================================
Index: packages/kdepim/kdepim-branch.diff
diff -u packages/kdepim/kdepim-branch.diff:1.69
packages/kdepim/kdepim-branch.diff:1.70
--- packages/kdepim/kdepim-branch.diff:1.69 Fri Jun 26 12:00:38 2009
+++ packages/kdepim/kdepim-branch.diff Mon Jan 18 23:53:12 2010
@@ -1,7 +1,7 @@
Index: akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
===================================================================
---- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
(.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
(.../branches/KDE/3.5/kdepim) (revision 987532)
+--- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
(.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
(.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -83,7 +83,7 @@
Comment[nn]=Programtillegg til Akregator
Comment[pl]=Wtyczka dla Akregatora
@@ -13,8 +13,8 @@
Comment[sk]=Modul pre Akregator
Index: akregator/src/akregator_plugin.desktop
===================================================================
---- akregator/src/akregator_plugin.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ akregator/src/akregator_plugin.desktop (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- akregator/src/akregator_plugin.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ akregator/src/akregator_plugin.desktop (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -39,7 +39,7 @@
Comment[nn]=Programtillegg til Akregator
Comment[pl]=Wtyczka dla Akregatora
@@ -26,8 +26,8 @@
Comment[sk]=Modul pre Akregator
Index: wizards/groupwarewizard.desktop
===================================================================
---- wizards/groupwarewizard.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ wizards/groupwarewizard.desktop (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- wizards/groupwarewizard.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ wizards/groupwarewizard.desktop (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -34,7 +34,7 @@
Name[nn]=KDE-vegvisar for gruppevare
Name[pl]=Asystent KDE Groupware
@@ -39,8 +39,8 @@
Name[sl]=Čarovnik za KDE Groupware
Index: kresources/scalix/kabc/scalix.desktop
===================================================================
---- kresources/scalix/kabc/scalix.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ kresources/scalix/kabc/scalix.desktop (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- kresources/scalix/kabc/scalix.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ kresources/scalix/kabc/scalix.desktop (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -5,6 +5,7 @@
Name[da]=Adressebog på Scalix-server via KMail
Name[de]=Adressbuch auf einem Scalix-Server via KMail
@@ -51,8 +51,8 @@
Name[is]=Vistfangaskrá á Scalix-þjóni gegnum KMail
Index: kresources/scalix/knotes/scalix.desktop
===================================================================
---- kresources/scalix/knotes/scalix.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ kresources/scalix/knotes/scalix.desktop (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- kresources/scalix/knotes/scalix.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ kresources/scalix/knotes/scalix.desktop (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -5,6 +5,7 @@
Name[da]=Noter på Scalix-server via KMail
Name[de]=Notizen auf einem Scalix-Server via KMail
@@ -63,8 +63,8 @@
Name[is]=Minnismiðar á Scalix-þjóni gegnum KMail
Index: kresources/scalix/kcal/scalix.desktop
===================================================================
---- kresources/scalix/kcal/scalix.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ kresources/scalix/kcal/scalix.desktop (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- kresources/scalix/kcal/scalix.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ kresources/scalix/kcal/scalix.desktop (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -5,6 +5,7 @@
Name[da]=Kalender på Scalix-server via KMail
Name[de]=Kalender auf einem Scalix-Server via KMail
@@ -83,8 +83,8 @@
Name[sr]=Календар на Scalix серверу преко KMail-а
Index: certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
===================================================================
---- certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
(.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
(.../branches/KDE/3.5/kdepim) (revision 987532)
+--- certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
(.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
(.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -54,7 +54,7 @@
mOpenPGPProtocol( 0 ),
mSMIMEProtocol( 0 )
@@ -96,8 +96,8 @@
Kleo::QGpgMEBackend::~QGpgMEBackend() {
Index: libkmime/kmime_util.cpp
===================================================================
---- libkmime/kmime_util.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ libkmime/kmime_util.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- libkmime/kmime_util.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ libkmime/kmime_util.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -195,8 +195,10 @@
{
str = KCodecs::base64Decode(str);
@@ -113,8 +113,8 @@
Index: kmail/editorwatcher.cpp
===================================================================
---- kmail/editorwatcher.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kmail/editorwatcher.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kmail/editorwatcher.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kmail/editorwatcher.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -32,8 +32,12 @@
#include <cassert>
@@ -129,10 +129,23 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
+Index: kmail/cachedimapjob.cpp
+===================================================================
+--- kmail/cachedimapjob.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kmail/cachedimapjob.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
+@@ -508,7 +508,7 @@
+ bool b = kmkernel->iCalIface().isResourceQuiet();
+ kmkernel->iCalIface().setResourceQuiet( true );
+
+- mFolder->take( i );
++ mFolder->takeTemporarily( i );
+ mFolder->addMsgKeepUID( mMsg );
+ mMsg->setTransferInProgress( false );
+
Index: kmail/kmail_config_composer.desktop
===================================================================
---- kmail/kmail_config_composer.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ kmail/kmail_config_composer.desktop (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- kmail/kmail_config_composer.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ kmail/kmail_config_composer.desktop (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -71,6 +71,7 @@
Comment[da]=Skabeloner & Generel opførsel
Comment[de]=Vorlagen und allgemeines Verhalten
@@ -143,8 +156,8 @@
Comment[et]=Mallid ja üldine käitumine
Index: kmail/kmcommands.cpp
===================================================================
---- kmail/kmcommands.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kmail/kmcommands.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kmail/kmcommands.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kmail/kmcommands.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -2414,7 +2414,8 @@
.arg( mUrl.prettyURL() ), QString::null, i18n("Execute"),
KStdGuiItem::cancel() ) != KMessageBox::Yes)
return Canceled;
@@ -155,11 +168,69 @@
}
else
return Failed;
+Index: kmail/kmfoldercachedimap.cpp
+===================================================================
+--- kmail/kmfoldercachedimap.cpp (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ kmail/kmfoldercachedimap.cpp (.../branches/KDE/3.5/kdepim)
(revision 1076825)
+@@ -471,7 +471,6 @@
+ uidMapDirty = false;
+ }
+
+-/* Reimplemented from KMFolderMaildir */
+ KMMessage* KMFolderCachedImap::take(int idx)
+ {
+ uidMapDirty = true;
+@@ -479,6 +478,11 @@
+ return KMFolderMaildir::take(idx);
+ }
+
++void KMFolderCachedImap::takeTemporarily( int idx )
++{
++ KMFolderMaildir::take( idx );
++}
++
+ // Add a message without clearing it's X-UID field.
+ int KMFolderCachedImap::addMsgInternal( KMMessage* msg, bool newMail,
+ int* index_return )
+@@ -1565,6 +1569,11 @@
+ job->start();
+ return true;
+ } else {
++
++ // Nothing to delete on the server, make sure the map is clear again.
++ // Normally this wouldn't be necessary, but there can be stale maps
because of
++ // https://issues.kolab.org/issue3833.
++ mDeletedUIDsSinceLastSync.clear();
+ return false;
+ }
+ }
Index: kmail/kmfoldercachedimap.h
===================================================================
---- kmail/kmfoldercachedimap.h (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kmail/kmfoldercachedimap.h (.../branches/KDE/3.5/kdepim) (revision
987532)
-@@ -213,8 +213,11 @@
+--- kmail/kmfoldercachedimap.h (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kmail/kmfoldercachedimap.h (.../branches/KDE/3.5/kdepim) (revision
1076825)
+@@ -182,8 +182,20 @@
+ /* Reimplemented from KMFolder. Moving is not supported, so aParent must be
0 */
+ virtual int rename(const QString& aName, KMFolderDir *aParent=0);
+
+- /* Reimplemented from KMFolderMaildir */
++ /**
++ * Reimplemented from KMFolderMaildir
++ * This deletes the message permanently, also from the server. For this,
rememberDeletion() is
++ * called, so that the message can be deleted from the server on the next
sync.
++ */
+ virtual KMMessage* take(int idx);
++
++ /**
++ * Like take(), only that the deletion is not remembered, i.e. the message
will not be deleted
++ * from the server.
++ * Calling this can cause inconsistencies, so make sure you re-add the
message later!
++ */
++ void takeTemporarily( int idx );
++
+ /* Reimplemented from KMFolderMaildir */
+ virtual int addMsg(KMMessage* msg, int* index_return = 0);
+ /* internal version that doesn't remove the X-UID header */
+@@ -213,8 +225,11 @@
void setSilentUpload( bool silent ) { mSilentUpload = silent; }
bool silentUpload() { return mSilentUpload; }
@@ -175,8 +246,8 @@
Index: kmail/configure.in.in
===================================================================
---- kmail/configure.in.in (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kmail/configure.in.in (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kmail/configure.in.in (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kmail/configure.in.in (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -57,8 +57,30 @@
AC_LANG_RESTORE
])
@@ -211,8 +282,8 @@
AC_MSG_RESULT(no)
Index: kmail/accountmanager.cpp
===================================================================
---- kmail/accountmanager.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kmail/accountmanager.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kmail/accountmanager.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kmail/accountmanager.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -7,6 +7,7 @@
#include "accountmanager.h"
@@ -235,8 +306,8 @@
}
Index: kmail/kmfoldertree.cpp
===================================================================
---- kmail/kmfoldertree.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kmail/kmfoldertree.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kmail/kmfoldertree.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kmail/kmfoldertree.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -432,6 +432,9 @@
connect(kmkernel->acctMgr(), SIGNAL(accountRemoved(KMAccount*)),
this, SLOT(slotAccountRemoved(KMAccount*)));
@@ -249,8 +320,8 @@
Index: kioslaves/sieve/sieve.cpp
===================================================================
---- kioslaves/sieve/sieve.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kioslaves/sieve/sieve.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kioslaves/sieve/sieve.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kioslaves/sieve/sieve.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1290,7 +1290,7 @@
const int minor = regExp.cap( 2 ).toInt();
const int patch = regExp.cap( 3 ).toInt();
@@ -262,8 +333,8 @@
}
Index: libkdenetwork/gpgmepp/context.cpp
===================================================================
---- libkdenetwork/gpgmepp/context.cpp (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkdenetwork/gpgmepp/context.cpp (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkdenetwork/gpgmepp/context.cpp (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkdenetwork/gpgmepp/context.cpp (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -53,6 +53,10 @@
namespace GpgME {
@@ -277,8 +348,8 @@
}
Index: libkdenetwork/gpgmepp/Makefile.am
===================================================================
---- libkdenetwork/gpgmepp/Makefile.am (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkdenetwork/gpgmepp/Makefile.am (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkdenetwork/gpgmepp/Makefile.am (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkdenetwork/gpgmepp/Makefile.am (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -46,7 +46,7 @@
# (Interfaces added/removed/changed: CURRENT++, REVISION=0)
# (Interfaces added: AGE++)
@@ -290,8 +361,8 @@
Index: libkdenetwork/gpgmepp/context.h
===================================================================
---- libkdenetwork/gpgmepp/context.h (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkdenetwork/gpgmepp/context.h (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkdenetwork/gpgmepp/context.h (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkdenetwork/gpgmepp/context.h (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -287,6 +287,8 @@
//
//
@@ -303,8 +374,8 @@
KDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true );
Index: kalarm/alarmevent.cpp
===================================================================
---- kalarm/alarmevent.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/alarmevent.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/alarmevent.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/alarmevent.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* alarmevent.cpp - represents calendar alarms and events
@@ -344,8 +415,8 @@
/******************************************************************************
Index: kalarm/messagewin.cpp
===================================================================
---- kalarm/messagewin.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/messagewin.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/messagewin.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/messagewin.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* messagewin.cpp - displays an alarm message
@@ -439,8 +510,8 @@
* Gets the mime type of a text file from not only its extension (as per
Index: kalarm/templatepickdlg.cpp
===================================================================
---- kalarm/templatepickdlg.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/templatepickdlg.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/templatepickdlg.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/templatepickdlg.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* templatepickdlg.cpp - dialogue to choose an alarm template
@@ -462,8 +533,8 @@
slotSelectionChanged(); // enable or disable the OK button
Index: kalarm/editdlg.cpp
===================================================================
---- kalarm/editdlg.cpp (.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ kalarm/editdlg.cpp (.../branches/KDE/3.5/kdepim) (revision 987532)
+--- kalarm/editdlg.cpp (.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ kalarm/editdlg.cpp (.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -1522,7 +1522,8 @@
bool limit = true;
int repeatInterval;
@@ -476,8 +547,8 @@
if (!mExpiredRecurrence)
Index: kalarm/functions.h
===================================================================
---- kalarm/functions.h (.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ kalarm/functions.h (.../branches/KDE/3.5/kdepim) (revision 987532)
+--- kalarm/functions.h (.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ kalarm/functions.h (.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -1,7 +1,7 @@
/*
* functions.h - miscellaneous functions
@@ -497,8 +568,8 @@
int localeFirstDayOfWeek();
Index: kalarm/kalarm.h
===================================================================
---- kalarm/kalarm.h (.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ kalarm/kalarm.h (.../branches/KDE/3.5/kdepim) (revision 987532)
+--- kalarm/kalarm.h (.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ kalarm/kalarm.h (.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -26,7 +26,7 @@
#include <config.h>
#endif
@@ -510,8 +581,8 @@
#include <kdeversion.h>
Index: kalarm/Changelog
===================================================================
---- kalarm/Changelog (.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ kalarm/Changelog (.../branches/KDE/3.5/kdepim) (revision 987532)
+--- kalarm/Changelog (.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ kalarm/Changelog (.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -1,6 +1,23 @@
KAlarm Change Log
@@ -539,8 +610,8 @@
- Expand font selection control when dialogue is expanded.
Index: kalarm/kalarmapp.cpp
===================================================================
---- kalarm/kalarmapp.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/kalarmapp.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/kalarmapp.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/kalarmapp.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* kalarmapp.cpp - the KAlarm application object
@@ -566,8 +637,8 @@
break;
Index: kalarm/lib/spinbox.cpp
===================================================================
---- kalarm/lib/spinbox.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/lib/spinbox.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/lib/spinbox.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/lib/spinbox.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* spinbox.cpp - spin box with read-only option and shift-click step value
@@ -747,8 +818,8 @@
if (adjust)
Index: kalarm/lib/spinbox2private.h
===================================================================
---- kalarm/lib/spinbox2private.h (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ kalarm/lib/spinbox2private.h (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- kalarm/lib/spinbox2private.h (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ kalarm/lib/spinbox2private.h (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -1,7 +1,7 @@
/*
* spinbox2private.h - private classes for SpinBox2 (for Qt 3)
@@ -791,8 +862,8 @@
bool mReadOnly; // value cannot be changed
Index: kalarm/lib/spinbox2.cpp
===================================================================
---- kalarm/lib/spinbox2.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/lib/spinbox2.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/lib/spinbox2.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/lib/spinbox2.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* spinbox2.cpp - spin box with extra pair of spin buttons (for Qt 3)
@@ -922,8 +993,8 @@
Index: kalarm/lib/dateedit.cpp
===================================================================
---- kalarm/lib/dateedit.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/lib/dateedit.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/lib/dateedit.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/lib/dateedit.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -61,11 +61,13 @@
{
pastLimitMessage(mMinDate, mMinDateErrString,
@@ -940,8 +1011,8 @@
}
Index: kalarm/lib/spinbox.h
===================================================================
---- kalarm/lib/spinbox.h (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/lib/spinbox.h (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/lib/spinbox.h (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/lib/spinbox.h (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* spinbox.h - spin box with shift-click step value and read-only option
@@ -962,8 +1033,8 @@
Index: kalarm/recurrenceedit.cpp
===================================================================
---- kalarm/recurrenceedit.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/recurrenceedit.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/recurrenceedit.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/recurrenceedit.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1224,11 +1224,7 @@
DailyRule::DailyRule(bool readOnly, QWidget* parent, const char* name)
: DayWeekRule(i18n("day(s)"),
@@ -978,8 +1049,8 @@
Index: kalarm/functions.cpp
===================================================================
---- kalarm/functions.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/functions.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/functions.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/functions.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* functions.cpp - miscellaneous functions
@@ -1100,8 +1171,8 @@
+#endif // HAVE_XTEST
Index: kalarm/alarmcalendar.cpp
===================================================================
---- kalarm/alarmcalendar.cpp (.../tags/KDE/3.5.10/kdepim) (revision
987532)
-+++ kalarm/alarmcalendar.cpp (.../branches/KDE/3.5/kdepim) (revision
987532)
+--- kalarm/alarmcalendar.cpp (.../tags/KDE/3.5.10/kdepim) (revision
1076825)
++++ kalarm/alarmcalendar.cpp (.../branches/KDE/3.5/kdepim) (revision
1076825)
@@ -1,7 +1,7 @@
/*
* alarmcalendar.cpp - KAlarm calendar file access
@@ -1155,8 +1226,8 @@
Event* e = *it;
Index: kalarm/Makefile.am
===================================================================
---- kalarm/Makefile.am (.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ kalarm/Makefile.am (.../branches/KDE/3.5/kdepim) (revision 987532)
+--- kalarm/Makefile.am (.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ kalarm/Makefile.am (.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -33,7 +33,7 @@
$(top_builddir)/kalarm/kalarmd/libkalarmd.la \
$(top_builddir)/libkdepim/libkdepim.la \
@@ -1168,8 +1239,8 @@
editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \
Index: kaddressbook/xxport/vcard_xxport.desktop
===================================================================
---- kaddressbook/xxport/vcard_xxport.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ kaddressbook/xxport/vcard_xxport.desktop (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- kaddressbook/xxport/vcard_xxport.desktop (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ kaddressbook/xxport/vcard_xxport.desktop (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -37,7 +37,7 @@
Name[nn]=KAB vCard XXPort programtillegg
Name[pl]=Wtyczka KAB do importu/eksportu z/do formatu vCard
@@ -1181,8 +1252,8 @@
Name[sl]=Vstavek KAB vCard XXPort
Index: kaddressbook/features/distributionlistng.desktop
===================================================================
---- kaddressbook/features/distributionlistng.desktop
(.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ kaddressbook/features/distributionlistng.desktop
(.../branches/KDE/3.5/kdepim) (revision 987532)
+--- kaddressbook/features/distributionlistng.desktop
(.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ kaddressbook/features/distributionlistng.desktop
(.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -6,6 +6,7 @@
Name[da]=Næste generations-plugin til KAB-Distribution-liste
Name[de]=Verteilerlisten-Modul für neues Adressbuch
@@ -1193,8 +1264,8 @@
Name[is]=Næstu kynslóðar íforrit fyrir KAB dreifilista
Index: Makefile.am.in
===================================================================
---- Makefile.am.in (.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ Makefile.am.in (.../branches/KDE/3.5/kdepim) (revision 987532)
+--- Makefile.am.in (.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ Makefile.am.in (.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -38,6 +38,7 @@
COMPILE_BEFORE_akregator = libkdepim
COMPILE_BEFORE_knotes = libkdepim
@@ -1205,8 +1276,8 @@
DISTCLEANFILES = inst-apps
Index: libkholidays/holidays/holiday_ja
===================================================================
---- libkholidays/holidays/holiday_ja (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkholidays/holidays/holiday_ja (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkholidays/holidays/holiday_ja (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkholidays/holidays/holiday_ja (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -1,80 +0,0 @@
-:
-: Japanese holiday file. Copy to ~/.holiday
@@ -1291,7 +1362,7 @@
Index: libkholidays/holidays/holiday_jp
===================================================================
--- libkholidays/holidays/holiday_jp (.../tags/KDE/3.5.10/kdepim)
(revision 0)
-+++ libkholidays/holidays/holiday_jp (.../branches/KDE/3.5/kdepim)
(revision 987532)
++++ libkholidays/holidays/holiday_jp (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -0,0 +1,80 @@
+:
+: Japanese holiday file. Copy to ~/.holiday
@@ -1382,8 +1453,8 @@
Index: libkholidays/holidays/holiday_pl
===================================================================
---- libkholidays/holidays/holiday_pl (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkholidays/holidays/holiday_pl (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkholidays/holidays/holiday_pl (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkholidays/holidays/holiday_pl (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -2,36 +2,37 @@
: sob kwi 10 15:47:14 CEST 1999
: by Krzysztof P. Jasiutowicz <[email protected]>
@@ -1443,8 +1514,8 @@
"Początek wiosny" on march 21
Index: libkholidays/holidays/holiday_ru
===================================================================
---- libkholidays/holidays/holiday_ru (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkholidays/holidays/holiday_ru (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkholidays/holidays/holiday_ru (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkholidays/holidays/holiday_ru (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -106,6 +106,6 @@
blue "День Конституции Российской Федерации" on 12.12
blue "День Ракетных войск стратегического назначения" on 17.12
@@ -1455,8 +1526,8 @@
blue "День спасателя Российской Федерации" on 27.12
Index: libkholidays/holidays/holiday_ar
===================================================================
---- libkholidays/holidays/holiday_ar (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkholidays/holidays/holiday_ar (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkholidays/holidays/holiday_ar (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkholidays/holidays/holiday_ar (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -7,6 +7,7 @@
: Related national laws
: http://www.uncu.edu.ar/contenido/skins/unc/download/Ley%2023555.pdf
@@ -1479,8 +1550,8 @@
Index: libkholidays/holidays/holiday_se
===================================================================
---- libkholidays/holidays/holiday_se (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkholidays/holidays/holiday_se (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkholidays/holidays/holiday_se (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkholidays/holidays/holiday_se (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -23,8 +23,8 @@
:Before 2005
:black "Nationaldagen" black on 6.6
@@ -1494,8 +1565,8 @@
black "1. Advent" on sunday before 24.12 minus 21 days
Index: libkholidays/holidays/Makefile.am
===================================================================
---- libkholidays/holidays/Makefile.am (.../tags/KDE/3.5.10/kdepim)
(revision 987532)
-+++ libkholidays/holidays/Makefile.am (.../branches/KDE/3.5/kdepim)
(revision 987532)
+--- libkholidays/holidays/Makefile.am (.../tags/KDE/3.5.10/kdepim)
(revision 1076825)
++++ libkholidays/holidays/Makefile.am (.../branches/KDE/3.5/kdepim)
(revision 1076825)
@@ -8,7 +8,7 @@
holiday_ch holiday_cz holiday_de holiday_dk holiday_ee \
holiday_es holiday_fi holiday_fr holiday_frswiss holiday_gb \
@@ -1507,8 +1578,8 @@
holiday_no holiday_nz holiday_pl holiday_pt holiday_py \
Index: configure.in.in
===================================================================
---- configure.in.in (.../tags/KDE/3.5.10/kdepim) (revision 987532)
-+++ configure.in.in (.../branches/KDE/3.5/kdepim) (revision 987532)
+--- configure.in.in (.../tags/KDE/3.5.10/kdepim) (revision 1076825)
++++ configure.in.in (.../branches/KDE/3.5/kdepim) (revision 1076825)
@@ -11,6 +11,12 @@
if test "$x_includes" != "NONE"; then
AC_DEFINE(HAVE_X11_HEADERS,1,Define if you have X11 header files)
@@ -1525,7 +1596,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kdepim-branch.diff?r1=1.69&r2=1.70&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
