# HG changeset patch
# User Jean-Manuel Da Silva <dasilvj@gmail.com>
# Date 1258413577 -3600
# Node ID 43ec9f68c79687912c591dd32be234d9ba6ce61a
# Parent  19ced4af7386f17fe967264be62134d9df2cc066# Parent  0444ac5038a0cd8bdb2376e8e550d343ea6e7a77
Merge

diff -r 19ced4af7386 -r 43ec9f68c796 .classpath
--- a/.classpath	Tue Nov 17 00:16:43 2009 +0100
+++ b/.classpath	Tue Nov 17 00:19:37 2009 +0100
@@ -8,7 +8,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="libs/security.jar"/>
-	<classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/nikita/devel/smack/source">
+	<classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
 		<attributes>
 			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/org/"/>
 		</attributes>
diff -r 19ced4af7386 -r 43ec9f68c796 src/com/beem/project/beem/service/RosterAdapter.java
--- a/src/com/beem/project/beem/service/RosterAdapter.java	Tue Nov 17 00:16:43 2009 +0100
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Tue Nov 17 00:19:37 2009 +0100
@@ -123,9 +123,18 @@
      */
     @Override
     public List<Contact> getContactList() throws RemoteException {
+	boolean add = true;
 	List<Contact> coList = new ArrayList<Contact>(mAdaptee.getEntries().size());
 	for (RosterEntry entry : mAdaptee.getEntries()) {
-	    coList.add(getContactFromRosterEntry(entry));
+	    for (Contact c : coList) {
+		if (c.getJID().equals(entry.getUser())) {
+		    add = false;
+		    break;
+		}
+	    }
+	    // Because getEntries return duplicated user.
+	    if (add == true)
+		coList.add(getContactFromRosterEntry(entry));
 	}
 	return coList;
     }
@@ -223,8 +232,7 @@
 	defaultStatusMessages.put(Status.CONTACT_STATUS_BUSY, context.getString(R.string.contact_status_msg_dnd));
 	defaultStatusMessages.put(Status.CONTACT_STATUS_DISCONNECT, context
 	    .getString(R.string.contact_status_msg_offline));
-	defaultStatusMessages
-	    .put(Status.CONTACT_STATUS_UNAVAILABLE, context.getString(R.string.contact_status_msg_xa));
+	defaultStatusMessages.put(Status.CONTACT_STATUS_UNAVAILABLE, context.getString(R.string.contact_status_msg_xa));
 
 	return (defaultStatusMessages);
     }
diff -r 19ced4af7386 -r 43ec9f68c796 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Tue Nov 17 00:16:43 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Tue Nov 17 00:19:37 2009 +0100
@@ -653,6 +653,7 @@
 		    mListGroup.add(getString(R.string.contact_list_all_contact));
 		    mListGroup.addAll(tmpGroupList);
 		    mListGroup.add(getString(R.string.contact_list_no_group));
+		    mContactOnGroup.clear();
 		    if (tmpGroupList.size() > 0) {
 			List<Contact> tmpNoGroup = new ArrayList<Contact>();
 			for (String s : tmpGroupList) {