[Kroupware] Fusion between kde cvs HEAD and kroupware

Marc TAIEB TAIEBMA at e-i.com
Mon Jul 28 19:34:41 CEST 2003


Hello,

Initially, I would like to tell you that I'm very impressed about your work on 
kmail and korganizer. It 's very nice.

However, there is one or two functionnalities that exists on kde head and not 
in the kroupware branch (spelling, autocompletion with kabc resources, ...)

So I have checkout the CVS HEAD (not the KDE_3_1 ..) of kde, chekout the 
kroupware branch and then try to integrate the 2 versions.

In my company, we have a Exchange Server 2000 and there is actually somme 
troubles :
	-  when you create an event and see it with Oulook, the event seems not 
correctly created
	-  the opposite is the same
The webdav server of Exchange 2000 is different than the Kolab server. 
Exchange return XML for the FreeBusy's. 
So I have add a checkbox like "Is an Exchange Server ?" in the groupware 
configuration. When this checkbox is checked I use libkpimexchange to 
retrieve freebusy's of the other attendee's.

Normaly, with this 3 patch's the kroupware version of Kmail can replace 
Outlook in your company. :-)

If you have some problems with the patch's tell it me.
I'm waiting for your remarks.

Regards

Marc TAIEB


PS: I'll can't response to the mails in august.
And sorry for my english

-------------- next part --------------
A non-text attachment was scrubbed...
Name: libkpimexchange-patch
Type: text/x-diff
Size: 2522 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kroupware/attachments/20030728/09cb0c89/libkpimexchange-patch-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: kmail-patch
Type: text/x-diff
Size: 31956 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kroupware/attachments/20030728/09cb0c89/kmail-patch-0001.bin
-------------- next part --------------
? .libs
? alarmclient.lo
? alarmclient.moc.cpp
? alarmclient.moc.lo
? archivedialog.lo
? archivedialog.moc
? baseview.moc
? calendarview.lo
? calendarview.moc
? calprinter.lo
? calprinter.moc
? datenavigator.lo
? datenavigator.moc
? docprefs.lo
? exportwebdialog.lo
? exportwebdialog.moc
? filteredit_base.lo
? filteredit_base.moc
? filtereditdialog.lo
? filtereditdialog.moc
? htmlexport.lo
? incidenceconflictdialog.lo
? incidenceconflictdialog.moc.cpp
? incidenceconflictdialog.moc.lo
? incomingdialog.lo
? incomingdialog.moc
? incomingdialog_base.lo
? incomingdialog_base.moc
? journalentry.lo
? journalentry.moc
? kdatenavigator.lo
? kdatenavigator.moc
? koagenda.lo
? koagenda.moc
? koagendaitem.lo
? koagendaitem.moc
? koagendaview.lo
? koagendaview.moc
? koapp.lo
? koapp.moc
? kocore.lo
? kocounterdialog.lo
? kocounterdialog.moc
? kodaymatrix.lo
? kodaymatrix.moc
? kodialogmanager.lo
? kodialogmanager.moc
? koeditordetails.lo
? koeditordetails.moc
? koeditorgeneral.lo
? koeditorgeneral.moc
? koeditorgeneralevent.lo
? koeditorgeneralevent.moc
? koeditorgeneraltodo.lo
? koeditorgeneraltodo.moc
? koeditorrecurrence.lo
? koeditorrecurrence.moc
? koeventeditor.lo
? koeventeditor.moc
? koeventpopupmenu.lo
? koeventpopupmenu.moc
? koeventtimewidget.lo
? koeventtimewidget.moc.cpp
? koeventtimewidget.moc.lo
? koeventview.lo
? koeventview.moc
? koeventviewer.lo
? koeventviewer.moc
? koeventviewerdialog.lo
? koeventviewerdialog.moc
? kofilterview.lo
? kofilterview.moc
? kofilterview_base.lo
? kofilterview_base.moc
? koglobals.lo
? kogroupware.lo
? kogroupware.moc.cpp
? kogroupware.moc.lo
? kogroupwareincomingdialog.lo
? kogroupwareincomingdialog.moc
? kogroupwareincomingdialogimpl.lo
? kogroupwareincomingdialogimpl.moc.cpp
? kogroupwareincomingdialogimpl.moc.lo
? kogroupwareprefspage.lo
? kogroupwareprefspage.moc
? koincidenceeditor.lo
? koincidenceeditor.moc
? kojournalview.lo
? kojournalview.moc
? kolineedit.lo
? kolineedit.moc.cpp
? kolineedit.moc.lo
? kolistview.lo
? kolistview.moc
? komailclient.lo
? komonthview.lo
? komonthview.moc
? konewstuff.lo
? koprefs.lo
? koprefsdialog.lo
? koprefsdialog.moc
? korganizer.lo
? korganizer.moc
? korganizer_part.lo
? korganizer_part.moc
? korganizeriface_skel.lo
? korganizersynciface_skel.lo
? kotimespanview.lo
? kotimespanview.moc
? kotodoeditor.lo
? kotodoeditor.moc
? kotodoeditordetails.lo
? kotodoeditordetails.moc.cpp
? kotodoeditordetails.moc.lo
? kotodoeditordetails_base.lo
? kotodoeditordetails_base.moc
? kotodoview.lo
? kotodoview.moc
? kotodoviewitem.lo
? koviewmanager.lo
? koviewmanager.moc
? kowhatsnextview.lo
? kowhatsnextview.moc
? kowindowlist.lo
? kowindowlist.moc
? ktimeedit.lo
? ktimeedit.moc
? libkorganizer.la
? lineview.lo
? lineview.moc
? mailscheduler.lo
? main.lo
? outgoingdialog.lo
? outgoingdialog.moc
? outgoingdialog_base.lo
? outgoingdialog_base.moc
? patch
? plugindialog.lo
? plugindialog.moc
? publishdialog.lo
? publishdialog.moc
? publishdialog_base.lo
? publishdialog_base.moc
? savetemplatedialog.lo
? savetemplatedialog.moc
? searchdialog.lo
? searchdialog.moc
? statusdialog.lo
? statusdialog.moc
? timeline.lo
? timeline.moc
? timespanview.lo
? timespanview.moc
? kdgantt/.deps
? kdgantt/.libs
? kdgantt/KDGanttView.lo
? kdgantt/KDGanttView.moc
? kdgantt/KDGanttViewEventItem.lo
? kdgantt/KDGanttViewItem.lo
? kdgantt/KDGanttViewSubwidgets.lo
? kdgantt/KDGanttViewSubwidgets.moc
? kdgantt/KDGanttViewSummaryItem.lo
? kdgantt/KDGanttViewTaskItem.lo
? kdgantt/KDGanttViewTaskLink.lo
? kdgantt/KDGanttViewTaskLinkGroup.lo
? kdgantt/KDMinimizeSplitter.lo
? kdgantt/KDMinimizeSplitter.moc
? kdgantt/KDSemiSizingControl.lo
? kdgantt/KDSemiSizingControl.moc
? kdgantt/KDSizingControl.lo
? kdgantt/KDSizingControl.moc
? kdgantt/KDXMLTools.lo
? kdgantt/itemAttributeDialog.lo
? kdgantt/itemAttributeDialog.moc
? kdgantt/libkdgantt.la
? knewstuff/.deps
? knewstuff/.libs
? knewstuff/downloaddialog.lo
? knewstuff/downloaddialog.moc
? knewstuff/engine.lo
? knewstuff/engine.moc
? knewstuff/entry.lo
? knewstuff/knewstuff.lo
? knewstuff/libknewstuff.la
? knewstuff/provider.lo
? knewstuff/provider.moc
? knewstuff/providerdialog.lo
? knewstuff/providerdialog.moc
? knewstuff/uploaddialog.lo
? knewstuff/uploaddialog.moc
? notes/.deps
? notes/.libs
? notes/knote.lo
? notes/knote.moc
? notes/knotebutton.moc
? notes/knoteedit.lo
? notes/knoteedit.moc
? notes/konotesview.lo
? notes/konotesview.moc
? notes/libkorg_notesview.la
? plugins/birthdays/.deps
? plugins/datenums/.deps
? plugins/holidays/.deps
? plugins/projectview/.deps
? plugins/webexport/.deps
Index: Makefile.am
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/Makefile.am,v
retrieving revision 1.195.2.22
diff -U0 -r1.195.2.22 Makefile.am
--- Makefile.am	23 May 2003 20:09:36 -0000	1.195.2.22
+++ Makefile.am	28 Jul 2003 15:14:11 -0000
@@ -8,0 +9 @@
+CPPFLAGS = -g
@@ -10 +11,2 @@
-korganizer_LDADD   = libkorganizer.la
+korganizer_LDADD   = libkorganizer.la \
+			$(top_builddir)/libkpimexchange/libkpimexchange.la 
@@ -20,0 +23 @@
+korgplugins_CXXFLAGS = $(CXXFLAGS) -g
@@ -24,0 +28 @@
+timezone_CXXFLAGS = $(CXXFLAGS) -g
@@ -30,7 +34,7 @@
-                           -lkdeprint -lkabc \
-                           $(top_builddir)/calendarsystem/libkcalsystem.la \
-                           $(top_builddir)/libkcal/libkcal.la \
-                           $(top_builddir)/libkdepim/libkdepim.la \
-                           $(top_builddir)/kalarmd/libkalarmd.la \
-                           $(top_builddir)/korganizer/knewstuff/libknewstuff.la \
-			   $(top_builddir)/korganizer/kdgantt/libkdgantt.la notes/libkorg_notesview.la
+			-lkdeprint -lkabc -lkcalsystem \
+			$(top_builddir)/libkpimexchange/libkpimexchange.la \
+			$(top_builddir)/libkcal/libkcal.la \
+			$(top_builddir)/libkdepim/libkdepim.la \
+			$(top_builddir)/kalarmd/libkalarmd.la \
+			$(top_builddir)/korganizer/knewstuff/libknewstuff.la \
+			$(top_builddir)/korganizer/kdgantt/libkdgantt.la notes/libkorg_notesview.la
Index: datenavigator.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/datenavigator.cpp,v
retrieving revision 1.1.2.2
diff -U0 -r1.1.2.2 datenavigator.cpp
--- datenavigator.cpp	8 Jan 2003 11:42:02 -0000	1.1.2.2
+++ datenavigator.cpp	28 Jul 2003 15:14:11 -0000
@@ -26 +26 @@
-#include <calendarsystem/kcalendarsystem.h>
+#include <kcalendarsystem.h>
@@ -106 +106 @@
-  int dayOfWeek = KOCore::self()->calendarSystem()->dayOfTheWeek( d );
+  int dayOfWeek = d.dayOfWeek();
@@ -132 +132 @@
-  int dayOfWeek = KOCore::self()->calendarSystem()->dayOfTheWeek( d );
+  int dayOfWeek = d.dayOfWeek();
@@ -160 +160,2 @@
-    KOCore::self()->calendarSystem()->previousYearDate( *it );
+    //KOCore::self()->calendarSystem()->previousYearDate( *it );
+    (*it).addYears(-1);
@@ -170 +171,2 @@
-    KOCore::self()->calendarSystem()->previousMonthDate( *it );
+    //KOCore::self()->calendarSystem()->previousMonthDate( *it );
+    ( *it ).addMonths(-1);
@@ -180 +182,2 @@
-    KOCore::self()->calendarSystem()->nextMonthDate( *it );
+    //KOCore::self()->calendarSystem()->nextMonthDate( *it );
+    ( *it ).addMonths(1);
@@ -190 +193,2 @@
-    KOCore::self()->calendarSystem()->nextYearDate( *it );
+    //KOCore::self()->calendarSystem()->nextYearDate( *it );
+    ( *it ).addYears(1);
Index: kdatenavigator.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/kdatenavigator.cpp,v
retrieving revision 1.7.2.3
diff -U0 -r1.7.2.3 kdatenavigator.cpp
--- kdatenavigator.cpp	8 Jan 2003 11:42:02 -0000	1.7.2.3
+++ kdatenavigator.cpp	28 Jul 2003 15:14:11 -0000
@@ -41 +41 @@
-#include <calendarsystem/kcalendarsystem.h>
+#include <kcalendarsystem.h>
@@ -109 +109,2 @@
-    int width = fm.width( KOCore::self()->calendarSystem()->monthName(i) + " 2000" );
+    kdDebug(5850) << "Month Name : " << KOCore::self()->calendarSystem()->monthName(i,0, false) << endl;
+    int width = fm.width( KOCore::self()->calendarSystem()->monthName(i,0,false) + QString(" 2000") );
@@ -258 +259,2 @@
-  int m_fstDayOfWkCalsys = KOCore::self()->calendarSystem()->dayOfTheWeek( dayone );
+  //int m_fstDayOfWkCalsys = KOCore::self()->calendarSystem()->dayOfTheWeek( dayone );
+  int m_fstDayOfWkCalsys = dayone.dayOfWeek( );
@@ -304 +306,4 @@
-    int dayOfYear = KOCore::self()->calendarSystem()->numberOfDayInYear((daymatrix->getDate((i+1)*7-4)));
+    //int dayOfYear = KOCore::self()->calendarSystem()->numberOfDayInYear((daymatrix->getDate((i+1)*7-4)));
+    QDate  firstDayOfYear(m_MthYr.year(), 1, 1);
+    QDate  lastDayOfYear(m_MthYr.year(), 12, 31);
+    int dayOfYear = firstDayOfYear.daysTo( lastDayOfYear);
Index: koagendaview.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/koagendaview.cpp,v
retrieving revision 1.83.2.11
diff -U0 -r1.83.2.11 koagendaview.cpp
--- koagendaview.cpp	13 Feb 2003 11:15:40 -0000	1.83.2.11
+++ koagendaview.cpp	28 Jul 2003 15:14:11 -0000
@@ -445 +445,2 @@
-    int dW = KOCore::self()->calendarSystem()->dayOfTheWeek(date);
+    //int dW = KOCore::self()->calendarSystem()->dayOfTheWeek(date);
+    int dW = date.dayOfWeek();
Index: kocore.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/kocore.cpp,v
retrieving revision 1.11.2.2
diff -U0 -r1.11.2.2 kocore.cpp
--- kocore.cpp	8 Jan 2003 11:42:02 -0000	1.11.2.2
+++ kocore.cpp	28 Jul 2003 15:14:11 -0000
@@ -31,0 +32 @@
+#include <kcalendarsystemfactory.h>
Index: kocore.h
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/kocore.h,v
retrieving revision 1.10.2.1
diff -U0 -r1.10.2.1 kocore.h
--- kocore.h	20 Oct 2002 16:05:36 -0000	1.10.2.1
+++ kocore.h	28 Jul 2003 15:14:11 -0000
@@ -31 +31 @@
-#include <calendarsystem/kcalendarsystem.h>
+#include <kcalendarsystem.h>
Index: kodaymatrix.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/kodaymatrix.cpp,v
retrieving revision 1.19.2.3
diff -U0 -r1.19.2.3 kodaymatrix.cpp
--- kodaymatrix.cpp	8 Jan 2003 11:42:02 -0000	1.19.2.3
+++ kodaymatrix.cpp	28 Jul 2003 15:14:11 -0000
@@ -259 +259 @@
-   if ( (KOCore::self()->calendarSystem()->dayOfTheWeek(days[i]) == KOCore::self()->calendarSystem()->weekDayOfPray()) ||
+   if ( (days[i].dayOfWeek() == KOCore::self()->calendarSystem()->weekDayOfPray()) ||
Index: koeditordetails.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/koeditordetails.cpp,v
retrieving revision 1.35.2.57
diff -U0 -r1.35.2.57 koeditordetails.cpp
--- koeditordetails.cpp	18 Jun 2003 06:10:28 -0000	1.35.2.57
+++ koeditordetails.cpp	28 Jul 2003 15:14:11 -0000
@@ -133,0 +134,2 @@
+    kdDebug(5850) << "AttendeeListItem::setFreeBusyPeriods : maj busyPeriods" <<endl;
+    
@@ -137,0 +140 @@
+      kdDebug(5850) << "AttendeeListItem::setFreeBusyPeriods : period start " << (*it).start().toString() << " end " << (*it).end().toString() <<endl;
@@ -148,0 +152 @@
+    kdDebug(5850) << "AttendeeListItem::setFreeBusyPeriods : no busyPeriods" <<endl;
@@ -577,0 +582,10 @@
+  // Check if smart email address
+  QString email = mEmailEdit->text();
+  int possmartstart = email.find('<');
+  int possmartend = email.find('>');
+  if (possmartstart >= 0 && possmartend >= 0) {
+	  mNameEdit->setText(email.left(possmartstart));
+  	a->setEmail( email.mid(possmartstart +1, possmartend - possmartstart - 1) );
+  }
+  else
+  	a->setEmail( mEmailEdit->text() );
@@ -580 +593,0 @@
-  a->setEmail( mEmailEdit->text() );
@@ -615,0 +629 @@
+  kdDebug(5850) << "KOEditorDetails::slotInsertFreeBusy " << endl;
Index: koeditordetails.h
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/koeditordetails.h,v
retrieving revision 1.23.2.17
diff -U0 -r1.23.2.17 koeditordetails.h
--- koeditordetails.h	4 Feb 2003 09:33:02 -0000	1.23.2.17
+++ koeditordetails.h	28 Jul 2003 15:14:11 -0000
@@ -33,0 +34 @@
+#include <kabc/addresslineedit.h>
@@ -128 +129,2 @@
-class KOFocusOutLineEdit : public QLineEdit
+//class KOFocusOutLineEdit : public QLineEdit
+class KOFocusOutLineEdit : public KABC::AddressLineEdit
@@ -134 +136,2 @@
-        QLineEdit( parent, name ) {}
+//        QLineEdit( parent, name ) {}
+        KABC::AddressLineEdit( parent, true, name ) {}
Index: kogroupware.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/kogroupware.cpp,v
retrieving revision 1.1.2.29
diff -U0 -r1.1.2.29 kogroupware.cpp
--- kogroupware.cpp	7 Jul 2003 09:34:38 -0000	1.1.2.29
+++ kogroupware.cpp	28 Jul 2003 15:14:11 -0000
@@ -37,0 +38 @@
+#include <libkcal/calendarlocal.h>
@@ -755,0 +757,25 @@
+FBDownloadJob::FBDownloadJob( const QString& email, const QString &server, QDate &start, QDate &end, KCal::Calendar *calendar,KOGroupware* kogroupware, const char* name )
+  : QObject( kogroupware, name ), mEmail( email ), mStart( start ), mEnd( end ), mCalendar(calendar)
+{
+
+  QString  path;
+
+  int emailpos = email.find( '@' );
+  if( emailpos == -1 ) {
+    FreeBusy  *fb = new FreeBusy();
+    emit fbDownloaded( mEmail, fb );	
+    return ;
+  }
+
+  // Cut off everything left of the @ sign to get the user name.
+  QString emailName = email.left( emailpos );
+
+  path = QString("webdav://") + server + QString("/exchange/") + emailName ;
+  // we use something else
+  mAccount = new KPIM::ExchangeAccount( server, emailName, path, QString(""));
+  mExch = new KPIM::ExchangeClient(mAccount, false);
+
+  mExch->download(mCalendar, mStart, mEnd, false);
+  connect(mExch, SIGNAL(downloadFinished( int , const QString &  )), this, SLOT(soltResultExchange(int, const QString &)));
+}
+
@@ -781,0 +808,15 @@
+void FBDownloadJob::soltResultExchange(int result, const QString &moreInfo)
+{
+  if( result ) {
+    kdDebug(5850) << "KOGroupware::soltResultExchange() job error :-( : " << moreInfo << endl;
+  }
+
+  FreeBusy *fb = new FreeBusy( mCalendar, mStart, mEnd );
+
+  emit fbDownloaded( mEmail, fb );	
+  delete mCalendar;
+  delete mExch;
+  delete mAccount;
+  delete this;
+}
+
@@ -801 +841,0 @@
-    // we use Kolab
@@ -804,2 +844,2 @@
-	KOPrefs::instance()->mRetrieveKolabServer.isEmpty() )
-      server = emailHost;
+      	KOPrefs::instance()->mRetrieveKolabServer.isEmpty() )
+           server = emailHost;
@@ -807 +847,16 @@
-      server = KOPrefs::instance()->mRetrieveKolabServer;
+           server = KOPrefs::instance()->mRetrieveKolabServer;
+
+    if (KOPrefs::instance()->mRetrieveExchangeServer) {
+          QString anyurl = KOPrefs::instance()->mRetrieveAnyURL;
+          QDate start = QDate::currentDate().addMonths(-1);
+          QDate end = QDate::currentDate().addMonths(2);
+	  Calendar *attendeeCalendar = new KCal::CalendarLocal(KOPrefs::instance()->mTimeZoneId);
+
+	  kdDebug() << "Date initiale " << start.toString() << " end " << end.toString() << endl;
+          FBDownloadJob* job = new FBDownloadJob( email, server, start, end, attendeeCalendar, this, "fb_download_job" );
+	  connect( job, SIGNAL( fbDownloaded( const QString&, FreeBusy*) ),
+			 receiver, member );
+	  return true;
+    }
+    else {
+         // we use Kolab
@@ -809,6 +864,7 @@
-    sourceURL.setProtocol( "webdavs" );
-    sourceURL.setHost( server );
-    sourceURL.setPass( KOPrefs::instance()->mRetrievePassword );
-    sourceURL.setUser( KOPrefs::instance()->mRetrieveUserName );
-    sourceURL.setPath( QString::fromLatin1( "/freebusy/" ) + emailName +
-		       QString::fromLatin1( ".vfb" ) );
+         sourceURL.setProtocol( "webdavs" );
+         sourceURL.setHost( server );
+         sourceURL.setPass( KOPrefs::instance()->mRetrievePassword );
+         sourceURL.setUser( KOPrefs::instance()->mRetrieveUserName );
+         sourceURL.setPath( QString::fromLatin1( "/freebusy/" ) + emailName +
+     		       QString::fromLatin1( ".vfb" ) );
+    } 
@@ -819 +875 @@
-      anyurl.replace( "%SERVER%", emailHost );
+    	anyurl.replace( "%SERVER%", emailHost );
Index: kogroupware.h
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/kogroupware.h,v
retrieving revision 1.1.2.15
diff -U0 -r1.1.2.15 kogroupware.h
--- kogroupware.h	18 Jun 2003 07:17:52 -0000	1.1.2.15
+++ kogroupware.h	28 Jul 2003 15:14:11 -0000
@@ -34,0 +35,3 @@
+#include <kdepim/exchangeaccount.h>
+#include <kdepim/exchangeclient.h>
+
@@ -53,0 +57 @@
+  FBDownloadJob(const QString& email, const QString &server, QDate& start, QDate& end, KCal::Calendar *calendar, KOGroupware* kogroupware, const char* name =0);
@@ -57,0 +62 @@
+  void soltResultExchange(int , const QString &);
@@ -66,0 +72,5 @@
+  KPIM::ExchangeAccount *mAccount;
+  KPIM::ExchangeClient *mExch;
+  QDate mStart;
+  QDate mEnd;
+  KCal::Calendar *mCalendar;
Index: kogroupwareprefspage.ui
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/Attic/kogroupwareprefspage.ui,v
retrieving revision 1.1.2.9
diff -U0 -r1.1.2.9 kogroupwareprefspage.ui
--- kogroupwareprefspage.ui	17 Jun 2003 10:48:23 -0000	1.1.2.9
+++ kogroupwareprefspage.ui	28 Jul 2003 15:14:11 -0000
@@ -366,27 +366,50 @@
-                                <hbox>
-                                    <property name="name">
-                                        <cstring>unnamed</cstring>
-                                    </property>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>TextLabel5_2</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>&amp;Server name:</string>
-                                        </property>
-                                        <property name="buddy" stdset="0">
-                                            <cstring>kolabServerNameED</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>retrieveKolabServerNameED</cstring>
-                                        </property>
-                                        <property name="minimumSize">
-                                            <size>
-                                                <width>80</width>
-                                                <height>0</height>
-                                            </size>
-                                        </property>
-                                    </widget>
-                                </hbox>
+				<vbox>
+	                                <hbox>
+        	                            <property name="name">
+                	                        <cstring>unnamed</cstring>
+                        	            </property>
+                                	    <widget class="QLabel">
+	                                        <property name="name">
+        	                                    <cstring>TextLabel5_2</cstring>
+                	                        </property>
+                        	                <property name="text">
+	                                            <string>&amp;Server name:</string>
+        	                                </property>
+                	                        <property name="buddy" stdset="0">
+                        	                    <cstring>kolabServerNameED</cstring>
+                                	        </property>
+	                                    </widget>
+        	                            <widget class="QLineEdit">
+                 	                       <property name="name">
+                        	                    <cstring>retrieveKolabServerNameED</cstring>
+                                	        </property>
+                                        	<property name="minimumSize">
+	                                            <size>
+        	                                        <width>80</width>
+                	                                <height>0</height>
+                        	                    </size>
+                                	        </property>
+	                                    </widget>
+        	                        </hbox>
+					<hbox>
+        	                            <property name="name">
+                	                        <cstring>unnamed2</cstring>
+                        	            </property>
+                                	    <widget class="QLabel">
+	                                        <property name="name">
+        	                                    <cstring>TextLabel8_2</cstring>
+                	                        </property>
+                        	                <property name="text">
+                                	            <string>Exchange 2000 Server ?</string>
+                                        	</property>
+	                                    </widget>
+        	                            <widget class="QCheckBox">
+                	                        <property name="name">
+                        	                    <cstring>retrieveExchangeServer</cstring>
+                                	        </property>
+	                                        <property name="enabled">
+        	                                    <bool>true</bool>
+                	                        </property>
+                        	            </widget>
+	                                </hbox>
+				</vbox>
@@ -405,0 +429,3 @@
+                                <property name="enabled">
+                                    <bool>false</bool>
+                                </property>
@@ -407,14 +433,14 @@
-                                    <property name="name">
-                                        <cstring>unnamed</cstring>
-                                    </property>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>TextLabel7_2</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Server UR&amp;L:</string>
-                                        </property>
-                                        <property name="buddy" stdset="0">
-                                            <cstring>anyServerURLED</cstring>
-                                        </property>
-                                    </widget>
+       	                            <property name="name">
+               	                        <cstring>unnamed</cstring>
+                       	            </property>
+                               	    <widget class="QLabel">
+                                        <property name="name">
+       	                                    <cstring>TextLabel7_2</cstring>
+               	                        </property>
+                       	                <property name="text">
+                               	            <string>Server UR&amp;L:</string>
+                                        </property>
+       	                                <property name="buddy" stdset="0">
+               	                            <cstring>anyServerURLED</cstring>
+                       	                </property>
+                               	    </widget>
@@ -422,5 +448,5 @@
-                                        <property name="name">
-                                            <cstring>retrieveAnyServerURLED</cstring>
-                                        </property>
-                                        <property name="enabled">
-                                            <bool>false</bool>
+       	                                <property name="name">
+               	                            <cstring>retrieveAnyServerURLED</cstring>
+                       	                </property>
+                               	        <property name="enabled">
+                                       	    <bool>true</bool>
@@ -428,2 +454,2 @@
-                                    </widget>
-                                </hbox>
+       	                            </widget>
+				</hbox>
@@ -538,0 +565 @@
+        <receiver>retrieveExchangeServer</receiver>
Index: komonthview.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/komonthview.cpp,v
retrieving revision 1.61.2.3
diff -U0 -r1.61.2.3 komonthview.cpp
--- komonthview.cpp	8 Jan 2003 11:42:02 -0000	1.61.2.3
+++ komonthview.cpp	28 Jul 2003 15:14:11 -0000
@@ -595 +595 @@
-   while( KOCore::self()->calendarSystem()->dayOfTheWeek(mStartDate) != startWeekDay ) {
+   while( mStartDate.dayOfWeek() != startWeekDay ) {
@@ -608 +608 @@
-    if ( KOCore::self()->calendarSystem()->dayOfTheWeek(date) == KOCore::self()->calendarSystem()->weekDayOfPray() ) {
+    if ( date.dayOfWeek() == KOCore::self()->calendarSystem()->weekDayOfPray() ) {
Index: koprefs.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/koprefs.cpp,v
retrieving revision 1.58.2.9
diff -U0 -r1.58.2.9 koprefs.cpp
--- koprefs.cpp	19 May 2003 12:51:35 -0000	1.58.2.9
+++ koprefs.cpp	28 Jul 2003 15:14:11 -0000
@@ -64,7 +64,7 @@
-  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
-  addItemBool("Enable Project View",&mEnableProjectView,false);
-  addItemBool("Auto Save",&mAutoSave,false);
-  addItemInt("Auto Save Interval",&mAutoSaveInterval,10);
-  addItemBool("Confirm Deletes",&mConfirm,true);
-  addItemString("Archive File",&mArchiveFile);
-  addItemString("Html Export File",&mHtmlExportFile,
+  addItemBool(QString("Enable Group Scheduling"),mEnableGroupScheduling,false);
+  addItemBool(QString("Enable Project View"),mEnableProjectView,false);
+  addItemBool(QString("Auto Save"),mAutoSave,false);
+  addItemInt(QString("Auto Save Interval"),mAutoSaveInterval,10);
+  addItemBool(QString("Confirm Deletes"),mConfirm,true);
+  addItemString(QString("Archive File"),mArchiveFile);
+  addItemString(QString("Html Export File"),mHtmlExportFile,
@@ -75,4 +75,4 @@
-  addItemInt("Mail Client",&mMailClient,MailClientKMail);
-  addItemBool("Use Groupware Communication", &mGroupwareCommunication, false );
-  addItemBool("Use Control Center Email",&mEmailControlCenter,false);
-  addItemBool("Bcc",&mBcc,false);
+  addItemInt(QString("Mail Client"),mMailClient,MailClientKMail);
+  addItemBool(QString("Use Groupware Communication"), mGroupwareCommunication, false );
+  addItemBool(QString("Use Control Center Email"),mEmailControlCenter,false);
+  addItemBool(QString("Bcc"),mBcc,false);
@@ -82,6 +82,6 @@
-  addItemString("Time Zone",&mTimeZone,"+0000");
-  addItemString("TimeZoneId",&mTimeZoneId);
-  addItemInt("Default Start Time",&mStartTime,10);
-  addItemInt("Default Duration",&mDefaultDuration,2);
-  addItemInt("Default Alarm Time",&mAlarmTime,0);
-  addItemInt("Daylight Savings",&mDaylightSavings,0);
+  addItemString(QString("Time Zone"),mTimeZone,"+0000");
+  addItemString(QString("TimeZoneId"),mTimeZoneId);
+  addItemInt(QString("Default Start Time"),mStartTime,10);
+  addItemInt(QString("Default Duration"),mDefaultDuration,2);
+  addItemInt(QString("Default Alarm Time"),mAlarmTime,0);
+  addItemInt(QString("Daylight Savings"),mDaylightSavings,0);
@@ -91 +91 @@
-  addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
+  addItemInt(QString("Default Calendar Format"),mDefaultFormat,FormatICalendar);
@@ -95,4 +95,4 @@
-  addItemFont("TimeBar Font",&mTimeBarFont);
-  addItemFont("MonthView Font",&mMonthViewFont);
-  addItemFont("AgendaView Font",&mAgendaViewFont);
-  addItemFont("MarcusBains Font",&mAgendaViewFont);
+  addItemFont(QString("TimeBar Font"),mTimeBarFont);
+  addItemFont(QString("MonthView Font"),mMonthViewFont);
+  addItemFont(QString("AgendaView Font"),mAgendaViewFont);
+  addItemFont(QString("MarcusBains Font"),mAgendaViewFont);
@@ -102,7 +102,7 @@
-  addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
-  addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
-  addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
-  addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
-  addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
-  addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
-  addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
+  addItemColor(QString("Holiday Color"),mHolidayColor,defaultHolidayColor);
+  addItemColor(QString("Highlight Color"),mHighlightColor,defaultHighlightColor);
+  addItemColor(QString("Event Color"),mEventColor,mDefaultCategoryColor);
+  addItemColor(QString("Agenda Background Color"),mAgendaBgColor,defaultAgendaBgColor);
+  addItemColor(QString("WorkingHours Color"),mWorkingHoursColor,defaultWorkingHoursColor);
+  addItemColor(QString("Todo due today Color"),mTodoDueTodayColor,defaultTodoDueTodayColor);
+  addItemColor(QString("Todo overdue Color"),mTodoOverdueColor,defaultTodoOverdueColor);
@@ -112,13 +112,13 @@
-  addItemInt("Hour Size",&mHourSize,10);
-  addItemBool("Show Daily Recurrences",&mDailyRecur,true);
-  addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
-  addItemBool("Enable ToolTips",&mEnableToolTips,false);
-  addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
-  addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
-  addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
-
-  addItemInt("Day Begins",&mDayBegins,7);
-  addItemInt("Working Hours Start",&mWorkingHoursStart,8);
-  addItemInt("Working Hours End",&mWorkingHoursEnd,17);
-  addItemBool("Exclude Holidays",&mExcludeHolidays,true);
-  addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
+  addItemInt(QString("Hour Size"),mHourSize,10);
+  addItemBool(QString("Show Daily Recurrences"),mDailyRecur,true);
+  addItemBool(QString("Show Weekly Recurrences"),mWeeklyRecur,true);
+  addItemBool(QString("Enable ToolTips"),mEnableToolTips,false);
+  addItemBool(QString("Enable MonthView ScrollBars"),mEnableMonthScroll,false);
+  addItemBool(QString("Marcus Bains shows seconds"),mMarcusBainsShowSeconds,false);
+  addItemBool(QString("Show Marcus Bains"),mMarcusBainsEnabled,true);
+
+  addItemInt(QString("Day Begins"),mDayBegins,7);
+  addItemInt(QString("Working Hours Start"),mWorkingHoursStart,8);
+  addItemInt(QString("Working Hours End"),mWorkingHoursEnd,17);
+  addItemBool(QString("Exclude Holidays"),mExcludeHolidays,true);
+  addItemBool(QString("Exclude Saturdays"),mExcludeSaturdays,true);
@@ -126,2 +126,2 @@
-  addItemBool("Full View Month",&mFullViewMonth,false);
-  addItemBool("Full View Todo",&mFullViewTodo,true);
+  addItemBool(QString("Full View Month"),mFullViewMonth,false);
+  addItemBool(QString("Full View Todo"),mFullViewTodo,true);
@@ -129 +129 @@
-  addItemInt("Next X Days",&mNextXDays,3);
+  addItemInt(QString("Next X Days"),mNextXDays,3);
@@ -135,2 +135,2 @@
-  addItemBool("CompactDialogs",&mCompactDialogs,false);
-  addItemBool("VerticalScreen",&mVerticalScreen,false);
+  addItemBool(QString("CompactDialogs"),mCompactDialogs,false);
+  addItemBool(QString("VerticalScreen"),mVerticalScreen,false);
@@ -140 +140 @@
-  addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
+  addItemStringList(QString("SelectedPlugins"),mSelectedPlugins,"holidays");
@@ -144,8 +144,8 @@
-  addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
-  addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
-  addItemStringList("AdditionalMails",&mAdditionalMails,"");
-  addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
-  addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
-  addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
-  addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
-  addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
+  addItemInt(QString("IMIPScheduler"),mIMIPScheduler,IMIPKMail);
+  addItemInt(QString("IMIPSend"),mIMIPSend,IMIPdirectsend);
+  addItemStringList(QString("AdditionalMails"),mAdditionalMails,"");
+  addItemInt(QString("IMIP auto refresh"),mIMIPAutoRefresh,neverAuto);
+  addItemInt(QString("IMIP auto insert request"),mIMIPAutoInsertRequest,neverAuto);
+  addItemInt(QString("IMIP auto insert reply"),mIMIPAutoInsertReply,neverAuto);
+  addItemInt(QString("IMIP auto FreeBusy"),mIMIPAutoFreeBusy,neverAuto);
+  addItemInt(QString("IMIP auto save FreeBusy"),mIMIPAutoFreeBusyReply,neverAuto);
@@ -155,2 +155,2 @@
-  addItemStringList( "EventTemplates", &mEventTemplates );
-  addItemStringList( "TodoTemplates", &mTodoTemplates );
+  addItemStringList( QString("EventTemplates"), mEventTemplates );
+  addItemStringList( QString("TodoTemplates"), mTodoTemplates );
@@ -160,14 +160,15 @@
-  addItemBool( "Automatic FreeBusy lists publishing", &mAutoPublish, true );
-  addItemInt( "Auto publish delay", &mPublishDelay, 5 );
-  addItemInt( "Publish FreeBusy days", &mPublishFreeBusyDays, 60 );
-  addItemBool( "Publish to Kolab server", &mPublishKolab, true );
-  addItemString( "Publish to Kolab server name", &mPublishKolabServer, "" );
-  addItemString( "Publish user name", &mPublishUserName, "" );
-  addItemString( "Publish to any server URL", &mPublishAnyURL, "" );
-  addItemBool( "Remember publish password", &mRememberPublishPw, false );
-  addItemBool( "Retrieve FreeBusy lists", &mRetrieveFreeBusy, true );
-  addItemBool( "Retrieve from Kolab server", &mRetrieveKolab, true );
-  addItemString( "Retrieve from Kolab server name", &mRetrieveKolabServer, "" );
-  addItemString( "Retrieve from any server URL", &mRetrieveAnyURL, "" );
-  addItemString( "Retrieve user name", &mRetrieveUserName, "" );
-  addItemBool( "Remember retrieve password", &mRememberRetrievePw, false );
+  addItemBool(QString("Automatic FreeBusy lists publishing"), mAutoPublish, true );
+  addItemInt(QString("Auto publish delay"),mPublishDelay, 5 );
+  addItemInt(QString("Publish FreeBusy days"), mPublishFreeBusyDays, 60 );
+  addItemBool(QString("Publish to Kolab server"), mPublishKolab, true );
+  addItemString(QString("Publish to Kolab server name"), mPublishKolabServer, "" );
+  addItemString(QString("Publish user name"), mPublishUserName, "" );
+  addItemString(QString("Publish to any server URL"), mPublishAnyURL, "" );
+  addItemBool(QString("Remember publish password"), mRememberPublishPw, false );
+  addItemBool(QString("Retrieve FreeBusy lists"), mRetrieveFreeBusy, true );
+  addItemBool(QString("Retrieve from Kolab server"), mRetrieveKolab, true );
+  addItemString(QString("Retrieve from Kolab server name"), mRetrieveKolabServer, "" );
+  addItemBool(QString("Retrieve If this is an Exchange server"), mRetrieveExchangeServer, false );
+  addItemString(QString("Retrieve from any server URL"), mRetrieveAnyURL, "" );
+  addItemString(QString("Retrieve user name"), mRetrieveUserName, "" );
+  addItemBool(QString("Remember retrieve password"), mRememberRetrievePw, false );
Index: koprefs.h
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/koprefs.h,v
retrieving revision 1.45.2.7
diff -U0 -r1.45.2.7 koprefs.h
--- koprefs.h	19 May 2003 12:51:35 -0000	1.45.2.7
+++ koprefs.h	28 Jul 2003 15:14:11 -0000
@@ -171,0 +172 @@
+    bool mRetrieveExchangeServer;
Index: koprefsdialog.cpp
===================================================================
RCS file: /home/taiebma/kde/cvsroot/kdepim/korganizer/koprefsdialog.cpp,v
retrieving revision 1.60.2.12
diff -U0 -r1.60.2.12 koprefsdialog.cpp
--- koprefsdialog.cpp	19 May 2003 12:51:35 -0000	1.60.2.12
+++ koprefsdialog.cpp	28 Jul 2003 15:14:11 -0000
@@ -103 +103 @@
-                  &(KOPrefs::instance()->mGroupwareCommunication), topFrame );
+                  (KOPrefs::instance()->mGroupwareCommunication), topFrame );
@@ -111 +111 @@
-                 &(KOPrefs::instance()->mEmailControlCenter),topFrame);
+                 (KOPrefs::instance()->mEmailControlCenter),topFrame);
@@ -128 +128 @@
-                 &(KOPrefs::instance()->mBcc),topFrame);
+                 (KOPrefs::instance()->mBcc),topFrame);
@@ -137 +137 @@
-             &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
+             (KOPrefs::instance()->mAutoSave),autoSaveGroup);
@@ -147 +147 @@
-      addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
+      addWidBool(i18n("Confirm &deletes"),(KOPrefs::instance()->mConfirm),
@@ -154 +154 @@
-                 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
+                 (KOPrefs::instance()->mEnableGroupScheduling),topFrame);
@@ -161 +161 @@
-                 &(KOPrefs::instance()->mEnableProjectView),topFrame);
+                 (KOPrefs::instance()->mEnableProjectView),topFrame);
@@ -174 +174 @@
-                   &(KOPrefs::instance()->mDefaultFormat),topFrame);
+                   (KOPrefs::instance()->mDefaultFormat),topFrame);
@@ -184 +184 @@
-      addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
+      addWidRadios(i18n("Mail Client"),(KOPrefs::instance()->mMailClient),
@@ -267 +267 @@
-             &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
+             (KOPrefs::instance()->mWorkingHoursStart),workStartBox);
@@ -272 +272 @@
-             &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
+             (KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
@@ -275 +275 @@
-             &(KOPrefs::instance()->mExcludeHolidays),workingHoursGroup);
+             (KOPrefs::instance()->mExcludeHolidays),workingHoursGroup);
@@ -278 +278 @@
-             &(KOPrefs::instance()->mExcludeSaturdays),workingHoursGroup);
+             (KOPrefs::instance()->mExcludeSaturdays),workingHoursGroup);
@@ -281 +281 @@
-	     &(KOPrefs::instance()->mMarcusBainsShowSeconds),
+	     (KOPrefs::instance()->mMarcusBainsShowSeconds),
@@ -302 +302 @@
-    addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
+    addWidTime(i18n("Day begins at:"),(KOPrefs::instance()->mDayBegins),
@@ -323 +323 @@
-               &(KOPrefs::instance()->mDailyRecur),topFrame);
+               (KOPrefs::instance()->mDailyRecur),topFrame);
@@ -328 +328 @@
-               &(KOPrefs::instance()->mWeeklyRecur),topFrame);
+               (KOPrefs::instance()->mWeeklyRecur),topFrame);
@@ -333 +333 @@
-                 &(KOPrefs::instance()->mEnableToolTips),topFrame);
+                 (KOPrefs::instance()->mEnableToolTips),topFrame);
@@ -338 +338 @@
-                 &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
+                 (KOPrefs::instance()->mEnableMonthScroll),topFrame);
@@ -343 +343 @@
-                 &(KOPrefs::instance()->mFullViewMonth),topFrame);
+                 (KOPrefs::instance()->mFullViewMonth),topFrame);
@@ -348 +348 @@
-                 &(KOPrefs::instance()->mFullViewTodo),topFrame);
+                 (KOPrefs::instance()->mFullViewTodo),topFrame);
@@ -353 +353 @@
-                 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
+                 (KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
@@ -371 +371 @@
-                 &(KOPrefs::instance()->mTimeBarFont),topFrame);
+                 (KOPrefs::instance()->mTimeBarFont),topFrame);
@@ -378 +378 @@
-                 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame);
+                 i18n("Month view:"),(KOPrefs::instance()->mMonthViewFont),topFrame);
@@ -385 +385 @@
-                 &(KOPrefs::instance()->mAgendaViewFont),topFrame);
+                 (KOPrefs::instance()->mAgendaViewFont),topFrame);
@@ -392 +392 @@
-                 &(KOPrefs::instance()->mMarcusBainsFont),topFrame);
+                 (KOPrefs::instance()->mMarcusBainsFont),topFrame);
@@ -413 +413 @@
-                  &(KOPrefs::instance()->mHolidayColor),topFrame);
+                  (KOPrefs::instance()->mHolidayColor),topFrame);
@@ -420 +420 @@
-                  &(KOPrefs::instance()->mHighlightColor),topFrame);
+                  (KOPrefs::instance()->mHighlightColor),topFrame);
@@ -427 +427 @@
-                  &(KOPrefs::instance()->mEventColor),topFrame);
+                  (KOPrefs::instance()->mEventColor),topFrame);
@@ -434 +434 @@
-                  &(KOPrefs::instance()->mAgendaBgColor),topFrame);
+                  (KOPrefs::instance()->mAgendaBgColor),topFrame);
@@ -441 +441 @@
-                  &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
+                  (KOPrefs::instance()->mWorkingHoursColor),topFrame);
@@ -448 +448 @@
-                  &(KOPrefs::instance()->mTodoDueTodayColor),topFrame);
+                  (KOPrefs::instance()->mTodoDueTodayColor),topFrame);
@@ -455 +455 @@
-                  &(KOPrefs::instance()->mTodoOverdueColor),topFrame);
+                  (KOPrefs::instance()->mTodoOverdueColor),topFrame);
@@ -524 +524 @@
-      addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
+      addWidRadios(i18n("Scheduler Mails Should Be"),(KOPrefs::instance()->mIMIPSend),
@@ -564 +564 @@
-                   &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
+                   (KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
@@ -572 +572 @@
-                   &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame);
+                   (KOPrefs::instance()->mIMIPAutoInsertReply),topFrame);
@@ -580 +580 @@
-                   &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame);
+                   (KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame);
@@ -588 +588 @@
-                   &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame);
+                   (KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame);
@@ -596 +596 @@
-                   &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame);
+                   (KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame);
@@ -684,0 +685 @@
+    mGroupwarePage->retrieveExchangeServer->setChecked( KOPrefs::instance()->mRetrieveExchangeServer );
@@ -749,0 +751 @@
+    KOPrefs::instance()->mRetrieveExchangeServer = mGroupwarePage->retrieveExchangeServer->isChecked();


More information about the Kroupware mailing list