Diffstat (limited to 'noncore/apps/opie-gutenbrowser/NetworkDialog.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/apps/opie-gutenbrowser/NetworkDialog.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp index a321952..ba583ad 100644 --- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp @@ -167,7 +167,9 @@ bool NetworkDialog::downloadFile( QString networkUrl ) // FtpQuit(conn); // return false; // } - odebug << "Requesting directory list." << oendl; + QString File_Name; + + if( s_partialFileName.right(4) != ".txt") { TextLabel3->setText("Getting directory list."); qApp->processEvents(); if (!FtpDir( "./.guten_temp", dir.latin1(), conn) ) { @@ -178,11 +180,11 @@ bool NetworkDialog::downloadFile( QString networkUrl ) return false; } QFile tmp("./.guten_temp"); - QString s, File_Name; - if (tmp.open(IO_ReadOnly)) { QTextStream t( &tmp ); // use a text stream - odebug << "Finding partial filename "+s_partialFileName << oendl; + //odebug << "Finding partial filename "+s_partialFileName << oendl; + QString s; + while ( !t.eof()) { s = t.readLine(); @@ -191,22 +193,19 @@ bool NetworkDialog::downloadFile( QString networkUrl ) if (str.contains(".txt")) { File_Name = str; - odebug << "Found file_name "+ File_Name << oendl; + //odebug << "Found file_name "+ File_Name << oendl; break; } -// if (str.contains(".zip")) { -// File_Name = str; -// odebug << "Found file_name "+ File_Name << oendl; -// break; -// } - } } //end of while loop tmp.close(); // tmp.remove(); ///TODO this is for release version Zaurus } - else - odebug << "Error opening temp file." << oendl; + } else { + File_Name = s_partialFileName; + qDebug("new dir " + File_Name); + } + Config cfg("Gutenbrowser"); cfg.setGroup("General"); |