11 files changed, 40 insertions, 400 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index e571980..19a1845 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -316,4 +316,20 @@ void Addressee::mergeContact( const Addressee& ad )
 }
 
+void Addressee::simplifyAddresses()
+{
+    if ( mData->addresses.count() < 3 ) return ;
+    int count = 0;
+    Address::List list;
+    Address::List::Iterator it;
+    for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
+        if ( count > 1 )
+            list.append( *it );
+        ++count;
+    }
+    for( it = list.begin(); it != list.end(); ++it ) {
+        removeAddress( (*it) );
+    }
+}
+
 // removes all emails but the first 
 // needed by phone sync
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 4cafa86..44f0629 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -119,4 +119,5 @@ class Addressee
     void mergeContact(  const Addressee& ad ); 
     void simplifyEmails();
+    void simplifyAddresses();
     void simplifyPhoneNumbers();
     void simplifyPhoneNumberTypes();
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 939296f..9b059d3 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -319,8 +319,9 @@ KABCore::~KABCore()
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
-  mAddressBook = 0;
-  KABC::StdAddressBook::close();
+    mAddressBook = 0;
+    KABC::StdAddressBook::close();
+    
+    delete syncManager;
 
-  delete syncManager;
 }
 
@@ -703,4 +704,5 @@ void KABCore::export2phone()
       a.simplifyPhoneNumbers();
       a.simplifyPhoneNumberTypes();
+      a.simplifyAddresses();
 
       if (description.isEmpty())
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 552c933..dded2bf 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -83,6 +83,7 @@ KABPrefs::KABPrefs()
 KABPrefs::~KABPrefs()
 {
+    //qDebug("KABPrefs::~KABPrefs() ");
 }
-
+ 
 KABPrefs *KABPrefs::instance()
 {
diff --git a/kalarmd/simplealarmdaemonapplet.cpp b/kalarmd/simplealarmdaemonapplet.cpp
index bb89606..7e8125d 100644
--- a/kalarmd/simplealarmdaemonapplet.cpp
+++ b/kalarmd/simplealarmdaemonapplet.cpp
@@ -3,5 +3,4 @@
 #include "simplealarmdaemonimpl.h"
 
-#include <qpe/global.h>
 #include <qcopchannel_qws.h> 
 #include <qlabel.h>
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 6484c45..c0200ff 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -69,259 +69,4 @@ KOPrefs::KOPrefs() :
     addItemFont("Read Font",&mReadFont);
 
-#if 0
-  mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
-  mDefaultViewFont = QFont("helvetica",10);
-  mDefaultMonthViewFont = QFont("helvetica",8);
-  mMarcusBainsFont= QFont("helvetica",10);
-  mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
-  mEditBoxFont = QFont("helvetica",12);
-  mJornalViewFont = QFont("helvetica",12);
-
-  KPrefs::setCurrentGroup("General");
-  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
-
-  addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
-  addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
-  addItemBool("ShowIconSearch",&mShowIconSearch,true);
-  addItemBool("ShowIconList",&mShowIconList,true);
-  addItemBool("ShowIconDay1",&mShowIconDay1,true);
-  addItemBool("ShowIconDay5",&mShowIconDay5,true);
-  addItemBool("ShowIconDay7",&mShowIconDay7,true);
-  addItemBool("ShowIconMonth",&mShowIconMonth,true);
-  addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
-  addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
-  addItemBool("ShowIconBack",&mShowIconBack,true);
-  addItemBool("ShowIconToday",&mShowIconToday,true);
-  addItemBool("ShowIconForward",&mShowIconForward,true);
-  addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
-  addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false);
-  addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
-  addItemBool("ShowIconNext",&mShowIconNext,true);
-  addItemBool("ShowIconJournal",&mShowIconJournal,true); 
-  addItemBool("ShowIconStretch",&mShowIconStretch,true); 
-  addItemBool("LanguageChanged",&mLanguageChanged,false); 
-
-  addItemBool("AskForQuit",&mAskForQuit,false); 
-
-#ifndef DESKTOP_VERSION
-  addItemBool("ShowFullMenu",&mShowFullMenu,false); 
-#else
-  addItemBool("ShowFullMenu",&mShowFullMenu,true); 
-#endif
-  addItemBool("ToolBarHor",&mToolBarHor, true );
-  addItemBool("ToolBarUp",&mToolBarUp, false );
-  addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
-  addItemInt("Whats Next Days",&mWhatsNextDays,3);
-  addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
-
-  addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
-  addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
-  addItemInt("AllDay Size",&mAllDaySize,28);
-  QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
-  addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
-
-  addItemStringList("LocationDefaults",&mLocationDefaults );
-  addItemStringList("EventSummary User",&mEventSummaryUser);
-  addItemStringList("TodoSummary User",&mTodoSummaryUser);
-
-  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
-  addItemBool("Enable Project View",&mEnableProjectView,false);
-  addItemBool("Auto Save",&mAutoSave,false);
-  addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
-  addItemBool("Confirm Deletes",&mConfirm,true);
-  addItemString("Archive File",&mArchiveFile);
-  addItemString("Html Export File",&mHtmlExportFile,
-      QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
-  addItemBool("Html With Save",&mHtmlWithSave,false);
-
-  KPrefs::setCurrentGroup("Personal Settings");
-
-  addItemInt("Mail Client",&mMailClient,MailClientKMail);
-  addItemBool("Use Control Center Email",&mEmailControlCenter,false);
-  addItemBool("Bcc",&mBcc,false);
-
-  KPrefs::setCurrentGroup("Time & Date");
-
-  // addItemString("Time Zone",&mTimeZone,"+0100");
-  addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") );
-  // addItemInt("TimeZoneOffset",&mTimeZoneOffset,60);
-  addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
-  addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
-  addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
-
-
-  addItemInt("Default Start Time",&mStartTime,10);
-  addItemInt("Default Duration",&mDefaultDuration,2);
-  addItemInt("Default Alarm Time",&mAlarmTime,3);
-  addItemInt("Daylight Savings",&mDaylightSavings,0);
-  KPrefs::setCurrentGroup("AlarmSettings");
-  addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
-  addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
-  addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
-  addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
-
-
-  KPrefs::setCurrentGroup("Calendar");
-
-  addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
-
-  KPrefs::setCurrentGroup("Fonts");
-  // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
-  addItemFont("TimeBar Font",&mTimeBarFont);
-  addItemFont("MonthView Font",&mMonthViewFont);
-  addItemFont("AgendaView Font",&mAgendaViewFont);
-  addItemFont("MarcusBains Font",&mMarcusBainsFont);
-  addItemFont("TimeLabels Font",&mTimeLabelsFont);
-  addItemFont("TodoView Font",&mTodoViewFont);
-  addItemFont("ListView Font",&mListViewFont);
-  addItemFont("DateNavigator Font",&mDateNavigatorFont);
-  addItemFont("EditBox Font",&mEditBoxFont);
-  addItemFont("JournalView Font",&mJornalViewFont);
-  addItemFont("WhatsNextView Font",&mWhatsNextFont);
-  addItemFont("EventView Font",&mEventViewFont);
-
-//   KPrefs::setCurrentGroup("SyncProfiles");
-//   addItemString("LocalMachineName",&mLocalMachineName, "undefined");
-//   addItemStringList("SyncProfileNames",&mSyncProfileNames);
-//   addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames);
-
-  KPrefs::setCurrentGroup("RemoteSyncing");
-//   addItemBool("UsePasswd",&mUsePassWd,false); 
-//   addItemBool("WriteBackFile",&mWriteBackFile,true);
-//   addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
-//   addItemBool("AskForPreferences",&mAskForPreferences,true); 
-//   addItemBool("ShowSyncSummary",&mShowSyncSummary,true); 
-  addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
-  addItemInt("LastSyncTime",&mLastSyncTime,0); 
-  addItemInt("SyncAlgoPrefs",&mSyncAlgoPrefs,3); 
-  addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3);
-
-#ifdef _WIN32_
-  QString hdp= locateLocal("data","korganizer")+"\\\\";
-#else
-  QString hdp= locateLocal("data","korganizer")+"/";
-#endif
-//   addItemString("RemoteIP",&mRemoteIP, "192.168.0.65");
-//   addItemString("RemoteUser",&mRemoteUser, "zaurus");
-//   addItemString("RemotePassWd",&mRemotePassWd, "");
-//   addItemString("RemoteFile", &mRemoteFile, hdp+"mycalendar.ics");
-//   addItemString("LocalTempFile",&mLocalTempFile, "/tmp/tempsyncfile.ics" );
-
-
-  KPrefs::setCurrentGroup("LoadSaveFileNames");
-
-  addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
-  addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
-  addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
-  addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
-  addItemString("LastSyncedLocalFile", &mLastSyncedLocalFile ,hdp +"lastsync.ics" );
- 
-
-  KPrefs::setCurrentGroup("Locale");
-  addItemInt("PreferredLanguage",&mPreferredLanguage,0);
-  addItemInt("PreferredTime",&mPreferredTime,0);
-  addItemInt("PreferredDate",&mPreferredDate,0);
-  addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
-  addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); 
-  addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
-  addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
-  addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
-
-
-  KPrefs::setCurrentGroup("Colors");
-  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("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
-  addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
-  addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
-  addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
-  addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
-  addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
-  addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
-  addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
-  addItemBool("UseAppColors",&mUseAppColors,false); 
-
-  
-
-  KPrefs::setCurrentGroup("Views");
-  addItemInt("Hour Size",&mHourSize,8);
-  addItemBool("Show Daily Recurrences",&mDailyRecur,true);
-  addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
-  addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
-  addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
-  addItemBool("ShowShortMonthName",&mMonthShowShort,false);
-  addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,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);
-  addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
-  addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false);
-  addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
-  addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
-  addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
-  addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
-  addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);
-  addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
-  addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
-  addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
-  addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
-  addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
-  addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
-  addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
-  addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
-#ifdef DESKTOP_VERSION
-  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
-#else
-  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
-#endif
-  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);
-
-  addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
-  addItemBool("Full View Month",&mFullViewMonth,true);
-  addItemBool("Full View Todo",&mFullViewTodo,true);
-  addItemBool("Quick Todo",&mEnableQuickTodo,false);
-
-  addItemInt("Next X Days",&mNextXDays,3);
-
-  KPrefs::setCurrentGroup("Printer");
-
-  KPrefs::setCurrentGroup("Layout");
-
-  addItemBool("CompactDialogs",&mCompactDialogs,false);
-  addItemBool("VerticalScreen",&mVerticalScreen,true);
-
-  KPrefs::setCurrentGroup("KOrganizer Plugins");
-
-  addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
-
-  KPrefs::setCurrentGroup("Group Scheduling");
-
-  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);
-
-  KPrefs::setCurrentGroup( "Editors" );
-
-  addItemStringList( "EventTemplates", &mEventTemplates );
-  addItemStringList( "TodoTemplates", &mTodoTemplates );
-
-  addItemInt("DestinationPolicy",&mDestination,standardDestination);
-
-#endif
 
 }
@@ -332,10 +77,5 @@ KOPrefs::~KOPrefs()
   if (mInstance == this)
       mInstance = insd.setObject(0); 
-#if 0
-  setLocaleDict( 0 );
-  if ( mLocaleDict )
-      delete mLocaleDict;
-  //qDebug("KOPrefs::~KOPrefs() ");
-#endif
+
 }
 
@@ -370,109 +110,5 @@ void KOPrefs::setTimeZoneIdDefault()
 void KOPrefs::usrReadConfig()
 {
-#if 0
-    mLocaleDict = 0;
-    // pending LR fix translation
-    // qDebug("KOPrefs::usrReadConfig() fix translation ");
-    if ( mPreferredLanguage > 0 && mPreferredLanguage < 4 ) {
-        if ( mPreferredLanguage == 1 ) {
-            mLocaleDict = new QDict<QString>;
-            int i = 0;
-            QString fw ( germanwords[i] [0]);
-            while ( !fw.isEmpty() ) {
-                mLocaleDict->insert( fw, new QString (germanwords[i] [1] ));
-                ++i;
-                fw = germanwords[i] [0];
-            }
-        
-            setLocaleDict( mLocaleDict );
-        } else {
-            QString fileName ;
-            if ( mPreferredLanguage == 3 ) 
-                fileName = MainWindow::resourcePath()+"usertranslation.txt"; 
-            else if ( mPreferredLanguage == 2 ) 
-                fileName = MainWindow::resourcePath()+"frenchtranslation.txt";
-            QFile file( fileName );
-            if (file.open( IO_ReadOnly ) ) {
-                QTextStream ts( &file );
-                ts.setEncoding( QTextStream::Latin1 );
-                //ts.setCodec( QTextCodec::latin1 );
-                QString  text = ts.read();
-                file.close();  
-                text.replace( QRegExp("\\\\n"), "\n" );
-                QString line;
-                QString we;
-                QString wt;
-                int br = 0;
-                int nbr;
-                nbr = text.find ( "},", br );
-                line = text.mid( br, nbr - br );
-                br = nbr+1;
-                int se, ee, st, et;
-                mLocaleDict = new QDict<QString>;
-                QString end = "{ \"\",\"\" }";
-                while ( (line != end) && (br > 1)  ) {
-                    //qDebug("%d *%s* ", br, line.latin1());
-                    se = line.find("\"")+1;
-                    et = line.findRev("\"",-1);
-                    ee = line.find("\",\"");
-                    st = ee+3;
-                    we = line.mid( se, ee-se );
-                    wt = line.mid( st, et-st );
-                    //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
-                    mLocaleDict->insert( we, new QString (wt) );
-                    nbr = text.find ( "}", br );
-                    line = text.mid( br, nbr - br );
-                    br = nbr+1;
-                }
-                //qDebug("end *%s* ", end.latin1());
-
-                setLocaleDict( mLocaleDict );
-            } else {
-                qDebug("KO: Cannot find translation file %s",fileName.latin1() );
-            }
-    
-        }
-    }
-    config()->setGroup("General");
-    
-    mCustomCategories = config()->readListEntry("Custom Categories");
-    if ( KOPrefs::instance()->mLanguageChanged ) {
-        mLocationDefaults.clear();
-        mEventSummaryUser.clear();
-        mTodoSummaryUser.clear();
-    }
-   if (mLocationDefaults.isEmpty()) {
-       mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
-                         << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
-                         << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
-       // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
-       mLocationDefaults.sort();
-    }
-       
-   if (mEventSummaryUser.isEmpty()) {
-        mEventSummaryUser  = getDefaultList() ;
-    }
-   if (mTodoSummaryUser.isEmpty()) {
-       mTodoSummaryUser  = getDefaultList() ;
-   }
-  
-  if (mCustomCategories.isEmpty()) setCategoryDefaults();
-
-  config()->setGroup("Personal Settings");
-  mName = config()->readEntry("user_name","");
-  mEmail = config()->readEntry("user_email","");
-  fillMailDefaults();
 
-  config()->setGroup("Category Colors");
-  QStringList::Iterator it;
-  for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
-    setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
-   
-  }
-  
-  if (mTimeZoneId.isEmpty()) {
-    setTimeZoneIdDefault();
-  }
-#endif
   KPimPrefs::usrReadConfig();
 }
@@ -481,20 +117,5 @@ void KOPrefs::usrReadConfig()
 void KOPrefs::usrWriteConfig()
 {
-#if 0
-  config()->setGroup("General");
-  config()->writeEntry("Custom Categories",mCustomCategories); 
-  
-  config()->setGroup("Personal Settings");
-  config()->writeEntry("user_name",mName);
-  config()->writeEntry("user_email",mEmail);
 
-  config()->setGroup("Category Colors");
-  QDictIterator<QColor> it(mCategoryColors);
-  while (it.current()) {
-    config()->writeEntry(it.currentKey(),*(it.current()));
-    ++it;
-  }
-
-#endif
   KPimPrefs::usrWriteConfig();
 }
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 7f9b5c6..16186c0 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -3,4 +3,5 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
+#include <qcopchannel_qws.h> 
 #include <qpe/global.h>
 #include <stdlib.h>
@@ -80,4 +81,6 @@ int main( int argc, char **argv )
       MainWindow m;
 #ifndef DESKTOP_VERSION
+      QCopChannel* c1 = new QCopChannel("QPE/Application/datebook",&m, "channel" ) ;   
+      QObject::connect( c1, SIGNAL (received ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
       QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
       a.showMainWidget(&m );
@@ -97,4 +100,7 @@ int main( int argc, char **argv )
       }
       a.exec();
+#ifndef DESKTOP_VERSION
+      delete c1;
+#endif
 
   }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2d17986..3c16458 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -131,5 +131,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     setFont( QFont("Arial"), 14 );
 #endif
-    mServerSocket = 0;
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
@@ -280,8 +279,6 @@ MainWindow::~MainWindow()
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
-    delete mServerSocket;
     delete mCalendar;
-    delete KOPrefs::instance();
-    delete KIncidenceFormatter::instance();
+    delete mSyncManager;
 
 
@@ -483,5 +480,4 @@ void MainWindow::initActions()
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
-    connect ( syncMenu, SIGNAL( activated ( int )  ), this, SLOT (slotSyncMenu( int ) ) );
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow ()  ), this, SLOT (fillFilterMenu() ) );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index ee7bd87..e3383ed 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -93,6 +93,4 @@ class MainWindow : public QMainWindow
   private:
     KSyncManager* mSyncManager;
-    //QTimer* mTimerCommandSocket;
-    KServerSocket * mServerSocket;
     bool mClosed;
     void saveOnClose();
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index b71e18d..5081b26 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -63,7 +63,4 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
 
-
-
-
   KPrefs::setCurrentGroup( "ExternalApplications" );
 
@@ -100,5 +97,4 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" );
 
-
   KPrefs::setCurrentGroup( "PhoneAccess" );
   addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm");
@@ -106,7 +102,7 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i");
 
-
 }
 
+
 void KPimGlobalPrefs::setGlobalConfig()
 {
@@ -127,5 +123,7 @@ void KPimGlobalPrefs::setGlobalConfig()
 }
 KPimGlobalPrefs::~KPimGlobalPrefs()
-{
+{ 
+    //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() ");
+    writeConfig();
 }
 
diff --git a/microkde/kstaticdeleter.h b/microkde/kstaticdeleter.h
index 190f3e4..dfd3929 100644
--- a/microkde/kstaticdeleter.h
+++ b/microkde/kstaticdeleter.h
@@ -29,6 +29,8 @@ class KStaticDeleter
   public:
     KStaticDeleter() {};
-    type *setObject( type *obj, bool isArray = false) { return obj; }
-    virtual ~KStaticDeleter() {};
+    type *setObject( type *obj, bool isArray = false) { _mobj = obj;return obj; }
+    virtual ~KStaticDeleter() {delete _mobj;};
+ private:
+    type* _mobj;
 };