1 files changed, 30 insertions, 14 deletions

diff --git a/korganizer/kosyncprefsdialog.cpp b/korganizer/kosyncprefsdialog.cpp
index b7e4265..7c838f5 100644
--- a/korganizer/kosyncprefsdialog.cpp
+++ b/korganizer/kosyncprefsdialog.cpp
@@ -26,12 +26,13 @@
 #include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
+#include <qdir.h>
 #include <qtextstream.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
@@ -56,16 +57,16 @@
 
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <libkdepim/ksyncprofile.h>
 
 
-#include "koprefs.h"
+//#include "koprefs.h"
 
 #include "kosyncprefsdialog.h"
-#include "koglobals.h"
+//#include "koglobals.h"
 
 
 KOSyncPrefsDialog::KOSyncPrefsDialog(QWidget *parent, char *name, bool modal) :
   KDialog(parent,name,true)
 {
 
@@ -230,13 +231,13 @@ void KOSyncPrefsDialog::slotOK()
 void KOSyncPrefsDialog::accept()
 {
     slotOK();
 }
 void KOSyncPrefsDialog::chooseFile()
 {
-    QString fn =KOPrefs::instance()->mLastSyncedLocalFile;
+    QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     mRemoteFile->setText( fn );
 }
@@ -410,43 +411,58 @@ void KOSyncPrefsDialog::cloneProfile()
     if ( currentSelection >= 0 ) 
         addProfile (mSyncProfiles.at(currentSelection)->clone()) ;
     else
         newProfile();
 }
 
+void KOSyncPrefsDialog::setLocalMachineName ( const QString& name )
+{
+    mMyMachineName->setText( name );
 
+}
+QString KOSyncPrefsDialog::getLocalMachineName ( )
+{
+    return mMyMachineName->text();
+}
+
+QStringList KOSyncPrefsDialog::getSyncProfileNames()
+{
+    return mSyncProfileNames;
+}
 void KOSyncPrefsDialog::usrReadConfig()
 { 
-    KConfig *config = KOGlobals::config();
-    config->setGroup("SyncProfiles");
-    mSyncProfileNames = KOPrefs::instance()->mSyncProfileNames;
+    //KConfig *config = KOGlobals::config();
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
+    config.setGroup("SyncProfiles");
+    mSyncProfileNames =config.readListEntry("SyncProfileNames");
     int i;
     KSyncProfile* temp ;
     mSyncProfiles.clear();
     for ( i = 0; i < mSyncProfileNames.count();++i ) {
         temp = new KSyncProfile ();
         temp->setName( mSyncProfileNames[i] );
-        temp->readConfig( config );
+        temp->readConfig( &config );
         mSyncProfiles.append( temp );
     }
     insertProfiles();
-    mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
+    //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
 }
 
 
 void KOSyncPrefsDialog::usrWriteConfig()
 {
     saveProfile();
     if ( currentSelection >= 0 ) 
         profileChanged(currentSelection);
-    KConfig *config = KOGlobals::config();
-    config->setGroup("SyncProfiles");
+    //KConfig *config = KOGlobals::config();
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
+    config.setGroup("SyncProfiles");
     KSyncProfile* prof = mSyncProfiles.first();
     while ( prof ) {
-        prof->writeConfig(config);
+        prof->writeConfig(&config);
         prof = mSyncProfiles.next();
     }
-    KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
-    KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
-    config->writeEntry("SyncProfileNames",&mSyncProfileNames);
+    //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
+    //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
+    config.writeEntry("SyncProfileNames",&mSyncProfileNames);
 }