resloved merge conflict

1 files changed, 12 insertions, 2 deletions

diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index 000ff71..188d8e1 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -94,9 +94,12 @@ bool nextOccurance(const Event &e, const QDate &from, QDateTime &next)
 	    // firstOfWeek = 0; this is already done at decl.
 	    while(!((1 << firstOfWeek) & e.repeatPattern().days))
-		firstOfWeek++;
+                firstOfWeek++;
+
+
 
 	    /* there is at least one 'day', or there would be no event */
 	    while(!((1 << (dayOfWeek % 7)) & e.repeatPattern().days))
-		dayOfWeek++;
+                dayOfWeek++;
+
 
 	    dayOfWeek = dayOfWeek % 7; /* the actual day of week */
@@ -892,4 +895,11 @@ void DateBookDB::loadFile( const QString &strFile )
 	}
 	// "post processing" (dates, times, alarm, recurrence)
+
+        // other half of 1169 fixlet without getting into regression
+        // if rp.days == 0 and rp.type == Event::Weekly
+        if ( rp.type == Event::Weekly && rp.days == 0 )
+            rp.days = Event::day( e.start().date().dayOfWeek() );
+
+
 	// start date/time
 	e.setRepeat( rp.type != Event::NoRepeat, rp );