# HG changeset patch
# User Vincent Veronis <veroni_v@epitech.net>
# Date 1256938691 -3600
# Node ID 77e8f3384a3b6386a1546367711060bbc04e37b1
# Parent  6122f9ed186f9f71e58e72208e0c0c8042b6f3f8# Parent  776575982b48e7c962af83df54a741046346d99e
Merge.

diff -r 776575982b48 -r 77e8f3384a3b src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Oct 30 19:53:51 2009 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Oct 30 22:38:11 2009 +0100
@@ -154,6 +154,8 @@
 		mConListener.connectionFailed(e.getMessage());
 	    else
 		mConListener.connectionFailed("Error On Connection");
+	} catch (IllegalStateException e) {
+	    mConListener.connectionFailed(e.getMessage());
 	}
 	return false;
     }
diff -r 776575982b48 -r 77e8f3384a3b src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Oct 30 19:53:51 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Oct 30 22:38:11 2009 +0100
@@ -29,6 +29,8 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Gallery;
@@ -550,6 +552,7 @@
 		    v.setText(curContact.getMsgState());
 		    v.setTextColor(Color.WHITE);
 		    v.setTextSize(12);
+		    v.setHorizontallyScrolling(isFinishing());
 		}
 	    }
 	}