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

List:       kde-commits
Subject:    proko2: kdepim/kresources/kolab/shared
From:       David Faure <faure () kde ! org>
Date:       2004-08-17 14:09:36
Message-ID: 20040817140936.B48C799A8 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Don't look at vcard/ical data, only xml


  M +5 -2      kmailconnection.cpp   1.1.2.20
  M +1 -1      kmailconnection.h   1.1.2.15


--- kdepim/kresources/kolab/shared/kmailconnection.cpp  #1.1.2.19:1.1.2.20
@@ -90,6 +90,6 @@ bool KMailConnection::connectToKMail()
 
     // Attach to the KMail signals
-    if ( !connectKMailSignal( "incidenceAdded(QString,QString,Q_UINT32,QString)",
-                              "fromKMailAddIncidence(QString,QString,Q_UINT32,QString)" ) )
+    if ( !connectKMailSignal( "incidenceAdded(QString,QString,Q_UINT32,int,QString)",
+                              "fromKMailAddIncidence(QString,QString,Q_UINT32,int,QString)" ) )
       kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
     if ( !connectKMailSignal( "incidenceDeleted(QString,QString,QString)",
@@ -113,6 +113,9 @@ bool KMailConnection::fromKMailAddIncide
                                              const QString& folder,
                                              Q_UINT32 sernum,
+                                             int format,
                                              const QString& xml )
 {
+  if ( format != KMailICalIface::StorageXML )
+    return false;
 //   kdDebug(5650) << "KMailConnection::fromKMailAddIncidence( " << type << ", "
 //                 << folder << " ). iCal:\n" << ical << endl;

--- kdepim/kresources/kolab/shared/kmailconnection.h  #1.1.2.14:1.1.2.15
@@ -56,5 +56,5 @@ class KMailConnection : public QObject, 
 k_dcop:
   bool fromKMailAddIncidence( const QString& type, const QString& resource,
-                              Q_UINT32 sernum, const QString& xml );
+                              Q_UINT32 sernum, int format, const QString& xml );
   void fromKMailDelIncidence( const QString& type, const QString& resource,
                               const QString& xml );


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