summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-03-20 23:58:17 (UTC)
committer llornkcor <llornkcor>2002-03-20 23:58:17 (UTC)
commite8f15a98c611b0c6030e8210672b249b42107526 (patch) (unidiff)
treeb36e786dedd13a959cbae0cf6ee934a7fd373047
parenta766295804d76f06a7e47b1d5e02dd5a59676c7d (diff)
downloadopie-e8f15a98c611b0c6030e8210672b249b42107526.zip
opie-e8f15a98c611b0c6030e8210672b249b42107526.tar.gz
opie-e8f15a98c611b0c6030e8210672b249b42107526.tar.bz2
fixed problem with remote download
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index f1b159c..6e9dc67 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -313,49 +313,52 @@ void OpieFtp::localUpload()
313 QMessageBox::message(tr("Note"),tr("Cannot upload directories")); 313 QMessageBox::message(tr("Note"),tr("Cannot upload directories"));
314 } 314 }
315 TabWidget->setCurrentPage(1); 315 TabWidget->setCurrentPage(1);
316 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 316 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
317 QCopEnvelope ( "QPE/System", "notBusy()" ); 317 QCopEnvelope ( "QPE/System", "notBusy()" );
318} 318}
319 319
320void OpieFtp::nullifyCallBack() 320void OpieFtp::nullifyCallBack()
321{ 321{
322 FtpOptions(FTPLIB_CALLBACK, NULL, conn); 322 FtpOptions(FTPLIB_CALLBACK, NULL, conn);
323 FtpOptions(FTPLIB_IDLETIME, NULL, conn); 323 FtpOptions(FTPLIB_IDLETIME, NULL, conn);
324 FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); 324 FtpOptions(FTPLIB_CALLBACKARG, NULL, conn);
325 FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn); 325 FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn);
326 326
327} 327}
328 328
329void OpieFtp::remoteDownload() 329void OpieFtp::remoteDownload()
330{ 330{
331 int fsz; 331 int fsz;
332 QCopEnvelope ( "QPE/System", "busy()" ); 332 QCopEnvelope ( "QPE/System", "busy()" );
333 qApp->processEvents(); 333 qApp->processEvents();
334 QString strItem = Remote_View->currentItem()->text(0); 334 QString strItem = Remote_View->currentItem()->text(0);
335// strItem=strItem.right(strItem.length()-1); 335// strItem=strItem.right(strItem.length()-1);
336 336
337 QString localFile = currentDir.canonicalPath()+strItem; 337 QString localFile = currentDir.canonicalPath();
338 if(localFile.right(1).find("/",0,TRUE) == -1)
339 localFile += "/";
340 localFile += strItem;
338// QString localFile = currentDir.canonicalPath()+"/"+strItem; 341// QString localFile = currentDir.canonicalPath()+"/"+strItem;
339 QString remoteFile= currentRemoteDir+strItem; 342 QString remoteFile= currentRemoteDir+strItem;
340 if (!FtpSize( remoteFile.latin1(), &fsz, FTPLIB_ASCII, conn)) 343 if (!FtpSize( remoteFile.latin1(), &fsz, FTPLIB_ASCII, conn))
341 fsz = 0; 344 fsz = 0;
342 QString temp; 345 QString temp;
343 temp.sprintf( remoteFile+" "+" %dkb", fsz); 346 temp.sprintf( remoteFile+" "+" %dkb", fsz);
344 347
345 ProgressBar->setTotalSteps(fsz); 348 ProgressBar->setTotalSteps(fsz);
346 FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); 349 FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
347 FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); 350 FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
348 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); 351 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
349 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); 352 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
350 qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1()); 353 qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
351 354
352 if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { 355 if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
353 QString msg; 356 QString msg;
354 msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn)); 357 msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn));
355 msg.replace(QRegExp(":"),"\n"); 358 msg.replace(QRegExp(":"),"\n");
356 QMessageBox::message(tr("Note"),msg); 359 QMessageBox::message(tr("Note"),msg);
357// FtpQuit(conn); 360// FtpQuit(conn);
358 } 361 }
359 ProgressBar->reset(); 362 ProgressBar->reset();
360 nullifyCallBack(); 363 nullifyCallBack();
361 TabWidget->setCurrentPage(0); 364 TabWidget->setCurrentPage(0);