summaryrefslogtreecommitdiff
path: root/noncore/net
Unidiff
Diffstat (limited to 'noncore/net') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp51
-rw-r--r--noncore/net/opieftp/opieftp.h0
2 files changed, 36 insertions, 15 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 042ed59..6a3a64d 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -248,5 +248,10 @@ void OpieFtp::cleanUp()
248 FtpQuit(conn); 248 FtpQuit(conn);
249 QFile f("./._temp"); 249 QString sfile=QDir::homeDirPath();
250 if(f.exists()) 250 if(sfile.right(1) != "/")
251 f. remove(); 251 sfile+="/._temp";
252 else
253 sfile+="._temp";
254 QFile file( sfile);
255 if(file.exists())
256 file.remove();
252} 257}
@@ -297,3 +302,3 @@ void OpieFtp::localUpload()
297 TabWidget->setCurrentPage(1); 302 TabWidget->setCurrentPage(1);
298 populateRemoteView(); 303 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
299 QCopEnvelope ( "QPE/System", "notBusy()" ); 304 QCopEnvelope ( "QPE/System", "notBusy()" );
@@ -399,4 +404,10 @@ bool OpieFtp::remoteDirList(const QString &dir)
399{ 404{
405 QString tmp = QDir::homeDirPath();
406 if(tmp.right(1) != "/")
407 tmp+="/._temp";
408 else
409 tmp+="._temp";
410// qDebug("Listing remote dir "+tmp);
400 QCopEnvelope ( "QPE/System", "busy()" ); 411 QCopEnvelope ( "QPE/System", "busy()" );
401 if (!FtpDir( "./._temp", dir.latin1(), conn) ) { 412 if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
402 QString msg; 413 QString msg;
@@ -467,4 +478,10 @@ bool OpieFtp::populateRemoteView()
467{ 478{
479// qDebug("populate remoteview");
480 QString sfile=QDir::homeDirPath();
481 if(sfile.right(1) != "/")
482 sfile+="/._temp";
483 else
484 sfile+="._temp";
485 QFile file( sfile);
468 Remote_View->clear(); 486 Remote_View->clear();
469 QFile tmp("./._temp");
470 QString s, File_Name; 487 QString s, File_Name;
@@ -472,4 +489,4 @@ bool OpieFtp::populateRemoteView()
472 new QListViewItem( Remote_View, "../"); 489 new QListViewItem( Remote_View, "../");
473 if (tmp.open(IO_ReadOnly)) { 490 if ( file.open(IO_ReadOnly)) {
474 QTextStream t( &tmp ); // use a text stream 491 QTextStream t( &file ); // use a text stream
475 while ( !t.eof()) { 492 while ( !t.eof()) {
@@ -487,5 +504,8 @@ bool OpieFtp::populateRemoteView()
487 } 504 }
488 tmp.close(); 505 file.close();
506 if( file.exists())
507 file. remove();
489 } else 508 } else
490 qDebug("temp file not opened successfullly"); 509 qDebug("temp file not opened successfullly "+sfile);
510
491 return true; 511 return true;
@@ -524,3 +544,2 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
524 strItem=""; 544 strItem="";
525 populateRemoteView();
526 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); 545 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
@@ -534,3 +553,2 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
534 553
535 populateRemoteView();
536 } else { 554 } else {
@@ -542,2 +560,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
542 } 560 }
561 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
543 if(currentRemoteDir.right(1) !="/") 562 if(currentRemoteDir.right(1) !="/")
@@ -545,3 +564,2 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
545 currentPathEdit->setText( currentRemoteDir ); 564 currentPathEdit->setText( currentRemoteDir );
546 remoteDirList( (const QString &)currentRemoteDir);
547 QCopEnvelope ( "QPE/System", "notBusy()" ); 565 QCopEnvelope ( "QPE/System", "notBusy()" );
@@ -726,4 +744,4 @@ void OpieFtp::remoteMakDir()
726 QCopEnvelope ( "QPE/System", "notBusy()" ); 744 QCopEnvelope ( "QPE/System", "notBusy()" );
745 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
727 } 746 }
728 populateRemoteView();
729} 747}
@@ -746,2 +764,4 @@ void OpieFtp::remoteDelete()
746 } 764 }
765 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
766
747 } 767 }
@@ -760,2 +780,3 @@ void OpieFtp::remoteDelete()
760 } 780 }
781 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
761 } 782 }
@@ -785,4 +806,4 @@ void OpieFtp::remoteRename()
785 QCopEnvelope ( "QPE/System", "notBusy()" ); 806 QCopEnvelope ( "QPE/System", "notBusy()" );
807 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
786 } 808 }
787 populateRemoteView();
788} 809}
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index e3ff334..1e5fffa 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h