author | korovkin <korovkin> | 2006-05-06 18:37:33 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-05-06 18:37:33 (UTC) |
commit | 2d9247d6c2917fd967d0d01d4d9aa6de4fb820f1 (patch) (side-by-side diff) | |
tree | d42ffb6e48f3d0f3b6b53b6c1b628e28e0783ceb /noncore/net/opietooth/manager/obexftpdialog.cpp | |
parent | 0430a18e64df0cdfc1e468a7f7bbe77efc63d0ca (diff) | |
download | opie-2d9247d6c2917fd967d0d01d4d9aa6de4fb820f1.zip opie-2d9247d6c2917fd967d0d01d4d9aa6de4fb820f1.tar.gz opie-2d9247d6c2917fd967d0d01d4d9aa6de4fb820f1.tar.bz2 |
Browse button forces reconnection.
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 @@ -114,2 +114,7 @@ ObexFtpDialog::~ObexFtpDialog() +void ObexFtpDialog::slotBrowse() +{ + doBrowse(TRUE); +} + /* @@ -117,3 +122,3 @@ ObexFtpDialog::~ObexFtpDialog() */ -void ObexFtpDialog::slotBrowse() +void ObexFtpDialog::doBrowse(bool reconnect) { @@ -151,3 +156,3 @@ 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))); @@ -242,3 +247,3 @@ void ObexFtpDialog::slotCd(QListViewItem* item) log(tr("CD failed: ") + tr(strerror(errno))); - slotBrowse(); + doBrowse(); } @@ -335,3 +340,3 @@ void ObexFtpDialog::putFile() else { - slotBrowse(); + doBrowse(); log(local + QString(" sent")); @@ -373,3 +378,3 @@ void ObexFtpDialog::delFile() else { - slotBrowse(); + doBrowse(); log(file2get + QString(" removed")); @@ -380,7 +385,15 @@ 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 */ |