SOURCES: kdepim-branch.diff - updated
arekm
arekm at pld-linux.org
Thu Oct 18 19:46:27 CEST 2007
Author: arekm Date: Thu Oct 18 17:46:27 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdepim-branch.diff (1.51 -> 1.52)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.51 SOURCES/kdepim-branch.diff:1.52
--- SOURCES/kdepim-branch.diff:1.51 Thu Aug 16 20:44:51 2007
+++ SOURCES/kdepim-branch.diff Thu Oct 18 19:46:22 2007
@@ -1,8348 +1,5693 @@
-Index: akregator/src/akregator.desktop
+Index: kmail/keyresolver.cpp
===================================================================
---- 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 收集器
- Terminal=false
--Categories=Qt;KDE;Network;
-+Categories=Qt;KDE;Network;News;
- X-DCOP-ServiceType=Unique
-Index: kmobile/kioslave/mimetypes/mobile_notes.desktop
-===================================================================
---- 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
- Comment[nds]=Notizen op Mobilreedschap
--Comment[ne]=मोबाइल यन्त्र भित्रका द्रष्टव्य
-+Comment[ne]=मोबाइल यन्त्र भित्रका टिपोट
- Comment[nl]=Notities in mobiel apparaat
- Comment[nn]=Notat i mobileiningar
- Comment[pl]=Notatki w urządzeniu przenośnym
-Index: wizards/groupwarewizard.desktop
-===================================================================
---- 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
- X-KDE-StartupNotify=true
--Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
-+Categories=Qt;KDE;X-KDE-Utilities-PIM;Office;Network;Email;
-Index: wizards/kmailchanges.h
-===================================================================
---- 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>
-
-+namespace KWallet {
-+ class Wallet;
-+}
-+
- class CreateImapAccount : public KConfigPropagator::Change
- {
- public:
-@@ -73,6 +77,9 @@
- void setCustomWriter( CustomWriter * );
-
- protected:
-+ bool writeToWallet( const QString &type, int id );
-+
-+ protected:
- QString mAccountName;
-
- QString mServer;
-@@ -95,6 +102,9 @@
- int mExistingTransportId;
-
- CustomWriter *mCustomWriter;
-+
-+ private:
-+ static KWallet::Wallet *mWallet;
- };
-
- class CreateDisconnectedImapAccount : public CreateImapAccount
-Index: wizards/kmailchanges.cpp
-===================================================================
---- 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>
- #include <kstringhandler.h>
-+#include <kwallet.h>
-+using namespace KWallet;
-
- static const char* s_folderContentsType[] = {
- I18N_NOOP( "Calendar" ),
-@@ -38,6 +40,7 @@
- I18N_NOOP( "Tasks" ),
- I18N_NOOP( "Journal" ) };
-
-+Wallet* CreateImapAccount::mWallet = 0;
-
- CreateImapAccount::CreateImapAccount( const QString &accountName, const QString &title )
- : KConfigPropagator::Change( title ),
-@@ -192,7 +195,14 @@
- c.writeEntry( "use-tls", true );
- }
-
-+ if ( mEnableSavePassword ) {
-+ if ( !writeToWallet( "account", accountId ) ) {
-+ c.writeEntry( "pass", KStringHandler::obscure( mPassword ) );
-+ c.writeEntry( "store-passwd", true );
-+ }
-+ }
-
-+
- c.setGroup( QString("Folder-%1").arg( uid ) );
- c.writeEntry( "isOpen", true );
-
-@@ -219,8 +229,10 @@
- }
- c.writeEntry( "user", mUser );
- if ( mEnableSavePassword ) {
-- c.writeEntry( "pass", KStringHandler::obscure( mPassword ) );
-- c.writeEntry( "storepass", "true" );
-+ if ( !writeToWallet( "transport", transportId ) ) {
-+ c.writeEntry( "pass", KStringHandler::obscure( mPassword ) );
-+ c.writeEntry( "storepass", true );
-+ }
- }
-
- // Write email in "default kcontrol settings", used by IdentityManager
-@@ -273,22 +285,24 @@
- c.writeEntry( "Folder", uid );
- c.writeEntry( "Id", uid );
- c.writeEntry( "Type", "imap" );
-- c.writeEntry( "auth", true );
-+ c.writeEntry( "auth", "*" );
- c.writeEntry( "Name", mAccountName );
- c.writeEntry( "host", mServer );
-
- c.writeEntry( "login", mUser );
-
- if ( mEnableSavePassword ) {
-- c.writeEntry( "pass", KStringHandler::obscure( mPassword ) );
-- c.writeEntry( "store-passwd", true );
-+ if ( !writeToWallet( "account", accCnt+1 ) ) {
-+ c.writeEntry( "pass", KStringHandler::obscure( mPassword ) );
-+ c.writeEntry( "store-passwd", true );
-+ }
- }
- c.writeEntry( "port", "993" );
-
- if ( mEncryption == SSL ) {
-- c.writeEntry( "encryption", "SSL" );
-+ c.writeEntry( "use-ssl", true );
- } else if ( mEncryption == TLS ) {
-- c.writeEntry( "encryption", "TLS" );
-+ c.writeEntry( "use-tls", true );
- }
-
- if ( mAuthenticationSend == PLAIN ) {
-@@ -310,3 +324,22 @@
- c.setGroup( QString("Folder-%1").arg( uid ) );
- c.writeEntry( "isOpen", true );
- }
-+
-+bool CreateImapAccount::writeToWallet(const QString & type, int id)
-+{
-+ if ( !Wallet::isEnabled() )
-+ return false;
-+ if ( !mWallet || !mWallet->isOpen() ) {
-+ delete mWallet;
-+ WId window = 0;
-+ if ( qApp->activeWindow() )
-+ window = qApp->activeWindow()->winId();
-+ mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
-+ if ( !mWallet )
-+ return false;
-+ if ( !mWallet->hasFolder( "kmail" ) )
-+ mWallet->createFolder( "kmail" );
-+ mWallet->setFolder( "kmail" );
-+ }
-+ return mWallet->writePassword( type + "-" + QString::number( id ), mPassword );
-+}
-Index: kresources/egroupware/xmlrpciface.h
-===================================================================
---- 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>
- void call( const QString &method, const QValueList<T> &arg,
-- QObject* obj, const char* faultSlot,
-- QObject* obj, const char* messageSlot, const QVariant &id = QVariant() );
-+ QObject* obj1, const char* faultSlot,
-+ QObject* obj2, const char* messageSlot, const QVariant &id = QVariant() );
-
-
- public slots:
-Index: kresources/groupwise/kabc_resourcegroupwise.cpp
-===================================================================
---- 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;
- }
- }
--
-+ else
-+ emit loadingError( this, mServer->errorText() );
-+
- if ( storedFirstSequence == 0 || storedLastSequence == 0 )
- {
- 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 700909)
-+++ kresources/groupwise/kabc_resourcegroupwise.h (.../branches/KDE/3.5/kdepim) (wersja 700909)
-@@ -73,7 +73,7 @@
- bool asyncLoad();
- bool save( Ticket * );
- bool asyncSave( Ticket * );
-- enum SABState { Stale, InSync, RefreshNeeded };
-+ enum SABState { Error, Stale, InSync, RefreshNeeded };
-
- /**
- * 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 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)
- # define SOAP_SOCKLEN_T SOCKLEN_T
--#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX)
-+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__)
- # define SOAP_SOCKLEN_T socklen_t
- #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(__osf__) || defined(VXWORKS)
- # define SOAP_SOCKLEN_T int
-Index: kresources/groupwise/soap/groupwiseserver.cpp
-===================================================================
---- 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"
- #include "soapH.h"
-+#include "stdsoap2.h"
- #include "soapGroupWiseBindingProxy.h"
- #include <stdlib.h>
- #include <stdio.h>
-@@ -99,7 +100,7 @@
- return (*it)->gSoapReceiveCallback( soap, s, n );
- }
-
--int GroupwiseServer::gSoapOpen( struct soap *, const char *,
-+int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
- const char *host, int port )
- {
- // kdDebug() << "GroupwiseServer::gSoapOpen()" << endl;
-@@ -124,8 +125,18 @@
- m_sock->setSocketFlags( KExtendedSocket::inetSocket );
-
- m_sock->setAddress( host, port );
-- m_sock->lookup();
-- int rc = m_sock->connect();
-+ int rc = m_sock->lookup();
-+ if (rc != 0 ) {
-+ kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl;
-+ QString errorMessage;
-+ errorMessage = QString::fromLatin1( strerror( errno ) );
-+ perror( 0 );
-+ soap->error = SOAP_TCP_ERROR;
-+ mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
-+ return SOAP_INVALID_SOCKET;
-+ }
-+
-+ rc = m_sock->connect();
- if ( rc != 0 ) {
- kdError() << "gSoapOpen: connect failed " << rc << endl;
- QString errorMessage;
-@@ -133,12 +144,14 @@
- errorMessage = QString::fromLatin1( strerror( errno ) );
- perror( 0 );
- }
-+ //set the soap struct's error here!
- else {
- if ( rc == -3 )
- errorMessage = QString::fromLatin1( "Connection timed out. Check host and port number" );
- }
- mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
-- return SOAP_INVALID_SOCKET;
-+ soap->error =SOAP_TCP_ERROR;
-+ return SOAP_INVALID_SOCKET;
- }
- m_sock->enableRead( true );
- m_sock->enableWrite( true );
-@@ -165,17 +178,19 @@
- return SOAP_OK;
- }
-
--int GroupwiseServer::gSoapSendCallback( struct soap *, const char *s, size_t n )
-+int GroupwiseServer::gSoapSendCallback( struct soap * soap, const char *s, size_t n )
- {
- // kdDebug() << "GroupwiseServer::gSoapSendCallback()" << endl;
-
- if ( !m_sock ) {
- kdError() << "no open connection" << endl;
-+ soap->error = SOAP_TCP_ERROR;
- return SOAP_TCP_ERROR;
- }
- if ( mError ) {
- kdError() << "SSL is in error state." << endl;
-- return SOAP_SSL_ERROR;
-+ soap->error = SOAP_SSL_ERROR;
-+ return SOAP_SSL_ERROR;
- }
-
- if ( getenv("DEBUG_GW_RESOURCE") ) {
-@@ -194,6 +209,7 @@
- if ( ret < 0 ) {
- kdError() << "Send failed: " << strerror( m_sock->systemError() )
- << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
-+ soap->error = SOAP_TCP_ERROR;
- return SOAP_TCP_ERROR;
- }
- n -= ret;
-@@ -202,6 +218,7 @@
- if ( n !=0 ) {
- kdError() << "Send failed: " << strerror( m_sock->systemError() )
- << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
-+ soap->error = SOAP_TCP_ERROR;
- }
-
- m_sock->flush();
-Index: kresources/groupwise/soap/Makefile.am
-===================================================================
---- 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
-
--noinst_LTLIBRARIES = libgwsoap.la
-+lib_LTLIBRARIES = libgwsoap.la
-
- libgwsoap_la_SOURCES = contactconverter.cpp gwconverter.cpp incidenceconverter.cpp \
- groupwiseserver.cpp gwjobs.cpp ksslsocket.cpp \
- soapC.cpp soapClient.cpp stdsoap2.cpp
--libgwsoap_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
--libgwsoap_la_LIBADD = -lkabc
-+libgwsoap_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
-+libgwsoap_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
-
- # the following rule does:
- # 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 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,
- const QString& label,
-- bool writable )
-+ bool writable,
-+ bool )
- {
- if( type != s_kmailContentsType ) return;
-
-Index: kresources/kolab/kabc/resourcekolab.h
-===================================================================
---- 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
- void fromKMailAddSubresource( const QString& type, const QString& id,
-- const QString& label, bool writable );
-+ const QString& label, bool writable,
-+ bool alarmRelevant );
- void fromKMailDelSubresource( const QString& type, const QString& id );
-
- 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 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,
- const QString& mimetype,
-- bool writable )
-+ bool writable,
-+ bool /*alarmRelevant*/ )
- {
- if ( type != kmailContentsType )
- // Not ours
-Index: kresources/kolab/knotes/resourcekolab.h
-===================================================================
---- 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
- void fromKMailAddSubresource( const QString& type, const QString& resource,
-- const QString& label, bool writable );
-+ const QString& label, bool writable,
-+ bool alarmRelevant );
- void fromKMailDelSubresource( const QString& type, const QString& resource );
-
- 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 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,
- const QString& label,
-- bool writable ) = 0;
-+ bool writable,
-+ bool alarmRelevant ) = 0;
- virtual void fromKMailDelSubresource( const QString& type,
- const QString& resource ) = 0;
-
-Index: kresources/kolab/shared/subresource.cpp
-===================================================================
---- 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;
-
--SubResource::SubResource( bool active, bool writable, const QString& label,
-+SubResource::SubResource( bool active, bool writable,
-+ bool alarmRelevant, const QString& label,
- int completionWeight )
-- : mActive( active ), mWritable( writable ), mLabel( label ),
-- mCompletionWeight( completionWeight )
-+ : mActive( active ), mWritable( writable ), mAlarmRelevant( alarmRelevant ),
-+ mLabel( label ), mCompletionWeight( completionWeight )
- {
- }
-
-+SubResource::SubResource( bool active, bool writable,
-+ const QString& label, int completionWeight )
-+ : mActive( active ), mWritable( writable ), mAlarmRelevant( false ),
-+ mLabel( label ), mCompletionWeight( completionWeight )
-+{
-+}
-+
- SubResource::~SubResource()
- {
- }
-@@ -55,6 +63,16 @@
- return mActive;
- }
-
-+void SubResource::setAlarmRelevant( bool active )
-+{
-+ mAlarmRelevant = active;
-+}
-+
-+bool SubResource::alarmRelevant() const
-+{
-+ return mAlarmRelevant;
-+}
-+
- void SubResource::setWritable( bool writable )
- {
- mWritable = writable;
-Index: kresources/kolab/shared/kmailconnection.h
-===================================================================
---- 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 );
- void fromKMailRefresh( const QString& type, const QString& resource );
-- void fromKMailAddSubresource( const QString& type, const QString& resource, const QString& label );
-+ void fromKMailAddSubresource( const QString& type, const QString& resource,
-+ const QString& label, bool writable,
-+ bool alarmRelevant );
- void fromKMailDelSubresource( const QString& type, const QString& resource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map, const QString& type,
- const QString& folder );
-Index: kresources/kolab/shared/subresource.h
-===================================================================
---- 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,
- int completionWeight = 100 );
-+
-+ SubResource( bool active, bool writable, bool alarmRelevant,
-+ const QString& label, int completionWeight = 100 );
- virtual ~SubResource();
-
- virtual void setActive( bool active );
-@@ -58,6 +61,9 @@
- virtual void setWritable( bool writable );
- virtual bool writable() const;
-
-+ virtual void setAlarmRelevant( bool active );
-+ virtual bool alarmRelevant() const;
-+
- virtual void setLabel( const QString& label );
- virtual QString label() const;
-
-@@ -67,6 +73,8 @@
- private:
- bool mActive; // Controlled by the applications
- bool mWritable; // Set if the KMail folder is writable
-+ bool mAlarmRelevant; // Set if the alarms from this resource are of
-+ // interest to the user, as per folder acls
- QString mLabel; // The GUI name of this resource
-
- // 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 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)" ) )
- kdError(5650) << "DCOP connection to signalRefresh failed" << endl;
-- if ( !connectKMailSignal( "subresourceAdded( QString, QString, QString )",
-- "fromKMailAddSubresource( QString, QString, QString )" ) )
-+ if ( !connectKMailSignal( "subresourceAdded( QString, QString, QString, bool, bool )",
-+ "fromKMailAddSubresource( QString, QString, QString, bool, bool )" ) )
- kdError(5650) << "DCOP connection to subresourceAdded failed" << endl;
- if ( !connectKMailSignal( "subresourceDeleted(QString,QString)",
- "fromKMailDelSubresource(QString,QString)" ) )
-@@ -144,17 +144,14 @@
-
- void KMailConnection::fromKMailAddSubresource( const QString& type,
- const QString& resource,
-- const QString& label )
-+ const QString& label,
-+ bool writable,
-+ bool alarmRelevant )
- {
- // kdDebug(5650) << "KMailConnection::fromKMailAddSubresource( " << type << ", "
- // << resource << " )\n";
-- bool writable = true;
--
-- // TODO: This should be told by KMail right away
-- if ( connectToKMail() )
-- writable = mKMailIcalIfaceStub->isWritableFolder( type, resource );
--
-- mResource->fromKMailAddSubresource( type, resource, label, writable );
-+ mResource->fromKMailAddSubresource( type, resource, label,
-+ writable, alarmRelevant );
- }
-
- void KMailConnection::fromKMailDelSubresource( const QString& type,
-Index: kresources/kolab/kcal/resourcekolab.cpp
-===================================================================
---- 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 )
- : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
-- mCalendar( QString::fromLatin1("UTC") ), mOpen( false )
-+ mCalendar( QString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
-+ "mResourceChangedTimer" )
- {
- setType( "imap" );
- connect( &mResourceChangedTimer, SIGNAL( timeout() ),
-@@ -87,11 +88,13 @@
- const QString& name,
- const QString& label,
- bool writable,
-+ bool alarmRelevant,
- ResourceMap& subResource )
- {
- KConfigGroup group( &config, name );
- bool active = group.readBoolEntry( "Active", true );
-- subResource.insert( name, Kolab::SubResource( active, writable, label ) );
-+ subResource.insert( name, Kolab::SubResource( active, writable,
-+ alarmRelevant, label ) );
- }
-
- bool ResourceKolab::openResource( KConfig& config, const char* contentType,
-@@ -104,7 +107,8 @@
- map.clear();
- QValueList<KMailICalIface::SubResource>::ConstIterator it;
- for ( it = subResources.begin(); it != subResources.end(); ++it )
-- loadSubResourceConfig( config, (*it).location, (*it).label, (*it).writable, map );
-+ loadSubResourceConfig( config, (*it).location, (*it).label, (*it).writable,
-+ (*it).alarmRelevant, map );
- return true;
- }
-
-@@ -492,12 +496,12 @@
- }
- }
- } else { /* KMail told us */
-- bool ourOwnUpdate = false;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdepim-branch.diff?r1=1.51&r2=1.52&f=u
More information about the pld-cvs-commit
mailing list