-rw-r--r-- | korganizer/mainwindow.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b1c7709..b597a6a 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1958,49 +1958,55 @@ void MainWindow::syncRemote( KSyncProfile* prof, bool ask) | |||
1958 | // 256: no such file or dir | 1958 | // 256: no such file or dir |
1959 | // | 1959 | // |
1960 | qDebug("KO: Remote copy result(0 = okay): %d ",result ); | 1960 | qDebug("KO: Remote copy result(0 = okay): %d ",result ); |
1961 | if ( result != 0 ) { | 1961 | if ( result != 0 ) { |
1962 | int len = maxlen; | 1962 | int len = maxlen; |
1963 | while ( len < command.length() ) { | 1963 | while ( len < command.length() ) { |
1964 | command.insert( len , "\n" ); | 1964 | command.insert( len , "\n" ); |
1965 | len += maxlen +2; | 1965 | len += maxlen +2; |
1966 | } | 1966 | } |
1967 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ; | 1967 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ; |
1968 | QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"), | 1968 | QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"), |
1969 | question, | 1969 | question, |
1970 | i18n("Okay!")) ; | 1970 | i18n("Okay!")) ; |
1971 | setCaption ("KO/Pi"); | 1971 | setCaption ("KO/Pi"); |
1972 | return; | 1972 | return; |
1973 | } | 1973 | } |
1974 | setCaption ( i18n( "Copying succeed." ) ); | 1974 | setCaption ( i18n( "Copying succeed." ) ); |
1975 | //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() ); | 1975 | //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() ); |
1976 | if ( syncWithFile( prof->getLocalTempFile(), true ) ) { | 1976 | if ( syncWithFile( prof->getLocalTempFile(), true ) ) { |
1977 | // Event* e = mView->getLastSyncEvent(); | 1977 | // Event* e = mView->getLastSyncEvent(); |
1978 | // e->setReadOnly( false ); | 1978 | // e->setReadOnly( false ); |
1979 | // e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); | 1979 | // e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); |
1980 | // e->setReadOnly( true ); | 1980 | // e->setReadOnly( true ); |
1981 | if ( KOPrefs::instance()->mWriteBackFile ) { | 1981 | if ( KOPrefs::instance()->mWriteBackFile ) { |
1982 | command = prof->getPostSyncCommand(); | 1982 | command = prof->getPostSyncCommand(); |
1983 | int fi; | ||
1984 | if ( (fi = command.find("$PWD$")) > 0 ) { | ||
1985 | QString pwd = getPassword(); | ||
1986 | command = command.left( fi )+ pwd + command.mid( fi+5 ); | ||
1987 | |||
1988 | } | ||
1983 | setCaption ( i18n( "Writing back file ..." ) ); | 1989 | setCaption ( i18n( "Writing back file ..." ) ); |
1984 | result = system ( command ); | 1990 | result = system ( command ); |
1985 | qDebug("KO: Writing back file result: %d ", result); | 1991 | qDebug("KO: Writing back file result: %d ", result); |
1986 | if ( result != 0 ) { | 1992 | if ( result != 0 ) { |
1987 | setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); | 1993 | setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); |
1988 | return; | 1994 | return; |
1989 | } else { | 1995 | } else { |
1990 | setCaption ( i18n( "Syncronization sucessfully completed" ) ); | 1996 | setCaption ( i18n( "Syncronization sucessfully completed" ) ); |
1991 | } | 1997 | } |
1992 | } | 1998 | } |
1993 | } | 1999 | } |
1994 | return; | 2000 | return; |
1995 | } | 2001 | } |
1996 | void MainWindow::syncSSH() | 2002 | void MainWindow::syncSSH() |
1997 | { | 2003 | { |
1998 | // not used anymore | 2004 | // not used anymore |
1999 | QTime timer; | 2005 | QTime timer; |
2000 | timer.start(); | 2006 | timer.start(); |
2001 | //qDebug("MainWindow::syncssh() "); | 2007 | //qDebug("MainWindow::syncssh() "); |
2002 | KOPrefs *p = KOPrefs::instance(); | 2008 | KOPrefs *p = KOPrefs::instance(); |
2003 | QString localFile = p->mLocalTempFile; | 2009 | QString localFile = p->mLocalTempFile; |
2004 | QString remoteIP = p->mRemoteIP; | 2010 | QString remoteIP = p->mRemoteIP; |
2005 | QString remoteUser = p->mRemoteUser; | 2011 | QString remoteUser = p->mRemoteUser; |
2006 | QString remoteFile = p->mRemoteFile; | 2012 | QString remoteFile = p->mRemoteFile; |