2 files changed, 24 insertions, 9 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
@@ -112,10 +112,15 @@ ObexFtpDialog::~ObexFtpDialog()
     }
 }
 
+void ObexFtpDialog::slotBrowse()
+{
+    doBrowse(TRUE);
+}
+
 /*
  * Do device browsing
  */
-void ObexFtpDialog::slotBrowse()
+void ObexFtpDialog::doBrowse(bool reconnect)
 {
     stat_entry_t* ent; //Directory entry
     void *dir; //Directory to read
@@ -149,7 +154,7 @@ void ObexFtpDialog::slotBrowse()
         len = sizeof(UUID_FBS);
     }
 
-    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");
         status("Connection failed");
@@ -240,7 +245,7 @@ void ObexFtpDialog::slotCd(QListViewItem* item)
         odebug << "Browse " << curdir << oendl;
         if (obexftp_setpath(client, curdir, 0) < 0)
             log(tr("CD failed: ") + tr(strerror(errno)));
-        slotBrowse();
+        doBrowse();
     }
 }
 
@@ -333,7 +338,7 @@ void ObexFtpDialog::putFile()
         status(local + QString(" send ERROR"));
     }
     else {
-        slotBrowse();
+        doBrowse();
         log(local + QString(" sent")); 
         status(local + QString(" sent")); 
     }
@@ -371,18 +376,26 @@ void ObexFtpDialog::delFile()
         status(file2get + QString(" remove ERROR"));
     }
     else {
-        slotBrowse();
+        doBrowse();
         log(file2get + QString(" removed")); 
         status(file2get + QString(" removed")); 
     }
 }
 
 /* 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);
     if(client == NULL) {
diff --git a/noncore/net/opietooth/manager/obexftpdialog.h b/noncore/net/opietooth/manager/obexftpdialog.h
index 75ee95b..45699d2 100644
--- a/noncore/net/opietooth/manager/obexftpdialog.h
+++ b/noncore/net/opietooth/manager/obexftpdialog.h
@@ -35,13 +35,15 @@ namespace OpieTooth {
         void incProgress();
         void doneProgress();
     protected:    
-        int cli_connect_uuid(const uint8_t *uuid, int uuid_len);
+        int cli_connect_uuid(const uint8_t *uuid, int uuid_len, 
+            bool reconnect = FALSE);
         int errBox(QCString msg); //Error message box
         int errBox(QString msg); //Error message box
         int errBox(const char* msg); //Error message box
         void status(QCString msg); //Text in the status bar
         void status(QString msg); //Text in the status bar
         void status(const char* msg); //Text in the status bar
+        void doBrowse(bool reconnect = FALSE); //Browse device
     protected:
         QString m_device; //device MAC address
         int m_port; //port