3 files changed, 14 insertions, 32 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 58863fe..add874f 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -63,10 +63,9 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   mJournal = 0;
-  mDirty = false;
 
   QHBox * vb = new QHBox ( this );
-  QIconSet icon;
+  QPixmap iconp;
 
   QPushButton * toggleJournal = new QPushButton( vb );
-  icon = SmallIcon("1updownarrow");
-  toggleJournal->setIconSet (icon ) ;
+  iconp = SmallIcon("1updownarrow");
+  toggleJournal->setPixmap (iconp ) ;
   new QLabel(i18n(" Title: "),vb);
@@ -79,12 +78,12 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   if ( QApplication::desktop()->width() < 321 ) 
-      icon = SmallIcon("fileexport16");
+      iconp = SmallIcon("fileexport16");
   else
-      icon = SmallIcon("fileexport");
-  saveTemplate->setIconSet (icon ) ;
+      iconp = SmallIcon("fileexport");
+  saveTemplate->setPixmap (iconp ) ;
   int size = saveTemplate->sizeHint().height();
   if ( QApplication::desktop()->width() < 321 ) 
-      icon = SmallIcon("fileimport16");
+      iconp = SmallIcon("fileimport16");
   else
-      icon = SmallIcon("fileimport");
-  loadTemplate->setIconSet (icon ) ;
+      iconp = SmallIcon("fileimport");
+  loadTemplate->setPixmap (iconp ) ;
   loadTemplate->setFixedSize(  size, size );
@@ -93,3 +92,2 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   mEditor = new KTextEdit(this);
-  connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty()));
 #ifndef DESKTOP_VERSION
@@ -103,3 +101,2 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
-  connect(  mTitle, SIGNAL( textChanged ( const QString & ) ), this , SLOT( setDirty() ) );
   connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
@@ -163,3 +160,2 @@ void JournalEntry::slotLoadTemplate()
     //mEditor->setIgnoreMark( true );
-    setDirty();
 }
@@ -205,3 +201,2 @@ void JournalEntry::setJournal(Journal *journal)
  
-  mDirty = false;
 }
@@ -213,8 +208,2 @@ Journal *JournalEntry::journal() const
 
-void JournalEntry::setDirty()
-{
-  mDirty = true;
-
-//  kdDebug() << "JournalEntry::setDirty()" << endl;
-}
 
@@ -246,8 +235,5 @@ void JournalEntry::writeJournal()
 {
-//  kdDebug() << "JournalEntry::writeJournal()" << endl;
-  if (!mDirty) return;
  
-  if (mEditor->text().isEmpty()) {
+  if (mEditor->text().isEmpty() && mTitle->text().isEmpty()) {
       if ( mJournal ) {
-          mDirty = false;
           bool conf = KOPrefs::instance()->mConfirm;
@@ -271,3 +257,2 @@ void JournalEntry::writeJournal()
   mJournal->setSummary(mTitle->text());
-  mDirty = false;
 }
@@ -276,4 +261,2 @@ void JournalEntry::flushEntry()
 {
-  if (!mDirty) return;
-  
   writeJournal();
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index b37cabd..f2db785 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -57,3 +57,2 @@ class JournalEntry : public QFrame {
     void slotLoadTemplate();
-    void setDirty();
     void toggleShowJournal();
@@ -79,4 +78,2 @@ class JournalEntry : public QFrame {
     int heiHint;
-
-    bool mDirty;
 };
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index ff87ef4..cb9a2c0 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -61,3 +61,3 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
   QPushButton * newJournal = new QPushButton( vb );
-  QIconSet icon;
+  QPixmap icon;
   if ( QApplication::desktop()->width() < 321 ) 
@@ -66,3 +66,3 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
       icon = SmallIcon("ko24old");
-  newJournal->setIconSet (icon ) ;
+  newJournal->setPixmap (icon ) ;
   int size = newJournal->sizeHint().height();
@@ -140,2 +140,3 @@ void KOJournalView::newJournal()
 {
+    flushView();
     Journal* mJournal = new Journal;
@@ -148,2 +149,3 @@ void KOJournalView::showOnly ( Journal* j )
 {
+    flushView();
     if ( j == 0 ) {