5 files changed, 38 insertions, 42 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 028d3bb..eec0f1f 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -325,5 +325,6 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
             }
         }
-        if ( isSubSet && ! found )
+        // if ( isSubSet && ! found ) 
+        if (  ! found ) // LR try this one...
             mData->phoneNumbers.append( *phoneItAD );                
     }
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 3d82553..abb3b3b 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -90,22 +90,17 @@ void PhoneNumber::simplifyType()
 bool PhoneNumber::contains( const PhoneNumber &p  )
 {
-    QString Number;
-    QString Num;
-    uint i;
-    Number = mNumber.stripWhiteSpace ();
-    Num = "";
-    for ( i = 0; i < Number.length(); ++i) {
-        if ( Number.at(i).isDigit() || Number.at(i) == '+'|| Number.at(i) == '*'|| Number.at(i) == '#' )
-            Num += Number.at(i);
-    }
-    QString NumberR;
-    QString NumR;
-    NumberR = p.mNumber.stripWhiteSpace ();
-    NumR = "";
-    for ( i = 0; i < NumberR.length(); ++i) {
-        if ( NumberR.at(i).isDigit() || NumberR.at(i) == '+'|| NumberR.at(i) == '*'|| NumberR.at(i) == '#' )
-            NumR += NumberR.at(i);
-    }
-    return (Num == NumR);
+    PhoneNumber myself;
+    PhoneNumber other;
+    myself = *this;
+    other = p;
+    myself.simplifyNumber();
+    other.simplifyNumber();
+    if ( myself.number() != other.number ())
+        return false;
+    myself.simplifyType();
+    other.simplifyType();
+    if ( myself.type() == other.type())
+        return true;
+    return false;
 }
 
diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro
index df3c94c..57b6f84 100644
--- a/kabc/plugins/ldap/ldapE.pro
+++ b/kabc/plugins/ldap/ldapE.pro
@@ -8,5 +8,5 @@ OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index aa33588..2f7409d 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -71,8 +71,4 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
     QStyleSheet* stsh = mView->styleSheet();
     QStyleSheetItem * style ;
-    style   = stsh->item ("a" );
-    if ( style ) {
-        style->setMargin(QStyleSheetItem::MarginAll,0);  
-    }
     style   = stsh->item ("h2" );
     if ( style ) {
@@ -83,8 +79,4 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
         style->setMargin(QStyleSheetItem::MarginAll,0);  
     }
-    style   = stsh->item ("table" );
-    if ( style ) {
-        style->setMargin(QStyleSheetItem::MarginAll,0);  
-    }
     mEventViewer = 0;
 
@@ -162,5 +154,5 @@ void KOWhatsNextView::updateView()
     //  kil.loadIcon("korganizer",KIcon::NoGroup,32,KIcon::DefaultState,&ipath);
     //<big><big><strong>" + date + "</strong></big></big>\n";
-    mText = "<qt><table width=\"100%\">\n";
+    mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
 #ifdef DESKTOP_VERSION
@@ -217,12 +209,16 @@ void KOWhatsNextView::updateView()
             if ( ! itemAdded ) {
                 appendDay ( iii, mEventDate );
-                itemAdded = true;
               
             }
+            // for first day (iii == 0)
+            // we may have syncevents, or events in the past, which maybe should nor be diaplayed
+            // for that reason we cannot append <table> in appendDay () for iii == 0
+            // we must append it in the first successful call of  appendEvent()
             Event *ev = events.first();
             while(ev) {
                 //qDebug("+++++event append %s", ev->summary().latin1());
                 if ( true /*!ev->recurrence()->doesRecur() || ev->recursOn( mEventDate)*/) {
-                    appendEvent(ev, false , iii!= 0 );
+                    if ( appendEvent(ev, false , iii!= 0,!itemAdded ) ) 
+                         itemAdded = true;
                 }
                 ev = events.next();
@@ -243,5 +239,5 @@ void KOWhatsNextView::updateView()
             todo = todos.next();
         }
-        if ( !itemAdded && iii == 0 ) {
+        if ( !itemAdded && iii == 0 ) { 
             // appendDay ( iii, mEventDate );
             //mText += "<table>";
@@ -250,5 +246,5 @@ void KOWhatsNextView::updateView()
             //mText +="</table>";
         }
-        if ( itemAdded )
+        if ( itemAdded   )
             mText += "</table>\n";
         mEventDate = mEventDate.addDays( 1 );
@@ -344,5 +340,5 @@ void KOWhatsNextView::updateView()
 
 
-    mText += "</td></tr>\n</table></qt>\n";
+    mText += "</td></tr>\n</table>\n";
 
     mView->setText(mText);
@@ -358,5 +354,5 @@ void KOWhatsNextView::updateView()
     //   mView->setBackgroundMode(FixedPixmap  );
     //   mView->setBackgroundPixmap ( bPix );
-    // qDebug("%s ",mText.latin1());
+     qDebug("%s ",mText.latin1());
 }
 
@@ -367,5 +363,5 @@ void  KOWhatsNextView::appendDay( int i, QDate eventDate )
     if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) {
         if ( i == 0 ) {
-            mText += "<table>\n";
+            //mText += "<table>\n";
             return;//date = "<em><font color=\"#008000\"><em>" +  day+"</font></em>";
         }
@@ -381,5 +377,5 @@ void  KOWhatsNextView::appendDay( int i, QDate eventDate )
     } else { 
         if ( i == 0 ) {
-            mText += "<table>\n";
+            //mText += "<table>\n";
             return;// date = "<font color=\"#008000\"><em>" +i18n("Today: ") +"</em>" + day+"</font>";
         }
@@ -431,16 +427,19 @@ void KOWhatsNextView::changeEventDisplay(Event *, int action)
 }
 
-void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
+bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool appendTable )
 {
     if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") )
-        return;
+        return false;
     QDateTime cdt =  QDateTime::currentDateTime();
     QDateTime noc;
     QString tempText;
+    if ( appendTable && !notRed ) {
+            tempText = "<table>";
+    }
     bool ok = true; 
     if ( reply ) {
         noc = ev->getNextOccurence( cdt, &ok );
         if (! ok && ev->type() == "Event")
-            return;
+            return false;
     }
     tempText += "<tr><td><b>";
@@ -487,5 +486,5 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
                     if ( end < cdt  ) {
                         if ( !KOPrefs::instance()->mWNViewShowsPast )
-                            return;
+                            return false;
                         tempText += "<font color=\"#F00000\">" + dateText + "</font>";
                     }
@@ -576,4 +575,5 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
     tempText += "</td></tr>\n";
     mText += tempText;
+    return true;
 }
 
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 1118bdd..9049268 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -71,5 +71,5 @@ class KOWhatsNextView : public KOrg::BaseView
   
   protected:
-    void appendEvent(Incidence *, bool reply=false, bool notRed = true);
+    bool appendEvent(Incidence *, bool reply=false, bool notRed = true, bool appendTable = false);
     bool appendTodo(Incidence *, QString ind = "", bool isSub = false );
     void appendDay( int i, QDate date );