--- a/src/com/beem/project/beem/ui/ContactList.java	Tue Apr 07 19:07:41 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Tue Apr 07 19:57:37 2009 +0200
@@ -74,17 +74,7 @@
 		    @Override
 		    public void onSharedPreferenceChanged(
 			    SharedPreferences sharedPreferences, String key) {
-			/*
-			 * TODO : A faire apres listener nikita
-			 * 
-			 * mBeemApplication.stopBeemService();
-			 * mBeemApplication.startBeemService();
-			 * mBeemApplication.callWhenServiceConnected(mHandler,
-			 * new Runnable() {
-			 * 
-			 * @Override public void run() {
-			 * callbackShowContactList(); } });
-			 */
+			Log.i(TAG, "On Preference Changed");
 		    }
 		});
     }
@@ -92,8 +82,7 @@
     @Override
     protected void onStart() {
 	super.onStart();
-	Log.i(TAG, "onStart");
-	mBeemApplication.startBeemService();
+
     }
 
     @Override
@@ -109,12 +98,13 @@
 	    public void run() {
 		mService = mBeemApplication.getXmppFacade();
 		try {
-		    mRoster = mService.getRoster();
-		    mRoster.addConnectionListener(mRosterListener);
-		    Log.i(TAG, "ROSTERLISTENER OK");
+		    if (mRoster != null) {
+			mRoster = mService.getRoster();
+			mRoster.addConnectionListener(mRosterListener);
+		    }
 		} catch (RemoteException e) {
 		    e.printStackTrace();
-		}		
+		}
 		callbackShowContactList();
 	    }
 	});
@@ -126,10 +116,11 @@
 	 */
 	if (mRoster != null)
 	    try {
-		showContactList(mRoster.getGroupsNames(), mRoster.getContactList());
+		showContactList(mRoster.getGroupsNames(), mRoster
+			.getContactList());
 	    } catch (RemoteException e) {
 		e.printStackTrace();
-	    }	
+	    }
     }
 
     /**
@@ -186,7 +177,7 @@
 		Map<String, Contact> curChildMap = new HashMap<String, Contact>();
 		children.add(curChildMap);
 		Contact c = listContact.get(j);
-		Log.i(TAG, c.getID() + " " +c.getJID());
+		Log.i(TAG, c.getID() + " " + c.getJID());
 		curChildMap.put("CHILD", c);
 	    }
 	    childData.add(children);
@@ -278,7 +269,7 @@
 		    default:
 			imageDrawable = (Drawable) getResources().getDrawable(
 				R.drawable.error);
-		    	break;
+			break;
 		}
 		imgV.setImageDrawable(imageDrawable);
 
@@ -314,26 +305,29 @@
 	public void onEntriesAdded(List<String> addresses)
 		throws RemoteException {
 	    Log.i(TAG, "ENTRIES ADDED");
-	    
+
 	}
+
 	@Override
 	public void onEntriesDeleted(List<String> addresses)
 		throws RemoteException {
 	    Log.i(TAG, "ENTRIES DEL");
-	    
+
 	}
+
 	@Override
 	public void onEntriesUpdated(List<String> addresses)
 		throws RemoteException {
 	    Log.i(TAG, "ENTRIES UPD");
-	    
+
 	}
+
 	@Override
 	public void onPresenceChanged(PresenceAdapter presence)
 		throws RemoteException {
 	    Log.i(TAG, "PRESENCE CHANGED");
-	    
+
 	}
-	
+
     }
 }
\ No newline at end of file