2 files changed, 8 insertions, 9 deletions

diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 2f38c83..59c8418 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -534,66 +534,65 @@ QString KSyncPrefsDialog::getLocalMachineName ( )
 {
     return mMyMachineName->text();
 }
 
 QStringList KSyncPrefsDialog::getSyncProfileNames()
 {
     return mSyncProfileNames;
 }
 void KSyncPrefsDialog::usrReadConfig()
 { 
     //KConfig *config = KOGlobals::config();
     KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
-    config.setGroup("SyncProfiles");
+    config.setGroup("General");
     mSyncProfileNames =config.readListEntry("SyncProfileNames");
     mMyMachineName->setText(config.readEntry("LocalMachineName","undefined"));
     int i;
     KSyncProfile* temp ;
     mSyncProfiles.clear();
     for ( i = 0; i < mSyncProfileNames.count();++i ) {
         temp = new KSyncProfile ();
         temp->setName( mSyncProfileNames[i] );
         temp->readConfig( &config );
         mSyncProfiles.append( temp );
     }
     insertProfiles();
     //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
 }
 
 
 void KSyncPrefsDialog::usrWriteConfig()
 {
     saveProfile();
     if ( currentSelection >= 0 ) 
         profileChanged(currentSelection);
     //KConfig *config = KOGlobals::config();
     KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
-    config.setGroup("SyncProfiles");
     KSyncProfile* prof = mSyncProfiles.first();
     while ( prof ) {
         prof->writeConfig(&config);
         prof = mSyncProfiles.next();
     }
     //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
     //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
+    config.setGroup("General");
     config.writeEntry("SyncProfileNames",mSyncProfileNames);
-    QString name = mMyMachineName->text();
-    config.writeEntry("LocalMachineName",name);
+    config.writeEntry("LocalMachineName",mMyMachineName->text());
 }
 
 void  KSyncPrefsDialog::helpDevice()
 {
     QString hint = i18n("Insert device where\nphone is connected. E.g.:\n");
 #ifdef _WIN32_
-    hint += "leave empty for Irda\n"
+    hint += "Leave empty for Irda.\n"
         "com1:\n(first serial port)\n"
         "usb not supported\n"
         "???\n(bluetooth device address)\n";
 
 #else
     hint += "/dev/ircomm\n(Irda)\n"
         "/dev/ttyS0\n(first serial port)\n"
         "/dev/ttyUSB0\n(first device usb port)\n"
         "???\n(bluetooth device address)\n";
 #endif
     KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
 }
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 425285e..fcbb326 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -87,26 +87,26 @@ void KSyncProfile::setDefault()
     mIncludeInRingSync = false;
     mIncludeInRingSyncAB = false;
     mSyncPrefs = SYNC_PREF_ASK;
     mIsLocalFileSync = true;
     mIsPhoneSync = false; 
     mPhoneDevice = "/dev/ircomm";
     mPhoneConnection = "irda";
     mPhoneModel = "6310i";
 
 }
 void KSyncProfile::readConfig(KConfig *config )
 {
-    config->setGroup("SyncProfiles");
-    QString prefix = "Profile_"+mName+"_";
+    config->setGroup(mName);
+    QString prefix = "";
     //mName = config->readEntry( prefix+ "Name", mName );
     mPreSyncCommand = config->readEntry( prefix+ "PreSyncCommand",mPreSyncCommand  );
     mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand );;
     mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile );
     mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName );
 
     mPreSyncCommandAB = config->readEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB  );
     mPostSyncCommandAB = config->readEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
     mLocalTempFileAB = config->readEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
     mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
 
 
@@ -118,26 +118,26 @@ void KSyncProfile::readConfig(KConfig *config )
     mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB  );
     mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync );
     mAskForPreferences = config->readBoolEntry( prefix+ "AskForPreferences",mAskForPreferences  );
     mWriteBackExisting = config->readBoolEntry( prefix+ "WriteBackExisting",mWriteBackExisting  );
     mWriteBackFuture = config->readBoolEntry( prefix+ "WriteBackFuture",mWriteBackFuture  );
     mSyncPrefs = config->readNumEntry( prefix+ "SyncPrefs", mSyncPrefs );
     mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks );
     mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync );
     mIsPhoneSync= config->readBoolEntry( prefix+ "IsPhoneSync", mIsPhoneSync );
 }
 void KSyncProfile::writeConfig( KConfig * config )
 {
-    config->setGroup("SyncProfiles");
-    QString prefix = "Profile_"+mName+"_";
+    config->setGroup(mName );
+    QString prefix = "";
     // config->writeEntry( prefix+ "Name", mName );
     config->writeEntry( prefix+ "PreSyncCommand",mPreSyncCommand  );
     config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand );
     config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile );
     config->writeEntry( prefix+ "RemoteFileName", mRemoteFileName );
 
     config->writeEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB  );
     config->writeEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
     config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
     config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
 
     config->writeEntry( prefix+ "PhoneDevice", mPhoneDevice );