summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obex.cpp3
-rw-r--r--core/obex/obex.h4
2 files changed, 1 insertions, 6 deletions
diff --git a/core/obex/obex.cpp b/core/obex/obex.cpp
index e4a3c31..670f1a5 100644
--- a/core/obex/obex.cpp
+++ b/core/obex/obex.cpp
@@ -46,13 +46,13 @@ using namespace Opie::Core;
46/* TRANSLATOR OpieObex::Obex */ 46/* TRANSLATOR OpieObex::Obex */
47 47
48Obex::Obex( QObject *parent, const char* name ) 48Obex::Obex( QObject *parent, const char* name )
49 : ObexBase(parent, name ) 49 : ObexBase(parent, name )
50{ 50{
51 m_rec = 0; 51 m_rec = 0;
52 m_send=0; 52 m_send = 0;
53}; 53};
54Obex::~Obex() { 54Obex::~Obex() {
55 delete m_rec; 55 delete m_rec;
56 delete m_send; 56 delete m_send;
57} 57}
58void Obex::receive() { 58void Obex::receive() {
@@ -77,13 +77,12 @@ void Obex::send(const QString& fileName, const QString& addr) {
77 ObexBase::send(fileName, addr); 77 ObexBase::send(fileName, addr);
78 if (m_rec != 0 ) { 78 if (m_rec != 0 ) {
79 if (m_rec->isRunning() ) { 79 if (m_rec->isRunning() ) {
80 emit error(-1 ); 80 emit error(-1 );
81 delete m_rec; 81 delete m_rec;
82 m_rec = 0; 82 m_rec = 0;
83
84 }else{ 83 }else{
85 emit error( -1 ); // we did not delete yet but it's not running slotExited is pending 84 emit error( -1 ); // we did not delete yet but it's not running slotExited is pending
86 return; 85 return;
87 } 86 }
88 } 87 }
89 sendNow(); 88 sendNow();
diff --git a/core/obex/obex.h b/core/obex/obex.h
index b948ce4..745f1c2 100644
--- a/core/obex/obex.h
+++ b/core/obex/obex.h
@@ -78,18 +78,14 @@ namespace OpieObex {
78 * signal sent The file got beamed to the remote location 78 * signal sent The file got beamed to the remote location
79 */ 79 */
80 void sent(bool); 80 void sent(bool);
81 void done(bool); 81 void done(bool);
82 82
83 private: 83 private:
84 uint m_count;
85 QString m_file;
86 QString m_outp;
87 Opie::Core::OProcess *m_send; 84 Opie::Core::OProcess *m_send;
88 ObexServer* m_rec; //The OBEX server 85 ObexServer* m_rec; //The OBEX server
89 bool m_receive : 1;
90 void shutDownReceive(); 86 void shutDownReceive();
91 87
92private slots: 88private slots:
93 89
94 /** 90 /**
95 * send over palm obex 91 * send over palm obex