Another win import fix

2 files changed, 17 insertions, 5 deletions

diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 36363e5..16f2eca 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -17,64 +17,65 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qprogressbar.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qapplication.h>
 #include <qhbox.h>
 #include <qheader.h>
 #include <qdatetime.h>
 #include <qlistview.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kinputdialog.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
+#include <kabc/stdaddressbook.h>
 
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "koimportoldialog.h"
 
 #include "../outport/msoutl9.h"
 #include <ole2.h>
 #include <comutil.h>
 _Application gOlApp;
 
 QDateTime mDdate2Qdtr( DATE dt)
 {
     COleDateTime odt;
     SYSTEMTIME st;
     odt = dt;
     odt.GetAsSystemTime(st);
     QDateTime qdt (QDate(st.wYear, st.wMonth,st.wDay ),QTime( st.wHour, st.wMinute,st.wSecond ) );
     return qdt;
 }
 
 class OLEListViewItem : public QCheckListItem
 {
   public:
     OLEListViewItem( QListView *parent, QString text ) :
       QCheckListItem( parent, text, QCheckListItem::CheckBox ) { ; };
     OLEListViewItem(  QListViewItem *after, QString text ) :
       QCheckListItem( after, text, QCheckListItem::CheckBox ) { ; };
     ~OLEListViewItem() {};
   void setData( DWORD data ) {mData= data; };
   DWORD data() { return mData ;};
   private:
@@ -411,56 +412,66 @@ void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRe
 	  rsvp = true;
 	case 5: //not answered
 	  stat = Attendee::NeedsAction;
 	  break;
 	case 1: //organizer
 	  stat = Attendee::Delegated ;
 	  break;
 	case 2: //tentative 
 	  stat = Attendee::Tentative ;
 	  break;
 	case 3: //accepted
 	  stat = Attendee::Accepted;
 	  break;
 	case 4: //declined
 	  stat =Attendee::Declined ;
 	  break;
 	default: 
 	  stat = Attendee::NeedsAction ;
 
 	}
 	KCal::Attendee::Role role;
 	if ( event->organizer() == name )
 	  role = KCal::Attendee::Chair;
 	else if ( reqAtt.find( name ) >= 0   )
 	  role = KCal::Attendee::ReqParticipant;
 	else if ( optAtt.find( name ) >= 0   )
 	  role = KCal::Attendee::OptParticipant;
 	else  
 	  role = KCal::Attendee::NonParticipant;
 	QString mail = QString::fromUcs2(pItem->GetAddress().GetBuffer());
 	if( mail.isEmpty() && name.find("@") > 0 )
 	  mail = name;
-	QString uid;
-	if (  mail.isEmpty() ) 
-	  uid =  QString::fromUcs2( pItem->GetEntryID().GetBuffer());
-	else
-	  uid =  mail;
 	mail = mail.stripWhiteSpace();
+	
+	QString uid = getUidByEmail( mail );
+	//uid =  QString::fromUcs2( pItem->GetEntryID().GetBuffer());
 	KCal::Attendee * a = new KCal::Attendee( name, mail,rsvp,stat,role,uid) ;
 	event->addAttendee( a , false );
 	itm->Release();
   }
 
 
   if ( !mCalendar->addEventNoDup( event ))
     delete event;
   else {
     // QString mes = i18n("Importing %1.\n date: %2 date: %3").arg( event->summary()).arg( event->dtStart().toString()).arg( event->dtEnd().toString());
     //KMessageBox::information(this,mes);
     ++importedItems;
   }
 }
 void KOImportOLdialog::slotCancel()
 {
   reject();
 }
+
+QString KOImportOLdialog::getUidByEmail( QString email )
+{
+  KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
+  KABC::AddressBook::Iterator it;
+  for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) {
+    QStringList em = (*it).emails();
+    if ( em.contains( email ))
+      return (*it).uid();
+  }
+  return "";
+}
diff --git a/korganizer/koimportoldialog.h b/korganizer/koimportoldialog.h
index f6a753d..c8847c5 100644
--- a/korganizer/koimportoldialog.h
+++ b/korganizer/koimportoldialog.h
@@ -44,40 +44,41 @@ using namespace KCal;
 class KOImportOLdialog : public KDialogBase
 {
     Q_OBJECT
   public:
     /**
       Construct new IncidenceEditor.
     */
     KOImportOLdialog( const QString &caption, Calendar *calendar,
                        QWidget *parent );
     virtual ~KOImportOLdialog();
 
     /** Initialize editor. This function creates the tab widgets. */
     void init();
    
   public slots:
    
 
   signals:
   
   protected slots:
     void slotApply();
     void slotOk();
     void slotCancel();
 
   protected:
     void setupFolderView();
     void addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent);
     void readCalendarData( DWORD folder );
     void ol2kopiCalendar( _AppointmentItem * , bool computeRecurrence = true );
 
     Calendar *mCalendar;
     QListView * mListView;
+    QString getUidByEmail( QString email );
 
   private:
     int importedItems;
 };
 
 #endif