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

List:       kde-pim
Subject:    Re: [Kde-pim] freebusy storage location
From:       Guenter Schwann <schwann () icg ! tu-graz ! ac ! at>
Date:       2003-11-16 15:21:16
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


On Sunday 16 November 2003 10:04, Cornelius Schumacher wrote:
> Some comments:
> - Why does the IMIPScheduler redeclare the freeBusyDir() function?
> - It should be "true" not "TRUE". This is C++ after all.
> - In the DummyScheduler we should probably return an empty string, if
> free/busy isn't to be used. Maybe we should remove the DummyScheduler
> anyway.

You are right. Here's the update.

ciao
-- 
Guenter Schwann
Graz University of Technology - Computer Graphics and Vision
GPG-key: http://www.sbox.tugraz.at/home/v/vogel/gpg-schwann-public-key.txt

["freebusy2.patch" (text/x-diff)]

Index: korganizer/mailscheduler.cpp
===================================================================
RCS file: /home/kde/kdepim/korganizer/mailscheduler.cpp,v
retrieving revision 1.22
diff -u -3 -p -r1.22 mailscheduler.cpp
--- korganizer/mailscheduler.cpp	3 Nov 2003 09:16:52 -0000	1.22
+++ korganizer/mailscheduler.cpp	16 Nov 2003 15:19:38 -0000
@@ -144,3 +144,8 @@ bool MailScheduler::deleteTransaction(In
   else
     return f.remove();
 }
+
+QString MailScheduler::freeBusyDir()
+{
+  return locateLocal("data","korganizer/freebusy");
+}
Index: korganizer/mailscheduler.h
===================================================================
RCS file: /home/kde/kdepim/korganizer/mailscheduler.h,v
retrieving revision 1.11
diff -u -3 -p -r1.11 mailscheduler.h
--- korganizer/mailscheduler.h	7 Mar 2003 22:06:22 -0000	1.11
+++ korganizer/mailscheduler.h	16 Nov 2003 15:19:38 -0000
@@ -50,6 +50,9 @@ class MailScheduler : public IMIPSchedul
 
     bool deleteTransaction(IncidenceBase *incidence);
 
+    /** Returns the directory where the free-busy information is stored */
+    virtual QString freeBusyDir();
+  
   private:
     QMap<IncidenceBase*, QString> mEventMap;
 };
Index: libkcal/dummyscheduler.cpp
===================================================================
RCS file: /home/kde/kdepim/libkcal/dummyscheduler.cpp,v
retrieving revision 1.8
diff -u -3 -p -r1.8 dummyscheduler.cpp
--- libkcal/dummyscheduler.cpp	5 Sep 2002 20:01:34 -0000	1.8
+++ libkcal/dummyscheduler.cpp	16 Nov 2003 15:19:39 -0000
@@ -26,6 +26,7 @@
 #include <qtextstream.h>
 
 #include <kdebug.h>
+#include <kstandarddirs.h>
 
 #include "event.h"
 #include "icalformat.h"
@@ -117,3 +118,10 @@ QPtrList<ScheduleMessage> DummyScheduler
 
   return messageList;
 }
+
+QString DummyScheduler::freeBusyDir()
+{
+  // the dummy scheduler shoud never hande freebusy stuff - so it's ok to
+  // "hardcode" korganizer
+  return QString("");
+}
Index: libkcal/dummyscheduler.h
===================================================================
RCS file: /home/kde/kdepim/libkcal/dummyscheduler.h,v
retrieving revision 1.6
diff -u -3 -p -r1.6 dummyscheduler.h
--- libkcal/dummyscheduler.h	5 Sep 2002 20:01:34 -0000	1.6
+++ libkcal/dummyscheduler.h	16 Nov 2003 15:19:39 -0000
@@ -41,6 +41,8 @@ class DummyScheduler : public Scheduler 
     bool performTransaction(IncidenceBase *incidence,Method method,const QString &recipients);
     QPtrList<ScheduleMessage> retrieveTransactions();
 
+    virtual QString freeBusyDir();
+  
   protected:
     bool saveMessage(const QString &);
 };
Index: libkcal/scheduler.cpp
===================================================================
RCS file: /home/kde/kdepim/libkcal/scheduler.cpp,v
retrieving revision 1.28
diff -u -3 -p -r1.28 scheduler.cpp
--- libkcal/scheduler.cpp	20 Oct 2003 15:22:19 -0000	1.28
+++ libkcal/scheduler.cpp	16 Nov 2003 15:19:39 -0000
@@ -309,8 +309,7 @@ bool Scheduler::acceptFreeBusy(Incidence
 {
   FreeBusy *freebusy = static_cast<FreeBusy *>(incidence);
 
-  QString freeBusyDirName = locateLocal("appdata","freebusy");
-  kdDebug() << "acceptFreeBusy:: freeBusyDirName: " << freeBusyDirName << endl;
+  kdDebug() << "acceptFreeBusy:: freeBusyDirName: " << freeBusyDir() << endl;
 
   QString from;
   if(method == Scheduler::Publish) {
@@ -321,18 +320,18 @@ bool Scheduler::acceptFreeBusy(Incidence
     from = attendee->email();
   }
 
-  QDir freeBusyDir(freeBusyDirName);
-  if (!freeBusyDir.exists()) {
-    kdDebug() << "Directory " << freeBusyDirName << " does not exist!" << endl;
-    kdDebug() << "Creating directory: " << freeBusyDirName << endl;
+  QDir freeBusyDirectory(freeBusyDir());
+  if (!freeBusyDirectory.exists()) {
+    kdDebug() << "Directory " << freeBusyDir() << " does not exist!" << endl;
+    kdDebug() << "Creating directory: " << freeBusyDir() << endl;
     
-    if(!freeBusyDir.mkdir(freeBusyDirName, TRUE)) {
-      kdDebug() << "Could not create directory: " << freeBusyDirName << endl;
+    if(!freeBusyDirectory.mkdir(freeBusyDir(), true)) {
+      kdDebug() << "Could not create directory: " << freeBusyDir() << endl;
       return false;
     }
   }
 
-  QString filename(freeBusyDirName);
+  QString filename(freeBusyDir());
   filename += "/";
   filename += from;
   filename += ".ifb";
@@ -356,3 +355,4 @@ bool Scheduler::acceptFreeBusy(Incidence
   deleteTransaction(incidence);
   return true;
 }
+
Index: libkcal/scheduler.h
===================================================================
RCS file: /home/kde/kdepim/libkcal/scheduler.h,v
retrieving revision 1.13
diff -u -3 -p -r1.13 scheduler.h
--- libkcal/scheduler.h	29 Jan 2003 18:18:19 -0000	1.13
+++ libkcal/scheduler.h	16 Nov 2003 15:19:39 -0000
@@ -111,6 +111,9 @@ class Scheduler {
     static QString translatedMethodName(Method);
 
     virtual bool deleteTransaction(IncidenceBase *incidence);
+    
+    /** Returns the directory where the free-busy information is stored */
+    virtual QString freeBusyDir() = 0;
 
   protected:
 

[Attachment #8 (application/pgp-signature)]

_______________________________________________
kde-pim mailing list
kde-pim@mail.kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/

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