# HG changeset patch
# User Vincent Veronis <veroni_v@epitech.net>
# Date 1258653681 -3600
# Node ID 537ddd8aa407770dec6dad073aa3752e43289ba8
# Parent  6e1bd606525bd134d1f7810770429602ffbae756# Parent  4a351c2d721732f28eea7c5a64066df7e80f22b8
merge

diff -r 4a351c2d7217 -r 537ddd8aa407 src/com/beem/project/beem/ui/ContactDialog.java
--- a/src/com/beem/project/beem/ui/ContactDialog.java	Thu Nov 19 16:56:25 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactDialog.java	Thu Nov 19 19:01:21 2009 +0100
@@ -56,9 +56,16 @@
     }
 
     @Override
+    protected void onStop() {
+        // TODO Auto-generated method stub
+        super.onStop();
+	mContext.unbindService(mServConn);
+    }
+    
+    @Override
     public void dismiss() {
 	super.dismiss();
-	mContext.unbindService(mServConn);
+
     }
 
     /**
diff -r 4a351c2d7217 -r 537ddd8aa407 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Thu Nov 19 16:56:25 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Thu Nov 19 19:01:21 2009 +0100
@@ -69,6 +69,7 @@
     private BeemBroadcastReceiver mReceiver;
     private final Map<Integer, Bitmap> mIconsMap = new HashMap<Integer, Bitmap>();
     private LayoutInflater mInflater;
+    private ContactDialog mContactDialog;
 
     static {
 	SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService"));
@@ -158,6 +159,8 @@
     @Override
     protected void onStop() {
 	super.onStop();
+	if (mContactDialog != null)
+	    mContactDialog.dismiss();
 	if (mReceiver.isBinded())
 	    unbindService(mServConn);
     }
@@ -276,9 +279,9 @@
 	@Override
 	public boolean onItemLongClick(AdapterView<?> arg0, View v, int pos, long lpos) {
 	    Contact c = mListContact.get(pos);
-	    ContactDialog dialogContact = new ContactDialog(ContactList.this, c);
-	    dialogContact.setOwnerActivity(ContactList.this);
-	    dialogContact.show();
+	    mContactDialog = new ContactDialog(ContactList.this, c);
+	    mContactDialog.setOwnerActivity(ContactList.this);
+	    mContactDialog.show();
 	    return true;
 	}
     }