# HG changeset patch
# User nikita@nikita-rack
# Date 1240422479 -7200
# Node ID 503f22107d073d610b05ac779b1ac56aac6ea582
# Parent  4cba5e27fcb33a3b700791f475206a976b094958# Parent  efdae5f9289ff35190a7b38edec0f6647246fe74
temp

diff -r 4cba5e27fcb3 -r 503f22107d07 src/com/beem/project/beem/BeemApplication.java
--- a/src/com/beem/project/beem/BeemApplication.java	Wed Apr 22 19:46:34 2009 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Wed Apr 22 19:47:59 2009 +0200
@@ -64,6 +64,13 @@
 		    mProgressDialog.show();
 		    mConnection.addConnectionListener(mConnectionListener);
 		    mApplicationContext.startService(BeemApplication.SERVICE_INTENT);
+		}else {
+		    synchronized (mQueue) {
+			for (Message msg : mQueue) {
+			    msg.sendToTarget();
+			}
+			mQueue.clear();
+		    }
 		}
 	    } catch (RemoteException e) {
 		// TODO Auto-generated catch block
@@ -123,12 +130,10 @@
     }
 
     public synchronized void unbindBeemService() {
-	
 	if (mIsConnected) {
 	    mApplicationContext.unbindService(mServConn);
 	    mIsConnected = false;
 	}
-	
      }
 
     /**
diff -r 4cba5e27fcb3 -r 503f22107d07 src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Wed Apr 22 19:46:34 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Wed Apr 22 19:47:59 2009 +0200
@@ -136,6 +136,7 @@
 	} else {
 	    mConnectionConfiguration = new ConnectionConfiguration(mHost);
 	}
+	mConnectionConfiguration.setDebuggerEnabled(false);
 	mConnectionConfiguration.setSendPresence(true);
     }
 
diff -r 4cba5e27fcb3 -r 503f22107d07 src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Wed Apr 22 19:46:34 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Wed Apr 22 19:47:59 2009 +0200
@@ -178,11 +178,11 @@
      * enregistre les features dispo dans notre version Liste de features que Telepathy supporte.
      */
     private void initFeatures() {
-	JingleManager.setJingleServiceEnabled();
 	ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(mAdaptee);
 	if (sdm == null)
 	    sdm = new ServiceDiscoveryManager(mAdaptee);
 	sdm.addFeature("http://jabber.org/protocol/disco#info");
+	JingleManager.setJingleServiceEnabled();
 	// sdm.addFeature("http://jabber.org/protocol/nick");
 
     }
diff -r 4cba5e27fcb3 -r 503f22107d07 src/com/beem/project/beem/ui/ChangeStatus.java
--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Wed Apr 22 19:46:34 2009 +0200
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Wed Apr 22 19:47:59 2009 +0200
@@ -77,7 +77,7 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-//        mBeemApplication.unbindBeemService();
+        mBeemApplication.unbindBeemService();
     }
 
     private OnClickListener mOnClickOk = new OnClickListener() {
diff -r 4cba5e27fcb3 -r 503f22107d07 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Wed Apr 22 19:46:34 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Wed Apr 22 19:47:59 2009 +0200
@@ -77,9 +77,9 @@
 
     @Override
     protected void onDestroy() {
-	// TODO Auto-generated method stub
-	super.onDestroy();
-	//       mBeemApplication.unbindBeemService();
+        // TODO Auto-generated method stub
+        super.onDestroy();
+        mBeemApplication.unbindBeemService();
     }
 
     @Override
diff -r 4cba5e27fcb3 -r 503f22107d07 src/com/beem/project/beem/ui/SendIM.java
--- a/src/com/beem/project/beem/ui/SendIM.java	Wed Apr 22 19:46:34 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Wed Apr 22 19:47:59 2009 +0200
@@ -136,6 +136,13 @@
     }
 
     @Override
+    protected void onStop() {
+        // TODO Auto-generated method stub
+        super.onStop();
+        mBeemApplication.unbindBeemService();
+    }
+    
+    @Override
     protected void onDestroy() {
 	super.onDestroy();
 	if (mChatManager != null) {
@@ -147,7 +154,6 @@
 		e.printStackTrace();
 	    }
 	}
-//	mBeemApplication.unbindBeemService();
     }
 
     /**