summaryrefslogtreecommitdiffabout
path: root/libkdepim/ksyncmanager.cpp
Unidiff
Diffstat (limited to 'libkdepim/ksyncmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index c6e06f8..8851097 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -752,67 +752,70 @@ QString KSyncManager::getPassword( )
752 return retfile; 752 return retfile;
753 753
754} 754}
755 755
756 756
757void KSyncManager::confSync() 757void KSyncManager::confSync()
758{ 758{
759 static KSyncPrefsDialog* sp = 0; 759 static KSyncPrefsDialog* sp = 0;
760 if ( ! sp ) { 760 if ( ! sp ) {
761 sp = new KSyncPrefsDialog( mParent, "syncprefs", true ); 761 sp = new KSyncPrefsDialog( mParent, "syncprefs", true );
762 } 762 }
763 sp->usrReadConfig(); 763 sp->usrReadConfig();
764#ifndef DESKTOP_VERSION 764#ifndef DESKTOP_VERSION
765 sp->showMaximized(); 765 sp->showMaximized();
766#else 766#else
767 sp->show(); 767 sp->show();
768#endif 768#endif
769 sp->exec(); 769 sp->exec();
770 mSyncProfileNames = sp->getSyncProfileNames(); 770 mSyncProfileNames = sp->getSyncProfileNames();
771 mLocalMachineName = sp->getLocalMachineName (); 771 mLocalMachineName = sp->getLocalMachineName ();
772 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 772 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
773} 773}
774void KSyncManager::syncKDE() 774void KSyncManager::syncKDE()
775{ 775{
776 emit save(); 776 emit save();
777 switch(mTargetApp) 777 switch(mTargetApp)
778 { 778 {
779 case (KAPI): 779 case (KAPI):
780 780
781 break; 781 break;
782 case (KOPI): 782 case (KOPI):
783 { 783 {
784 QString command ="./kdecaldump"; 784 QString command = qApp->applicationDirPath () + "/kdecaldump";
785 if ( ! QFile::exists ( command ) )
786 command = "kdecaldump";
787 QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
785 system ( command.latin1()); 788 system ( command.latin1());
786 if ( syncWithFile( "/tmp/kdedumpall.ics",true ) ) { 789 if ( syncWithFile( fileName,true ) ) {
787 if ( mWriteBackFile ) { 790 if ( mWriteBackFile ) {
788 command += " --read"; 791 command += " --read";
789 system ( command.latin1()); 792 system ( command.latin1());
790 } 793 }
791 } 794 }
792 795
793 } 796 }
794 break; 797 break;
795 case (PWMPI): 798 case (PWMPI):
796 799
797 break; 800 break;
798 default: 801 default:
799 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); 802 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
800 break; 803 break;
801 804
802 } 805 }
803} 806}
804 807
805void KSyncManager::syncSharp() 808void KSyncManager::syncSharp()
806{ 809{
807 810
808 if ( ! syncExternalApplication("sharp") ) 811 if ( ! syncExternalApplication("sharp") )
809 qDebug("ERROR sync sharp "); 812 qDebug("ERROR sync sharp ");
810} 813}
811 814
812bool KSyncManager::syncExternalApplication(QString resource) 815bool KSyncManager::syncExternalApplication(QString resource)
813{ 816{
814 817
815 emit save(); 818 emit save();
816 819
817 if ( mAskForPreferences ) 820 if ( mAskForPreferences )
818 edit_sync_options(); 821 edit_sync_options();