1 files changed, 18 insertions, 5 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7faf675..7d5cf72 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -143,3 +143,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     mFlagKeyPressed = false;
-    setCaption("KOrganizer/Pi");
+    setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
@@ -1854,3 +1854,11 @@ void MainWindow::configureToolBar( int item  )
 }
-
+void MainWindow::setCaption ( const QString & c ) 
+{
+    QString cap = c;
+    cap.replace( QRegExp("\n"), " " );
+    cap = cap.stripWhiteSpace();
+    if ( cap.isEmpty() )
+        cap = "KO/Pi";
+    QWidget::setCaption( cap );
+}
 void MainWindow::setCaptionToDates()
@@ -1858,3 +1866,8 @@ void MainWindow::setCaptionToDates()
     QString selDates;
-    selDates = KGlobal::locale()->formatDate(mView->startDate(), true);
+    QDate date = mView->startDate();
+    if ( ! date.isValid() ) {
+        setCaption("");
+        return;
+    }
+    selDates = KGlobal::locale()->formatDate( date, true);
     if  (mView->startDate() < mView->endDate() )
@@ -1863,5 +1876,5 @@ void MainWindow::setCaptionToDates()
         QString addString;
-        if ( mView->startDate() == QDateTime::currentDateTime().date() )
+        if ( date == QDateTime::currentDateTime().date() )
             addString = i18n("Today");
-        else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) )
+        else if ( date == QDateTime::currentDateTime().date().addDays(1) )
             addString = i18n("Tomorrow");