1 files changed, 10 insertions, 2 deletions

diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index e16f516..ddd41af 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -468,106 +468,114 @@ void DateBookWeek::generateAllDayTooltext( QString& text ) {
 void DateBookWeek::generateNormalTooltext( QString& str,
                                            const EffectiveEvent &ev ) {
     str += "<b>" + QObject::tr("Start") + "</b>: ";
 
     if ( ev.startDate() != ev.date() ) {
         // multi-day event.  Show start date
         str += TimeString::longDateString( ev.startDate() );
     } else {
         // Show start time.
         str += TimeString::timeString(ev.start(), ampm, FALSE );
     }
 
 
     str += "<br><b>" + QObject::tr("End") + "</b>: ";
     if ( ev.endDate() != ev.date() ) {
         // multi-day event.  Show end date
         str += TimeString::longDateString( ev.endDate() );
     } else {
         // Show end time.
         str += TimeString::timeString( ev.end(), ampm, FALSE );
     }
 }
 
 void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
 {
     if ( tHide->isActive() )
         tHide->stop();
 
     // why would someone use "<"?  Oh well, fix it up...
     // I wonder what other things may be messed up...
     QString strDesc = ev.description();
     int where = strDesc.find( "<" );
     while ( where != -1 ) {
         strDesc.remove( where, 1 );
         strDesc.insert( where, "&#60;" );
         where = strDesc.find( "<", where );
     }
 
     QString strCat;
     // ### FIX later...
 //     QString strCat = ev.category();
 //     where = strCat.find( "<" );
 //     while ( where != -1 ) {
         // strCat.remove( where, 1 );
         // strCat.insert( where, "&#60;" );
         // where = strCat.find( "<", where );
 //     }
 
+    QString strLocation = ev.location();
+    while ( where != -1 ) {
+        strLocation.remove( where, 1 );
+        strLocation.insert( where, "&#60;" );
+        where = strLocation.find( "<", where );
+    }
+
     QString strNote = ev.notes();
     where = strNote.find( "<" );
     while ( where != -1 ) {
         strNote.remove( where, 1 );
         strNote.insert( where, "&#60;" );
         where = strNote.find( "<", where );
     }
 
-    QString str = "<b>" + strDesc + "</b><br>" + "<i>"
-                  + strCat + "</i>"
+    QString str = "<b>" + strDesc + "</b><br>"
+                  + strLocation + "<br>"
+                  + "<i>" + strCat + "</i>"
                   + "<br>" + TimeString::longDateString( ev.date() )
                   + "<br>";
 
     if (ev.event().type() == Event::Normal )
         generateNormalTooltext( str, ev );
     else
         generateAllDayTooltext( str );
 
     str += "<br><br>" + strNote;
 
     lblDesc->setText( str );
     lblDesc->resize( lblDesc->sizeHint() );
     // move the label so it is "centerd" horizontally...
     lblDesc->move( QMAX(0,(width() - lblDesc->width()) / 2), 0 );
     lblDesc->show();
 }
 
 void DateBookWeek::slotHideEvent()
 {
     tHide->start( 2000, true );
 }
 
 void DateBookWeek::setStartViewTime( int startHere )
 {
     startTime = startHere;
     view->moveToHour( startTime );
 }
 
 int DateBookWeek::startViewTime() const
 {
     return startTime;
 }
 
 void DateBookWeek::redraw()
 {
     getEvents();
 }
 
 void DateBookWeek::slotYearChanged( int y )
 {
     int totWeek;
     QDate d( y, 12, 31 );
     int throwAway;
     calcWeek( d, totWeek, throwAway, bStartOnMonday );
     while ( totWeek == 1 ) {
         d = d.addDays( -1 );
         calcWeek( d, totWeek, throwAway, bStartOnMonday );
     }