1 files changed, 17 insertions, 2 deletions

diff --git a/core/pim/datebook/holiday/birthday/birthday.cpp b/core/pim/datebook/holiday/birthday/birthday.cpp
index a32e0ea..98e2d40 100644
--- a/core/pim/datebook/holiday/birthday/birthday.cpp
+++ b/core/pim/datebook/holiday/birthday/birthday.cpp
@@ -2,53 +2,68 @@
 
 #include <opie2/ocontactaccess.h>
 
 #include <qobject.h>
 
 Birthday::Birthday()
     :Opie::Datebook::HolidayPlugin()
 {
     m_contactdb = new Opie::OPimContactAccess("addressplugin");
 /*
     connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ),
          this, SLOT( refresh(const Opie::OPimContactAccess*) ) );
 */
 }
 
 QString Birthday::description()
 {
     return QObject::tr("Birthdays","holidays");
 }
 
 QStringList Birthday::entries(const QDate&aDate)
 {
     QStringList ret;
     if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDay ) ){
-        Opie::OPimContact querybirthdays;
+        Opie::OPimContact querybirthdays,queryanniversary;
+        QString pre;
         querybirthdays.setBirthday(aDate);
+        queryanniversary.setAnniversary(aDate);
         m_list = m_contactdb->queryByExample( querybirthdays,Opie::OPimContactAccess::DateDay| Opie::OPimContactAccess::DateMonth);
         if ( m_list.count() > 0 ){
-            QString pre = QObject::tr("Birthday","holidays")+" ";
+            pre = QObject::tr("Birthday","holidays")+" ";
+            int z = 0;
+            for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
+                if (z) {
+                    pre+=", ";
+                }
+                pre+=((*m_it).fullName());
+                ++z;
+            }
+            ret.append(pre);
+        }
+        m_list = m_contactdb->queryByExample( queryanniversary,Opie::OPimContactAccess::DateDay| Opie::OPimContactAccess::DateMonth);
+        if ( m_list.count() > 0 ){
+            pre = QObject::tr("Anniversary","holidays")+" ";
             int z = 0;
             for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
                 if (z) {
                     pre+=", ";
                 }
                 pre+=((*m_it).fullName());
                 ++z;
             }
             ret.append(pre);
         }
     }
     return ret;
 }
 
 QStringList Birthday::entries(unsigned year, unsigned month, unsigned day)
 {
     return entries(QDate(year,month,day));
 }
 
 QMap<QDate,QStringList> Birthday::entries(const QDate&,const QDate&)
 {
     QMap<QDate,QStringList> ret;
     return ret;
 }