5 files changed, 11 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 95a3a45..ac314b9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,3 +2,3 @@
 # Makefile for building: kopi-desktop
-# Generated by qmake (1.07a) (Qt 3.3.3) on: Thu Aug 19 22:23:29 2004
+# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Aug 29 13:39:55 2004
 # Project:  kopi-desktop.pro
@@ -13,4 +13,2 @@ CHK_DIR_EXISTS= test -d
 MKDIR    = mkdir -p
-INSTALL_FILE= 
-INSTALL_DIR = 
         SUBTARGETS = \
@@ -91,3 +89,3 @@ sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
 
-Makefile: kopi-desktop.pro  /usr/local/qtgcc/mkspecs/default/qmake.conf 
+Makefile: kopi-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
         $(QMAKE) -o Makefile kopi-desktop.pro
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 95ebd68..417f5b0 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -83,3 +83,2 @@ vcard/include/VCardTelParam.h \
 vcard/include/VCardTextParam.h \
-vcard/include/VCardTextNSParam.h \
 vcard/include/VCardTextValue.h \
@@ -139,2 +138,3 @@ vcard/include/generated/TextListValue-generated.h
  
+#vcard/include/VCardTextNSParam.h \
  
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 7d0c516..b420351 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -251,6 +251,9 @@ void KDateNavigator::updateView()
 
+    int add = 0;
+    if ( !  KGlobal::locale()->weekStartsMonday() )
+        ++add;
     if (dayOfYear % 7 != 0)
-      weeknum.setNum(dayOfYear / 7 + 1);
+      weeknum.setNum(dayOfYear / 7 + 1+add);
     else
-      weeknum.setNum(dayOfYear / 7);
+      weeknum.setNum(dayOfYear / 7 +add);
     weeknos[i]->setText(weeknum);
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 584d1ed..4209e10 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -1054,3 +1054,3 @@ void KOEditorRecurrence::writeEvent( Event *event )
           days.setBit( event->dtStart().date().dayOfWeek()-1);
-          qDebug("bit set %d ");
+          qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1);
       }
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 06a911c..c45d81f 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -34,4 +34,5 @@
 #include "journal.h"
+#include "calfilter.h"
 
-#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */
+//#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */
 
@@ -41,3 +42,2 @@ namespace KCal {
 
-class CalFilter;