fixes

7 files changed, 17 insertions, 6 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,8 +1,13 @@
 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:
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,9 +1,9 @@
 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
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5fc3f2f..7f6f221 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -248,12 +248,14 @@ void JournalEntry::fillCalendar( int setToID )
     }
     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
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index c738f7e..7e9fa71 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -84,13 +84,16 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
 }
 
 MarcusBains::~MarcusBains()
 {
     //delete minutes;
 }
-
+void MarcusBains::hideMe()
+{
+    hide(); mTimeBox->hide();
+}
 int MarcusBains::todayColumn()
 {
     QDate currentDate = QDate::currentDate();
 
     DateList dateList = agenda->dateList();
     DateList::ConstIterator it;
@@ -369,12 +372,13 @@ void KOAgenda::changeColumns(int columns)
         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.
 */
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 86cf2f4..59e7472 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -45,13 +45,13 @@ 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();
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index f46a103..82c0f4c 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1354,13 +1354,13 @@ void KOTodoView::toggleRunningItem()
             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;
@@ -1371,13 +1371,13 @@ void KOTodoView::toggleRunningItem()
         if ( tp.stopAll() ) {
             mCalendar->stopAllTodos();
             t->setRunning( true );
             updateView();
         } else {
             t->setRunning( true );
-            mActiveItem->construct();
+            updateTodo ( t, 0 );
         }
     }
 }
 
 void KOTodoView::itemClicked(QListViewItem *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";