-rw-r--r-- | korganizer/calendarview.cpp | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 387b751..cfc6b10 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -690,5 +690,4 @@ void CalendarView::confSync() | |||
690 | sp = new KSyncPrefsDialog( this, "syncprefs", true ); | 690 | sp = new KSyncPrefsDialog( this, "syncprefs", true ); |
691 | } | 691 | } |
692 | sp->setLocalMachineName ( KOPrefs::instance()->mLocalMachineName ); | ||
693 | sp->usrReadConfig(); | 692 | sp->usrReadConfig(); |
694 | #ifndef DESKTOP_VERSION | 693 | #ifndef DESKTOP_VERSION |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 589ab2d..d0d1f3b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -822,5 +822,5 @@ void MainWindow::fillSyncMenu() | |||
822 | config.setGroup("SyncProfiles"); | 822 | config.setGroup("SyncProfiles"); |
823 | QStringList prof = config.readListEntry("SyncProfileNames"); | 823 | QStringList prof = config.readListEntry("SyncProfileNames"); |
824 | 824 | KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined"); | |
825 | if ( prof.count() < 3 ) { | 825 | if ( prof.count() < 3 ) { |
826 | prof.clear(); | 826 | prof.clear(); |
@@ -835,4 +835,6 @@ void MainWindow::fillSyncMenu() | |||
835 | temp->setName( prof[2] ); | 835 | temp->setName( prof[2] ); |
836 | temp->writeConfig(&config); | 836 | temp->writeConfig(&config); |
837 | config.setGroup("SyncProfiles"); | ||
838 | config.writeEntry("SyncProfileNames",prof); | ||
837 | config.sync(); | 839 | config.sync(); |
838 | delete temp; | 840 | delete temp; |
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 8d610d8..3df2a3b 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -435,4 +435,5 @@ void KSyncPrefsDialog::usrReadConfig() | |||
435 | config.setGroup("SyncProfiles"); | 435 | config.setGroup("SyncProfiles"); |
436 | mSyncProfileNames =config.readListEntry("SyncProfileNames"); | 436 | mSyncProfileNames =config.readListEntry("SyncProfileNames"); |
437 | mMyMachineName->setText(config.readEntry("LocalMachineName","undefined")); | ||
437 | int i; | 438 | int i; |
438 | KSyncProfile* temp ; | 439 | KSyncProfile* temp ; |
@@ -464,5 +465,7 @@ void KSyncPrefsDialog::usrWriteConfig() | |||
464 | //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames; | 465 | //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames; |
465 | //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text(); | 466 | //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text(); |
466 | config.writeEntry("SyncProfileNames",&mSyncProfileNames); | 467 | config.writeEntry("SyncProfileNames",mSyncProfileNames); |
468 | QString name = mMyMachineName->text(); | ||
469 | config.writeEntry("LocalMachineName",name); | ||
467 | } | 470 | } |
468 | 471 | ||