SOURCES: kdepim-branch.diff - updated
arekm
arekm at pld-linux.org
Thu Aug 16 20:44:56 CEST 2007
Author: arekm Date: Thu Aug 16 18:44:56 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdepim-branch.diff (1.50 -> 1.51)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.50 SOURCES/kdepim-branch.diff:1.51
--- SOURCES/kdepim-branch.diff:1.50 Sun Aug 12 21:46:40 2007
+++ SOURCES/kdepim-branch.diff Thu Aug 16 20:44:51 2007
@@ -1,7 +1,7 @@
Index: akregator/src/akregator.desktop
===================================================================
---- akregator/src/akregator.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ akregator/src/akregator.desktop (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- akregator/src/akregator.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ akregator/src/akregator.desktop (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -98,5 +98,5 @@
Comment[zh_CN]=KDE RSS 新闻收集器
Comment[zh_TW]=KDE 的 RSS 收集器
@@ -11,8 +11,8 @@
X-DCOP-ServiceType=Unique
Index: kmobile/kioslave/mimetypes/mobile_notes.desktop
===================================================================
---- kmobile/kioslave/mimetypes/mobile_notes.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmobile/kioslave/mimetypes/mobile_notes.desktop (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmobile/kioslave/mimetypes/mobile_notes.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmobile/kioslave/mimetypes/mobile_notes.desktop (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -33,7 +33,7 @@
Comment[ms]=Nota dalam Peranti Mudah Alih
Comment[nb]=Notater i mobil enhet
@@ -24,8 +24,8 @@
Comment[pl]=Notatki w urządzeniu przenośnym
Index: wizards/groupwarewizard.desktop
===================================================================
---- wizards/groupwarewizard.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ wizards/groupwarewizard.desktop (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- wizards/groupwarewizard.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ wizards/groupwarewizard.desktop (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -48,4 +48,4 @@
Icon=kontact
Terminal=false
@@ -34,8 +34,8 @@
+Categories=Qt;KDE;X-KDE-Utilities-PIM;Office;Network;Email;
Index: wizards/kmailchanges.h
===================================================================
---- wizards/kmailchanges.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ wizards/kmailchanges.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- wizards/kmailchanges.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ wizards/kmailchanges.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -25,6 +25,10 @@
#include <kconfigpropagator.h>
#include <kconfig.h>
@@ -69,8 +69,8 @@
class CreateDisconnectedImapAccount : public CreateImapAccount
Index: wizards/kmailchanges.cpp
===================================================================
---- wizards/kmailchanges.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ wizards/kmailchanges.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- wizards/kmailchanges.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ wizards/kmailchanges.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -30,6 +30,8 @@
#include <identity.h>
#include <kdebug.h>
@@ -171,8 +171,8 @@
+}
Index: kresources/egroupware/xmlrpciface.h
===================================================================
---- kresources/egroupware/xmlrpciface.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/egroupware/xmlrpciface.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/egroupware/xmlrpciface.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/egroupware/xmlrpciface.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -90,8 +90,8 @@
template <typename T>
@@ -186,8 +186,8 @@
public slots:
Index: kresources/groupwise/kabc_resourcegroupwise.cpp
===================================================================
---- kresources/groupwise/kabc_resourcegroupwise.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/groupwise/kabc_resourcegroupwise.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/groupwise/kabc_resourcegroupwise.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/groupwise/kabc_resourcegroupwise.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -648,7 +648,9 @@
return InSync;
}
@@ -201,8 +201,8 @@
kdDebug() << " Fallthrough - no fetched SAB exists yet, refresh" << endl;
Index: kresources/groupwise/kabc_resourcegroupwise.h
===================================================================
---- kresources/groupwise/kabc_resourcegroupwise.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/groupwise/kabc_resourcegroupwise.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/groupwise/kabc_resourcegroupwise.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/groupwise/kabc_resourcegroupwise.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -73,7 +73,7 @@
bool asyncLoad();
bool save( Ticket * );
@@ -214,8 +214,8 @@
* Clears the cached data, in memory and on disk
Index: kresources/groupwise/soap/stdsoap2.h
===================================================================
---- kresources/groupwise/soap/stdsoap2.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/groupwise/soap/stdsoap2.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/groupwise/soap/stdsoap2.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/groupwise/soap/stdsoap2.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -547,7 +547,7 @@
/* Portability: define SOAP_SOCKLEN_T */
#if defined(SOCKLEN_T)
@@ -227,8 +227,8 @@
# define SOAP_SOCKLEN_T int
Index: kresources/groupwise/soap/groupwiseserver.cpp
===================================================================
---- kresources/groupwise/soap/groupwiseserver.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/groupwise/soap/groupwiseserver.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/groupwise/soap/groupwiseserver.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/groupwise/soap/groupwiseserver.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -46,6 +46,7 @@
#include "incidenceconverter.h"
#include "kcal_resourcegroupwise.h"
@@ -323,8 +323,8 @@
m_sock->flush();
Index: kresources/groupwise/soap/Makefile.am
===================================================================
---- kresources/groupwise/soap/Makefile.am (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/groupwise/soap/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/groupwise/soap/Makefile.am (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/groupwise/soap/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -11,13 +11,13 @@
$(top_builddir)/libkdepim/libkdepim.la
soapdebug_SOURCES = soapdebug.cpp
@@ -344,8 +344,8 @@
# make a header file from the wsdl
Index: kresources/kolab/kabc/resourcekolab.cpp
===================================================================
---- kresources/kolab/kabc/resourcekolab.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/kabc/resourcekolab.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/kabc/resourcekolab.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/kabc/resourcekolab.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -507,7 +507,8 @@
void KABC::ResourceKolab::fromKMailAddSubresource( const QString& type,
const QString& subResource,
@@ -358,8 +358,8 @@
Index: kresources/kolab/kabc/resourcekolab.h
===================================================================
---- kresources/kolab/kabc/resourcekolab.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/kabc/resourcekolab.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/kabc/resourcekolab.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/kabc/resourcekolab.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -107,7 +107,8 @@
// Listen to KMail changes in the amount of sub resources
@@ -372,8 +372,8 @@
bool fromKMailAddIncidence( const QString& type, const QString& resource,
Index: kresources/kolab/knotes/resourcekolab.cpp
===================================================================
---- kresources/kolab/knotes/resourcekolab.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/knotes/resourcekolab.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/knotes/resourcekolab.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/knotes/resourcekolab.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -328,7 +328,8 @@
void ResourceKolab::fromKMailAddSubresource( const QString& type,
const QString& subResource,
@@ -386,8 +386,8 @@
// Not ours
Index: kresources/kolab/knotes/resourcekolab.h
===================================================================
---- kresources/kolab/knotes/resourcekolab.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/knotes/resourcekolab.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/knotes/resourcekolab.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/knotes/resourcekolab.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -88,7 +88,8 @@
/// Listen to KMail changes in the amount of sub resources
@@ -400,8 +400,8 @@
void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
Index: kresources/kolab/shared/resourcekolabbase.h
===================================================================
---- kresources/kolab/shared/resourcekolabbase.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/shared/resourcekolabbase.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/shared/resourcekolabbase.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/shared/resourcekolabbase.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -90,7 +90,8 @@
virtual void fromKMailAddSubresource( const QString& type,
const QString& resource,
@@ -414,8 +414,8 @@
Index: kresources/kolab/shared/subresource.cpp
===================================================================
---- kresources/kolab/shared/subresource.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/shared/subresource.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/shared/subresource.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/shared/subresource.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -34,13 +34,21 @@
using namespace Kolab;
@@ -460,8 +460,8 @@
mWritable = writable;
Index: kresources/kolab/shared/kmailconnection.h
===================================================================
---- kresources/kolab/shared/kmailconnection.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/shared/kmailconnection.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/shared/kmailconnection.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/shared/kmailconnection.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -59,7 +59,9 @@
void fromKMailDelIncidence( const QString& type, const QString& resource,
const QString& xml );
@@ -475,8 +475,8 @@
const QString& folder );
Index: kresources/kolab/shared/subresource.h
===================================================================
---- kresources/kolab/shared/subresource.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/shared/subresource.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/shared/subresource.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/shared/subresource.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -50,6 +50,9 @@
SubResource( bool active, bool writable, const QString& label,
@@ -508,8 +508,8 @@
// This is just for the abc plugin. But as long as only this is here,
Index: kresources/kolab/shared/kmailconnection.cpp
===================================================================
---- kresources/kolab/shared/kmailconnection.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/shared/kmailconnection.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/shared/kmailconnection.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/shared/kmailconnection.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -98,8 +98,8 @@
if ( !connectKMailSignal( "signalRefresh(QString,QString)",
"fromKMailRefresh(QString,QString)" ) )
@@ -546,8 +546,8 @@
void KMailConnection::fromKMailDelSubresource( const QString& type,
Index: kresources/kolab/kcal/resourcekolab.cpp
===================================================================
---- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -67,7 +67,8 @@
ResourceKolab::ResourceKolab( const KConfig *config )
@@ -663,8 +663,8 @@
}
Index: kresources/kolab/kcal/incidence.cpp
===================================================================
---- kresources/kolab/kcal/incidence.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/kcal/incidence.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/kcal/incidence.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/kcal/incidence.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -42,12 +42,10 @@
using namespace Kolab;
@@ -681,8 +681,8 @@
Incidence::~Incidence()
Index: kresources/kolab/kcal/resourcekolab.h
===================================================================
---- kresources/kolab/kcal/resourcekolab.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/kcal/resourcekolab.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/kcal/resourcekolab.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/kcal/resourcekolab.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -110,7 +110,8 @@
/// Listen to KMail changes in the amount of sub resources
@@ -717,8 +717,8 @@
QString configFile() const {
Index: kresources/kolab/kcal/incidence.h
===================================================================
---- kresources/kolab/kcal/incidence.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/kolab/kcal/incidence.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/kolab/kcal/incidence.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/kolab/kcal/incidence.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -73,7 +73,10 @@
QString role;
};
@@ -733,8 +733,8 @@
void saveTo( KCal::Incidence* incidence );
Index: kresources/birthdays/resourcekabc.cpp
===================================================================
---- kresources/birthdays/resourcekabc.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kresources/birthdays/resourcekabc.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kresources/birthdays/resourcekabc.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kresources/birthdays/resourcekabc.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -200,8 +200,8 @@
Alarm* vAlarm = ev->newAlarm();
vAlarm->setText(summary);
@@ -759,8 +759,8 @@
Index: certmanager/kleopatra_import.desktop
===================================================================
---- certmanager/kleopatra_import.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ certmanager/kleopatra_import.desktop (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- certmanager/kleopatra_import.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ certmanager/kleopatra_import.desktop (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -9,6 +9,6 @@
Exec=kleopatra --import-certificate %u
#Icon=kleopatra
@@ -771,8 +771,8 @@
X-KDE-StartupNotify=true
Index: certmanager/certificateinfowidgetimpl.cpp
===================================================================
---- certmanager/certificateinfowidgetimpl.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ certmanager/certificateinfowidgetimpl.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- certmanager/certificateinfowidgetimpl.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ certmanager/certificateinfowidgetimpl.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -267,6 +267,7 @@
if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) {
QString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) );
@@ -783,8 +783,8 @@
Index: certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
===================================================================
---- certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -306,7 +306,7 @@
}
else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115)
@@ -796,8 +796,8 @@
}
Index: certmanager/lib/ui/dnattributeorderconfigwidget.cpp
===================================================================
---- certmanager/lib/ui/dnattributeorderconfigwidget.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ certmanager/lib/ui/dnattributeorderconfigwidget.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- certmanager/lib/ui/dnattributeorderconfigwidget.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ certmanager/lib/ui/dnattributeorderconfigwidget.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -105,9 +105,9 @@
d->currentLV->setSorting( -1 );
glay->addWidget( d->currentLV, row, 2 );
@@ -812,8 +812,8 @@
d->placeHolderItem = new QListViewItem( d->availableLV, "_X_", i18n("All others") );
Index: libkpgp/kpgpui.cpp
===================================================================
---- libkpgp/kpgpui.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ libkpgp/kpgpui.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- libkpgp/kpgpui.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ libkpgp/kpgpui.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -304,8 +304,8 @@
resize( dialogSize );
@@ -827,8 +827,8 @@
mKeyGoodPix = new QPixmap( UserIcon("key_ok") );
Index: libkmime/boolflags.cpp
===================================================================
---- libkmime/boolflags.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ libkmime/boolflags.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- libkmime/boolflags.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ libkmime/boolflags.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -28,7 +28,7 @@
n=0;
}
@@ -840,8 +840,8 @@
Index: karm/ktimewidget.cpp
===================================================================
---- karm/ktimewidget.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ karm/ktimewidget.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- karm/ktimewidget.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ karm/ktimewidget.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -30,9 +30,6 @@
if ( ! ok )
return Invalid;
@@ -854,8 +854,8 @@
else
Index: karm/support/karm.desktop
===================================================================
---- karm/support/karm.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ karm/support/karm.desktop (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- karm/support/karm.desktop (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ karm/support/karm.desktop (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -77,4 +77,4 @@
Terminal=false
X-KDE-StartupNotify=true
@@ -864,8 +864,8 @@
+Categories=Qt;KDE;X-KDE-Utilities-PIM;Office;Calendar;
Index: libkpimexchange/core/exchangemonitor.cpp
===================================================================
---- libkpimexchange/core/exchangemonitor.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ libkpimexchange/core/exchangemonitor.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- libkpimexchange/core/exchangemonitor.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ libkpimexchange/core/exchangemonitor.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -109,12 +109,12 @@
}
@@ -883,8 +883,8 @@
}
Index: kdgantt/KDGanttView.cpp
===================================================================
---- kdgantt/KDGanttView.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kdgantt/KDGanttView.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kdgantt/KDGanttView.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kdgantt/KDGanttView.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -4,7 +4,7 @@
*/
@@ -924,8 +924,8 @@
void KDGanttView::slotCurrentChanged ( QListViewItem * item )
Index: kdgantt/KDGanttViewSubwidgets.cpp
===================================================================
---- kdgantt/KDGanttViewSubwidgets.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kdgantt/KDGanttViewSubwidgets.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kdgantt/KDGanttViewSubwidgets.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kdgantt/KDGanttViewSubwidgets.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -58,7 +58,8 @@
#include <kcalendarsystem.h>
#include <kdebug.h>
@@ -957,8 +957,8 @@
}
Index: kdgantt/KDGanttView.h
===================================================================
---- kdgantt/KDGanttView.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kdgantt/KDGanttView.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kdgantt/KDGanttView.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kdgantt/KDGanttView.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -4,7 +4,7 @@
*/
@@ -978,8 +978,8 @@
void addTickLeft();
Index: kmail/kmfoldersearch.h
===================================================================
---- kmail/kmfoldersearch.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/kmfoldersearch.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/kmfoldersearch.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/kmfoldersearch.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -173,7 +173,7 @@
virtual int open(const char *owner);
virtual int canAccess();
@@ -991,8 +991,8 @@
virtual bool isReadOnly() const;
Index: kmail/folderstorage.h
===================================================================
---- kmail/folderstorage.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/folderstorage.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/folderstorage.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/folderstorage.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -256,7 +256,8 @@
/** Close folder. If force is TRUE the files are closed even if
@@ -1005,8 +1005,8 @@
Currently used for KMFolderSearch and the background tasks like expiry. */
Index: kmail/kmail.antispamrc
===================================================================
---- kmail/kmail.antispamrc (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/kmail.antispamrc (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/kmail.antispamrc (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/kmail.antispamrc (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -22,8 +22,8 @@
ScoreName=Spamassassin
ScoreHeader=X-Spam-Status
@@ -1052,8 +1052,8 @@
Index: kmail/expirejob.cpp
===================================================================
---- kmail/expirejob.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/expirejob.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/expirejob.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/expirejob.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -125,7 +125,7 @@
const KMMsgBase *mb = storage->getMsgBase( mCurrentIndex );
if (mb == 0)
@@ -1065,8 +1065,8 @@
Index: kmail/imapaccountbase.cpp
===================================================================
---- kmail/imapaccountbase.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/imapaccountbase.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/imapaccountbase.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/imapaccountbase.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -81,6 +81,8 @@
ImapAccountBase::ImapAccountBase( AccountManager * parent, const QString & name, uint id )
@@ -1078,8 +1078,8 @@
mCountLastUnread( 0 ),
Index: kmail/kmailicalifaceimpl.cpp
===================================================================
---- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -52,6 +52,7 @@
#include "accountmanager.h"
#include "kmfoldercachedimap.h"
@@ -1225,8 +1225,8 @@
mResourceQuiet = q;
Index: kmail/kmheaders.cpp
===================================================================
---- kmail/kmheaders.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/kmheaders.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/kmheaders.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/kmheaders.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -2077,7 +2077,9 @@
void KMHeaders::resetCurrentTime()
{
@@ -1240,8 +1240,8 @@
//-----------------------------------------------------------------------------
Index: kmail/khtmlparthtmlwriter.cpp
===================================================================
---- kmail/khtmlparthtmlwriter.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/khtmlparthtmlwriter.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/khtmlparthtmlwriter.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/khtmlparthtmlwriter.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -49,7 +49,7 @@
KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part,
QObject * parent, const char * name )
@@ -1254,7 +1254,7 @@
Index: kmail/kmail.antispamrc-HOWTO
===================================================================
--- kmail/kmail.antispamrc-HOWTO (.../tags/KDE/3.5.7/kdepim) (wersja 0)
-+++ kmail/kmail.antispamrc-HOWTO (.../branches/KDE/3.5/kdepim) (wersja 699343)
++++ kmail/kmail.antispamrc-HOWTO (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -0,0 +1,154 @@
+
+HOWTO for setting up a KMail antispam wizard configuration entry
@@ -1412,8 +1412,8 @@
+
Index: kmail/bodyvisitor.cpp
===================================================================
---- kmail/bodyvisitor.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/bodyvisitor.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/bodyvisitor.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/bodyvisitor.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -45,6 +45,7 @@
mBasicList += "APPLICATION/PKCS7-SIGNATURE";
// groupware
@@ -1477,8 +1477,8 @@
}
Index: kmail/kmailicalIface.h
===================================================================
---- kmail/kmailicalIface.h (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/kmailicalIface.h (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/kmailicalIface.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/kmailicalIface.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -51,11 +51,12 @@
struct SubResource {
//dcopidl barfs on those constructors, but dcopidlng works
@@ -1525,10 +1525,23 @@
return str;
}
+Index: kmail/accountmanager.h
+===================================================================
+--- kmail/accountmanager.h (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/accountmanager.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
+@@ -97,6 +97,8 @@
+ void singleInvalidateIMAPFolders( KMAccount * );
+
+ void intCheckMail( int, bool interactive = true );
++ /** Call processNextCheck with the false argument. **/
++ void slotProcessNextCheck();
+ void processNextCheck( bool newMail );
+
+ /** this slot increases the count of new mails to show a total number
Index: kmail/kmfoldermaildir.cpp
===================================================================
---- kmail/kmfoldermaildir.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/kmfoldermaildir.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/kmfoldermaildir.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/kmfoldermaildir.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -219,22 +219,8 @@
@@ -1555,8 +1568,8 @@
updateIndex();
Index: kmail/jobscheduler.cpp
===================================================================
---- kmail/jobscheduler.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/jobscheduler.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/jobscheduler.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/jobscheduler.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -35,7 +35,7 @@
using namespace KMail;
@@ -1568,8 +1581,8 @@
{
Index: kmail/kmreadermainwin.cpp
===================================================================
---- kmail/kmreadermainwin.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/kmreadermainwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/kmreadermainwin.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/kmreadermainwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -121,8 +121,19 @@
mMsg = msg;
menuBar()->show();
@@ -1592,8 +1605,8 @@
{
Index: kmail/globalsettings.cpp
===================================================================
---- kmail/globalsettings.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/globalsettings.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/globalsettings.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/globalsettings.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
@@ -40,7 +40,7 @@
GlobalSettings::GlobalSettings()
@@ -1605,8 +1618,8 @@
Index: kmail/searchwindow.cpp
===================================================================
---- kmail/searchwindow.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 699343)
-+++ kmail/searchwindow.cpp (.../branches/KDE/3.5/kdepim) (wersja 699343)
+--- kmail/searchwindow.cpp (.../tags/KDE/3.5.7/kdepim) (wersja 700909)
++++ kmail/searchwindow.cpp (.../branches/KDE/3.5/kdepim) (wersja 700909)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.50&r2=1.51&f=u
More information about the pld-cvs-commit
mailing list