Diffstat (limited to 'noncore/net/opietooth/manager/obexftpdialog.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/opietooth/manager/obexftpdialog.cpp | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/noncore/net/opietooth/manager/obexftpdialog.cpp b/noncore/net/opietooth/manager/obexftpdialog.cpp index 2f04ecf..efb3ff2 100644 --- a/noncore/net/opietooth/manager/obexftpdialog.cpp +++ b/noncore/net/opietooth/manager/obexftpdialog.cpp @@ -113,8 +113,13 @@ ObexFtpDialog::~ObexFtpDialog() } +void ObexFtpDialog::slotBrowse() +{ + doBrowse(TRUE); +} + /* * Do device browsing */ -void ObexFtpDialog::slotBrowse() +void ObexFtpDialog::doBrowse(bool reconnect) { stat_entry_t* ent; //Directory entry @@ -150,5 +155,5 @@ void ObexFtpDialog::slotBrowse() } - if (!cli_connect_uuid(use_uuid, len)) { + if (!cli_connect_uuid(use_uuid, len, reconnect)) { log(tr("Connection failed: ") + tr(strerror(errno))); errBox("Connection failed"); @@ -241,5 +246,5 @@ void ObexFtpDialog::slotCd(QListViewItem* item) if (obexftp_setpath(client, curdir, 0) < 0) log(tr("CD failed: ") + tr(strerror(errno))); - slotBrowse(); + doBrowse(); } } @@ -334,5 +339,5 @@ void ObexFtpDialog::putFile() } else { - slotBrowse(); + doBrowse(); log(local + QString(" sent")); status(local + QString(" sent")); @@ -372,5 +377,5 @@ void ObexFtpDialog::delFile() } else { - slotBrowse(); + doBrowse(); log(file2get + QString(" removed")); status(file2get + QString(" removed")); @@ -379,9 +384,17 @@ void ObexFtpDialog::delFile() /* connect with given uuid. re-connect every time */ -int ObexFtpDialog::cli_connect_uuid(const uint8_t *uuid, int uuid_len) +int ObexFtpDialog::cli_connect_uuid(const uint8_t *uuid, int uuid_len, + bool reconnect) { int retry; - if (client != NULL) - return TRUE; + if (client != NULL) { + if (reconnect) { + obexftp_disconnect(client); + obexftp_close(client); + sleep(3); + } + else + return TRUE; + } /* Open */ client = obexftp_open (transport, NULL, info_cb, this); |