2 files changed, 29 insertions, 3 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 97c305c..c23129a 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -81,13 +81,13 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
       startTime( 8 ), // an acceptable default
       syncing(FALSE),
       inSearch(FALSE)
 {
     QTime t;
     t.start();
-    db = new DateBookDB;
+    db = new DateBookDBHack;
     qDebug("loading db t=%d", t.elapsed() );
     loadSettings();
     setCaption( tr("Calendar") );
     setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
     setToolBarsMovable( FALSE );
@@ -230,13 +230,13 @@ void DateBook::receive( const QCString &msg, const QByteArray &data )
         else if ( monthAction->isOn() )
             viewMonth();
     }
     else if (msg == "editEvent(int)") {
         int uid;
         stream >> uid;
-        Event e=db->getEvent(uid);
+        Event e=db->eventByUID(uid);
         editEvent(e);
     }
 }
 
 DateBook::~DateBook()
 {
@@ -962,6 +962,27 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt,
             nonrev.setStart( rev.start() );
         } else
             emit signalNotFound();
         wrapAround = !wrapAround;
     }
 }
+
+Event DateBookDBHack::eventByUID(int uid) {
+
+    // FIXME: Dirty Hacks to get hold of the private event lists
+    QDate start;
+    QDate end=start.addDays(-1);
+    QValueList<Event> myEventList=getNonRepeatingEvents(start,end);
+    QValueList<Event> myRepeatEvents=getRawRepeats();
+
+    QValueList<Event>::ConstIterator it;
+    
+    for (it = myEventList.begin(); it != myEventList.end(); it++) {
+        if ((*it).uid() == uid) return *it;
+    }
+    for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) {
+        if ((*it).uid() == uid) return *it;
+    }
+
+    qDebug("Event not found: uid=%d\n", uid);
+}
+
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index 2ffcdbe..d1fe90d 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -31,12 +31,17 @@ class DateBookWeek;
 class DateBookWeekLst;
 class DateBookMonth;
 class Event;
 class QDate;
 class Ir;
 
+class DateBookDBHack : public DateBookDB {
+ public:
+  Event eventByUID(int id);
+};
+
 class DateBook : public QMainWindow
 {
     Q_OBJECT
 
 public:
     DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
@@ -96,13 +101,13 @@ private:
     void initWeekLst();
     void initMonth();
     void loadSettings();
     void saveSettings();
 
 private:
-    DateBookDB *db;
+    DateBookDBHack *db;
     QWidgetStack *views;
     DateBookDay *dayView;
     DateBookWeek *weekView;
     DateBookMonth *monthView;
     DateBookWeekLst *weekLstView;
     QAction *dayAction, *weekAction, *weekLstAction, *monthAction;