6 files changed, 25 insertions, 8 deletions

diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index 55bfdec..c8aa3f0 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -1,27 +1,28 @@
 ######################################################################
 # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004
 ######################################################################
 
 TEMPLATE = app
 DEPENDPATH += msvc06.mak \
               msvc2003.mak \
               smsd \
               depend/nokia \
               depend/siemens \
               depend/nokia/dct3trac
 INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
-        CONFIG          =  warn_off release console
+        CONFIG          +=  warn_off console
 # Input
 
+include( ../../../variables.pri )
 HEADERS += gammu.h \
            sniff.h \
            smsd/s_files.h \
            smsd/s_mysql.h \
            smsd/smsdcore.h \
            depend/nokia/dct3.h \
            depend/nokia/dct4.h \
            depend/siemens/chiffre.h \
            depend/siemens/dsiemens.h \
            depend/nokia/dct3trac/type-cc.h \
            depend/nokia/dct3trac/type-mm.h \
            depend/nokia/dct3trac/type-rr.h \
@@ -43,22 +44,22 @@ SOURCES += gammu.c \
            depend/nokia/dct3trac/wmx-gsm.c \
            depend/nokia/dct3trac/wmx-list.c \
            depend/nokia/dct3trac/wmx-sim.c \
            depend/nokia/dct3trac/wmx-util.c \
            depend/nokia/dct3trac/wmx.c
 unix : {
 LIBS +=      ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
 # bluetooth disabled for now
 #/usr/lib/libbluetooth.so  /usr/lib/libsdp.so 
 OBJECTS_DIR = obj/unix
 }
 win32 : {
-        CONFIG  = qt warn_on 
+        CONFIG  += qt warn_on 
 #LIBS += mfc71u.lib
 LIBS += libc.lib
 #LIBS += msvcrt.lib
 QMAKE_LINK += /NODEFAULTLIB:msvcrt
 LIBS +=      ../../../bin/microgammu.lib
 OBJECTS_DIR = obj/win
 }
 DESTDIR = ../../../bin
 TARGET = kammu
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 7203eb3..f9d22d5 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -42,26 +42,30 @@ MOC_DIR = moc/unix
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_
 LIBS += ../bin/microkdepim.lib
 LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 #blabla: {
-
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
 LIBS += mfc71u.lib
+}
 DEFINES +=  _OL_IMPORT_
 HEADERS = ../outport/msoutl9.h \
  kaimportoldialog.h 
 SOURCES = ../outport/msoutl9.cpp \
  kaimportoldialog.cpp 
 #}
 #olimport section end
 }
 
 INTERFACES = \
 # filteredit_base.ui \
 # kofilterview_base.ui \
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 904bbe2..a8ad467 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1649,26 +1649,28 @@ bool CalendarView::openCalendar(QString filename, bool merge)
 {
 
     if (filename.isEmpty()) {
         return false;
     }
 
     if (!QFile::exists(filename)) {
         KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename));
         return false;
     }
 
     globalFlagBlockAgenda = 1;
-    if (!merge) mCalendar->close();
-
+    if (!merge) {
+      mCalendar->close();
+      mTodoList->clearList();
+    }
     mStorage->setFileName( filename );
 
     if ( mStorage->load() ) {
         if ( merge ) ;//setModified( true );
         else {
             //setModified( true );
             mViewManager->setDocumentId( filename );
             mDialogManager->setDocumentId( filename );
             mTodoList->setDocumentId( filename );
         }
         globalFlagBlockAgenda = 2;
         // if ( getLastSyncEvent() )
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index d88c300..32ad10a 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -47,35 +47,41 @@ MOC_DIR = moc/unix
 }
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_  
 LIBS += ../bin/microkdepim.lib
 LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
-#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
-#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
+QMAKE_LINK += /NODEFAULTLIB:MSVCRT
+QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 #blabla: {
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
 LIBS += mfc71u.lib
+}
 DEFINES +=  _OL_IMPORT_
 
 HEADERS += ../outport/msoutl9.h \
  koimportoldialog.h 
+
 SOURCES += ../outport/msoutl9.cpp \
  koimportoldialog.cpp
 #}
 #olimport section end
 
 }
 
  
 INTERFACES = kofilterview_base.ui 
 #filteredit_base.ui
 
 # kdateedit.h \
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index d368513..1ffc34a 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -130,24 +130,25 @@ class KOTodoView : public KOrg::BaseView
     int currentDateCount() { return 0; }
 
     void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td);
 
     void setDocumentId( const QString & );
 
     void saveLayout(KConfig *config, const QString &group) const;
     void restoreLayout(KConfig *config, const QString &group);
     /** Create a popup menu to set categories */
     QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem);
     void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
     QString getWhatsThisText(QPoint p);
+    void clearList() {mTodoListView->clear(); }
 
   public slots:
     void updateView();
     void updateConfig();
 
     void changeEventDisplay(Event *, int);
 
     void showDates(const QDate &start, const QDate &end);
     void showEvents(QPtrList<Event> eventList);
 
     void clearSelection();
     void jumpToDate ();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2e5a943..fb4de37 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -822,14 +822,17 @@ QDate KOViewManager::currentSelectionDate()
 
 void KOViewManager::addView(KOrg::BaseView *view)
 {
 #if QT_VERSION >= 0x030000
     mMainView->viewStack()->addWidget( view );
 #else
     mMainView->viewStack()->addWidget( view, 1 );
 #endif
 }
 
 void KOViewManager::setDocumentId( const QString &id )
 {
-    if (mTodoView) mTodoView->setDocumentId( id );
+    if (mTodoView) {
+      mTodoView->clearList();
+      mTodoView->setDocumentId( id );
+    }
 }