todo fix

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
@@ -9,11 +9,12 @@ DEPENDPATH += msvc06.mak \
               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 \
@@ -51,9 +52,9 @@ LIBS +=      ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
 #/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
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 7203eb3..f9d22d5 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -50,10 +50,14 @@ 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 \
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 904bbe2..a8ad467 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1657,10 +1657,12 @@ bool CalendarView::openCalendar(QString filename, bool merge)
         return false;
     }
 
     globalFlagBlockAgenda = 1;
-    if (!merge) mCalendar->close();
-
+    if (!merge) {
+      mCalendar->close();
+      mTodoList->clearList();
+    }
     mStorage->setFileName( filename );
 
     if ( mStorage->load() ) {
         if ( merge ) ;//setModified( true );
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index d88c300..32ad10a 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -55,19 +55,25 @@ 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
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index d368513..1ffc34a 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -138,8 +138,9 @@ class KOTodoView : public KOrg::BaseView
     /** 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();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2e5a943..fb4de37 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -830,6 +830,9 @@ void KOViewManager::addView(KOrg::BaseView *view)
 }
 
 void KOViewManager::setDocumentId( const QString &id )
 {
-    if (mTodoView) mTodoView->setDocumentId( id );
+    if (mTodoView) {
+      mTodoView->clearList();
+      mTodoView->setDocumentId( id );
+    }
 }