# HG changeset patch
# User Vincent Veronis <veroni_v@epitech.net>
# Date 1256927120 -3600
# Node ID 6122f9ed186f9f71e58e72208e0c0c8042b6f3f8
# Parent  e12e3c23e31b7292724555e147c0d880a791fce1# Parent  3be6014b6cf4d402e82ec192ecb45d4a52b18dca
Merge.

diff -r 3be6014b6cf4 -r 6122f9ed186f src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Oct 30 17:07:15 2009 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Oct 30 19:25:20 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 3be6014b6cf4 -r 6122f9ed186f src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Oct 30 17:07:15 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Oct 30 19:25:20 2009 +0100
@@ -28,6 +28,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;
@@ -559,6 +561,7 @@
 		    v.setText(curContact.getMsgState());
 		    v.setTextColor(Color.WHITE);
 		    v.setTextSize(12);
+		    v.setHorizontallyScrolling(isFinishing());
 		}
 	    }
 	}