# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1240572083 -7200
# Node ID 471893ecd4027b6eeb1c85fc4a71ae50c0ca3829
# Parent  b214244738f7c39163afb54d66861fd591c4e3ab# Parent  e892a47de0861dff0ccd338e046c7128df768d3b
merge avec marseille

diff -r e892a47de086 -r 471893ecd402 res/layout/contactlistcontact.xml
--- a/res/layout/contactlistcontact.xml	Fri Apr 24 12:32:10 2009 +0200
+++ b/res/layout/contactlistcontact.xml	Fri Apr 24 13:21:23 2009 +0200
@@ -5,7 +5,6 @@
         android:layout_height="wrap_content"
         android:paddingLeft="10px"
         android:paddingRight="10px"
-        android:background="@drawable/beem_sendim_header_1"
         android:gravity="center_vertical" >
 
         <ImageView android:id="@+id/contactliststatus"
diff -r e892a47de086 -r 471893ecd402 res/layout/contactlistgroup.xml
--- a/res/layout/contactlistgroup.xml	Fri Apr 24 12:32:10 2009 +0200
+++ b/res/layout/contactlistgroup.xml	Fri Apr 24 13:21:23 2009 +0200
@@ -4,7 +4,6 @@
         android:layout_width="fill_parent"
         android:layout_height="50sp"
 		android:paddingTop="5sp"
-		android:background="@drawable/beem_contactlist_header_1"
 		android:gravity="center_vertical">
 
         <TextView android:id="@+id/textgroup"
diff -r e892a47de086 -r 471893ecd402 res/layout/sendim.xml
--- a/res/layout/sendim.xml	Fri Apr 24 12:32:10 2009 +0200
+++ b/res/layout/sendim.xml	Fri Apr 24 13:21:23 2009 +0200
@@ -7,7 +7,6 @@
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/beem_sendim_header_1"
         android:gravity="center_vertical" >
 
         <ImageView
diff -r e892a47de086 -r 471893ecd402 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Apr 24 12:32:10 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Apr 24 13:21:23 2009 +0200
@@ -64,11 +64,11 @@
 	mRosterListener = new BeemRosterListener();
 	mSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
 	// bug fixe temporaire des betises de marseille
-	/*
-	 * SharedPreferences mSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
-	 * SharedPreferences.Editor editor = mSettings.edit(); editor.putInt(getString(R.string.PreferencePortKey),
-	 * 5222); editor.commit();
-	 */
+//	
+//	 SharedPreferences mSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
+//	 SharedPreferences.Editor editor = mSettings.edit(); editor.putInt(getString(R.string.PreferencePortKey),
+//	 5222); editor.commit();
+	 
     }
 
     @Override