7 files changed, 18 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index d0b2880..f4b3ddb 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,10 +1,15 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.1.19 ************
+
+Fixed a crash in journal view and a crash in setting a todo to stopped when KO/Pi saved the file when "stop todo" dialog was shown.
+Fixed a minor problem with the marcus bains line (whatever that is).
+
 ********** VERSION 2.1.18 ************
 
 Pi-Sync mode:
 The "Write back file" status dialog was updated too often such that writing back the file on the Z was very slow. Fixed.
 
 KO/Pi:
 Fixed a layout problem on the Z 5500 with the calender box right of the location box in the event/todo editor. Thanks to Andrew, who found, reported and fixed this problem ( I did not get that problem - it was working on my 5500 ).
 
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 133d0d1..a29e4ea 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,11 +1,11 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.1.18
+Version: 2.1.19
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 
 %description
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5fc3f2f..7f6f221 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -245,17 +245,19 @@ void JournalEntry::fillCalendar( int setToID )
             mCalendarBox->insertItem( kkf->mName );
         }
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     mCalendarBox->setCurrentItem( std );
 }
 
 void JournalEntry::toggleShowJournal()
-{ 
+{  
+    if ( mEditor->text().isEmpty() && mTitle->currentText ().isEmpty() )
+        return;
     if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty())
         flushEntry();
     if ( showOnlyMode )
         emit showJournalOnly( 0 );
     else {
         // we have to protect mJournal from deleting if mJournal has empty text
         visibleMode = false; // set to true via :setShowOnly() 
         emit showJournalOnly( mJournal );
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index c738f7e..7e9fa71 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -82,17 +82,20 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
 
     oldToday = -1;
 }
 
 MarcusBains::~MarcusBains()
 {
     //delete minutes;
 }
-
+void MarcusBains::hideMe()
+{
+    hide(); mTimeBox->hide();
+}
 int MarcusBains::todayColumn()
 {
     QDate currentDate = QDate::currentDate();
 
     DateList dateList = agenda->dateList();
     DateList::ConstIterator it;
     int col = 0;
     for(it = dateList.begin(); it != dateList.end(); ++it) {
@@ -367,16 +370,17 @@ void KOAgenda::changeColumns(int columns)
 {
     if (columns == 0) {
         qDebug("KOAgenda::changeColumns() called with argument 0 ");
         return;
     }
     clear();
     mColumns = columns;
     computeSizes();
+    if(mMarcusBains) mMarcusBains->hideMe();
 }
 
 /*
   This is the eventFilter function, which gets all events from the KOAgendaItems
   contained in the agenda. It has to handle moving and resizing for all items.
 */
 bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
 {
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 86cf2f4..59e7472 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -43,17 +43,17 @@ class KCal::Todo;
 
 using namespace KCal;
 
 class MarcusBains : public QFrame {
     Q_OBJECT
   public:
     MarcusBains(KOAgenda *agenda=0,const char *name=0);
     virtual ~MarcusBains();
-
+    void hideMe();
   public slots:
     void updateLocation(bool recalculate=false);
     void updateLoc();
 
   private:
     int todayColumn();
     QTimer *minutes;
     QLabel *mTimeBox;
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index f46a103..82c0f4c 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1352,34 +1352,34 @@ void KOTodoView::toggleRunningItem()
         if (QApplication::desktop()->width() <= 800 ){
             int wid = tp.width();
             int hei = tp.height();
             int xx = (QApplication::desktop()->width()-wid)/2;
             int yy = (QApplication::desktop()->height()-hei)/2;
             tp.setGeometry( xx,yy,wid,hei );
         }
         tp.exec();
-        mActiveItem->construct();
+        updateTodo ( t, 0 );
     } else {
         KOStartTodoPrefs tp ( t->summary(), this );
         if (QApplication::desktop()->width() <= 800 ){
             int wid = tp.width();
             int hei = tp.height();
             int xx = (QApplication::desktop()->width()-wid)/2;
             int yy = (QApplication::desktop()->height()-hei)/2;
             tp.setGeometry( xx,yy,wid,hei );
         }
         if ( !tp.exec() ) return;
         if ( tp.stopAll() ) {
             mCalendar->stopAllTodos();
             t->setRunning( true );
             updateView();
         } else {
             t->setRunning( true );
-            mActiveItem->construct();
+            updateTodo ( t, 0 );
         }
     }
 }
 
 void KOTodoView::itemClicked(QListViewItem *item)
 {
     //qDebug("KOTodoView::itemClicked %d", item);
   if (!item) {
diff --git a/version b/version
index b29da4e..0e55faa 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.1.18";
+version = "2.1.19";