1 files changed, 17 insertions, 15 deletions

diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index a6a1be3..42f026a 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -258,154 +258,156 @@ void DateBookDay::selectedDates( QDateTime &start, QDateTime &end )
 void DateBookDay::setDate( int y, int m, int d )
 {
     header->setDate( y, m, d );
 
     selectedWidget = 0;
 }
 
 void DateBookDay::setDate( QDate d)
 {
     header->setDate( d.year(), d.month(), d.day() );
 
     selectedWidget = 0;
 }
 
 void DateBookDay::dateChanged( int y, int m, int d )
 {
     QDate date( y, m, d );
     if ( currDate == date )
 	return;
     currDate.setYMD( y, m, d );
     relayoutPage();
     dayView()->clearSelection();
     QTableSelection ts;
 
     if (jumpToCurTime && this->date() == QDate::currentDate())
     {
     	ts.init( QTime::currentTime().hour(), 0);
 	ts.expandTo( QTime::currentTime().hour(), 0);
     } else
     {
 	ts.init( startTime, 0 );
 	ts.expandTo( startTime, 0 );
     }
 
     dayView()->addSelection( ts );
 
     selectedWidget = 0;
 
 }
 
 void DateBookDay::redraw()
 {
     if ( isUpdatesEnabled() )
 	relayoutPage();
 }
 
 void DateBookDay::getEvents()
 {
-    widgetList.clear();
-
-    QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate,
-								   currDate );
-    QValueListIterator<EffectiveEvent> it;
-    for ( it = eventList.begin(); it != eventList.end(); ++it ) {
-        DateBookDayWidget* w = new DateBookDayWidget( *it, this );
-        connect( w, SIGNAL( deleteMe( const Event & ) ),
-                 this, SIGNAL( removeEvent( const Event & ) ) );
-        connect( w, SIGNAL( editMe( const Event & ) ),
-                 this, SIGNAL( editEvent( const Event & ) ) );
-        connect( w, SIGNAL( beamMe( const Event & ) ),
-                 this, SIGNAL( beamEvent( const Event & ) ) );
-        widgetList.append( w );
+	widgetList.clear();
+
+	QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate );
+	QValueListIterator<EffectiveEvent> it;
+	for ( it = eventList.begin(); it != eventList.end(); ++it ) {
+		EffectiveEvent ev=*it;
+		if(!(ev.end().hour()==ev.start().hour() && ev.end().minute()==ev.start().minute())) {	// Skip effective events with no duration. (i.e ending at 00:00)
+			DateBookDayWidget* w = new DateBookDayWidget( *it, this );
+			connect( w, SIGNAL( deleteMe( const Event & ) ),
+						this, SIGNAL( removeEvent( const Event & ) ) );
+			connect( w, SIGNAL( editMe( const Event & ) ),
+						this, SIGNAL( editEvent( const Event & ) ) );
+			connect( w, SIGNAL( beamMe( const Event & ) ),
+						this, SIGNAL( beamEvent( const Event & ) ) );
+			widgetList.append( w );
+		}
     }
 
 }
 
 static int place( const DateBookDayWidget *item, bool *used, int maxn )
 {
     int place = 0;
     int start = item->event().start().hour();
     QTime e = item->event().end();
     int end = e.hour();
     if ( e.minute() < 5 )
 	end--;
     if ( end < start )
 	end = start;
     while ( place < maxn ) {
 	bool free = TRUE;
 	int s = start;
 	while( s <= end ) {
 	    if ( used[10*s+place] ) {
 		free = FALSE;
 		break;
 	    }
 	    s++;
 	}
 	if ( free ) break;
 	place++;
     }
     if ( place == maxn ) {
 	return -1;
     }
     while( start <= end ) {
 	used[10*start+place] = TRUE;
 	start++;
     }
     return place;
 }
 
 
 void DateBookDay::relayoutPage( bool fromResize )
 {
     setUpdatesEnabled( FALSE );
     if ( !fromResize )
         getEvents();    // no need we already have them!
-
+                            
     widgetList.sort();
     //sorts the widgetList by the heights of the widget so that the tallest widgets are at the beginning
     //this is needed for the simple algo below to work correctly, otherwise some widgets would be drawn outside the view
 
     int wCount = widgetList.count();
     int wid = view->columnWidth(0)-1;
     int wd;
     int n = 1;
 
     QArray<int> anzIntersect(wCount); //this stores the number of maximal intersections of each widget
 
     for (int i = 0; i<wCount; anzIntersect[i] = 1, i++);
 
     if ( wCount < 20 ) {
 
 	QArray<QRect> geometries(wCount);
 	for (int i = 0; i < wCount; geometries[i] = widgetList.at(i)->geometry(), i++);	//stores geometry for each widget in vector
 
 	for ( int i = 0; i < wCount; i++)
 	{
 		QValueList<int> intersectedWidgets;
 
 		//find all widgets intersecting with widgetList.at(i)
 		for ( int j = 0; j < wCount; j++)
 			if (i != j)
 				if (geometries[j].intersects(geometries[i]))
 					intersectedWidgets.append(j);
 
 		//for each of these intersecting widgets find out how many widgets are they intersecting with
 		for ( uint j = 0; j < intersectedWidgets.count(); j++)
 		{
 			QArray<int> inter(wCount);
 			inter[j]=1;
 
 			if (intersectedWidgets[j] != -1)
 				for ( uint k = j; k < intersectedWidgets.count(); k++)
 					if (j != k && intersectedWidgets[k] != -1)
 						if (geometries[intersectedWidgets[k]].intersects(geometries[intersectedWidgets[j]]))
 						{
 							inter[j]++;
 							intersectedWidgets[k] = -1;
 						}
 			if (inter[j] > anzIntersect[i]) anzIntersect[i] = inter[j] + 1;
 		}
 
 		if (anzIntersect[i] == 1 && intersectedWidgets.count()) anzIntersect[i]++;
 	}