[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    proko2: kdepim/kresources/kolab/shared
From:       Karl-Heinz Zimmer <khz () klaralvdalens-datakonsult ! se>
Date:       2004-07-01 14:14:36
Message-ID: 20040701141436.64448935B () office ! kde ! org
[Download RAW message or body]

CVS commit by khz: 

Allow specification of a Subject header text for internal kolab data that are to be stored by KMail.


  M +3 -1      kmailconnection.cpp   1.1.2.14
  M +3 -1      kmailconnection.h   1.1.2.10
  M +2 -1      resourcekolabbase.cpp   1.1.2.8
  M +1 -0      resourcekolabbase.h   1.1.2.13


--- kdepim/kresources/kolab/shared/kmailconnection.cpp  #1.1.2.13:1.1.2.14
@@ -208,9 +208,11 @@ bool KMailConnection::kmailDeleteInciden
 bool KMailConnection::kmailUpdate( const QString& resource,
                                    Q_UINT32& sernum,
+                                   const QCString& subject,
                                    const QStringList& attachments,
                                    const QStringList& deletedAttachments )
 {
   if ( connectToKMail() ) {
-    sernum = mKMailIcalIfaceStub->update( resource, sernum, attachments,
+    sernum = mKMailIcalIfaceStub->update( resource, sernum,
+                                          subject, attachments,
                                           deletedAttachments );
 

--- kdepim/kresources/kolab/shared/kmailconnection.h  #1.1.2.9:1.1.2.10
@@ -79,5 +79,7 @@ public:
                            const QString& filename );
   bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
-  bool kmailUpdate( const QString& resource, Q_UINT32& sernum,
+  bool kmailUpdate( const QString& resource,
+                    Q_UINT32& sernum,
+                    const QCString& subject,
                     const QStringList& attachments,
                     const QStringList& deletedAttachments );

--- kdepim/kresources/kolab/shared/resourcekolabbase.cpp  #1.1.2.7:1.1.2.8
@@ -86,4 +86,5 @@ bool ResourceKolabBase::kmailUpdate( con
                                      Q_UINT32& sernum,
                                      const QString& xml,
+                                     const QCString& subject,
                                      const QStringList& attachments,
                                      const QStringList& deletedAttachments )
@@ -107,5 +108,5 @@ bool ResourceKolabBase::kmailUpdate( con
   a.prepend( url.url() );
 
-  return mConnection->kmailUpdate( resource, sernum, a, deletedAttachments );
+  return mConnection->kmailUpdate( resource, sernum, subject, a, deletedAttachments );
 }
 

--- kdepim/kresources/kolab/shared/resourcekolabbase.h  #1.1.2.12:1.1.2.13
@@ -124,4 +124,5 @@ protected:
   bool kmailUpdate( const QString& resource, Q_UINT32& sernum,
                     const QString& xml,
+                    const QCString& subject = QCString("internal kolab data: Do not delete this mail."),
                     const QStringList& attachments = QStringList(),
                     const QStringList& deletedAttachments = QStringList() );


[prev in list] [next in list] [prev in thread] [next in thread]