[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdebluetooth-libqobex_rewrite/kdebluetooth/libqobex/qobex
From:       Simone Gotti <simone.gotti () email ! it>
Date:       2005-06-16 12:42:13
Message-ID: 1118925733.882296.10605.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 426104 by sgotti:

Initialize and destroy correctly the socket notifiers.


 M  +19 -13    qobexclient.cpp  
 M  +1 -1      qobextransport.h  


--- branches/work/kdebluetooth-libqobex_rewrite/kdebluetooth/libqobex/qobex/qobexclient.cpp \
#426103:426104 @@ -62,6 +62,9 @@
   mInitiateAuth = false;
   mOpenObexSupport = false;
 
+  mReadNotifier = 0;
+  mWriteNotifier = 0;
+
 }
 
 QObexClient::~QObexClient() {
@@ -513,6 +516,9 @@
 void QObexClient::transportConnected() {
   myDebug(("QObexClient::transportConnected()" ));
 
+  delete mReadNotifier;
+  delete mWriteNotifier;
+
   // Setup the socket notifiers.
   mReadNotifier
     = new QSocketNotifier( mTransport->socket(), QSocketNotifier::Read,
@@ -545,10 +551,8 @@
   mUseConnectionId = false;
   mServerIsReadOnly = false;
 
-  if(mReadNotifier)
-    delete mReadNotifier;
-  if(mWriteNotifier)
-    delete mWriteNotifier;
+  delete mReadNotifier;
+  delete mWriteNotifier;
 }
 
 void QObexClient::transportPacketWritten() {
@@ -587,15 +591,17 @@
 void QObexClient::transportSelectModeChanged( QObexTransport::SelectHint hint, \
Q_LONG ) {  myDebug(( "QObexClient::transportSelectModeChanged( ... )" ));
   // FIXME no timeouts at the moment
-  if ( hint == QObexTransport::SelectRead ) {
-    mWriteNotifier->setEnabled( false );
-    mReadNotifier->setEnabled( true );
-  } else if ( hint == QObexTransport::SelectWrite ) {
-    mWriteNotifier->setEnabled( true );
-    mReadNotifier->setEnabled( false );
-  } else {
-    mWriteNotifier->setEnabled( false );
-    mReadNotifier->setEnabled( false );
+  if ( mWriteNotifier && mWriteNotifier) {
+    if ( hint == QObexTransport::SelectRead ) {
+      mWriteNotifier->setEnabled( false );
+      mReadNotifier->setEnabled( true );
+    } else if ( hint == QObexTransport::SelectWrite ) {
+      mWriteNotifier->setEnabled( true );
+      mReadNotifier->setEnabled( false );
+    } else {
+      mWriteNotifier->setEnabled( false );
+      mReadNotifier->setEnabled( false );
+    }
   }
 }
 
--- branches/work/kdebluetooth-libqobex_rewrite/kdebluetooth/libqobex/qobex/qobextransport.h \
#426103:426104 @@ -233,7 +233,7 @@
   void error( Error );
 
   /**
-     Call when connetced.
+     Call when connected.
    */
   void connected();
 


[prev in list] [next in list] [prev in thread] [next in thread]