1 files changed, 15 insertions, 9 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 10a9b59..07d7164 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -189,12 +189,14 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 	qDebug("olle\n");
 #endif
 #endif
 
 	qDebug("done t=%d", t.elapsed() );
 
+        connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
+        connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) );
     /*
      *  Here is a problem description:
      *  When Weekview is the default view
      *  a DateBookWeekView get's created
      *  redraw() get's called. So what?
      *  Remember that we're still in the c'tor
@@ -399,12 +401,14 @@ void DateBook::viewMonth() {
 	view(MONTH,currentDate());
 }
 
 void DateBook::insertEvent( const Event &e )
 {
 	Event dupEvent=e;
+	if(!dupEvent.isValidUid() ) // tkcRom seems to be different
+	    dupEvent.assignUid();
 	dupEvent.setLocation(defaultLocation);
 	dupEvent.setCategories(defaultCategories);
 	db->addEvent(dupEvent);
 	emit newEvent();
 }
 
@@ -440,21 +444,23 @@ void DateBook::duplicateEvent( const Event &e )
 		Event newEv = entry->event();
 		QString error = checkEvent(newEv);
 		if (!error.isNull()) {
 			if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("Continue"), 0, 0, 1) == 0)
 				continue;
 		}
-                /*
-                 * The problem:
-                 * DateBookDB does remove repeating events not by uid but by the time
-                 * the recurrence was created
-                 * so we need to update that time as well
-                 */
-                Event::RepeatPattern rp = newEv.repeatPattern();
-                rp.createTime = ::time( NULL );
-                newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern...
+        /*
+        * The problem:
+        * DateBookDB does remove repeating events not by uid but by the time
+        * the recurrence was created
+        * so we need to update that time as well
+        */
+        Event::RepeatPattern rp = newEv.repeatPattern();
+        rp.createTime = ::time( NULL );
+        newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern...
+		if( newEv.uid() == e.uid() || !newEv.isValidUid() )
+		    newEv.assignUid();
 
 		db->addEvent(newEv);
 		emit newEvent();
 		break;
 	}
 }