# 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 b214244738f7 -r 471893ecd402 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Apr 24 13:19:42 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Apr 24 13:21:23 2009 +0200
@@ -61,7 +61,6 @@
     @Override
     protected void onCreate(Bundle saveBundle) {
 	super.onCreate(saveBundle);
-	mBeemApplication = BeemApplication.getApplication(this);
 	mRosterListener = new BeemRosterListener();
 	mSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
 	// bug fixe temporaire des betises de marseille
@@ -71,10 +70,11 @@
 //	 5222); editor.commit();
 	 
     }
-    
+
     @Override
     protected void onResume() {
 	super.onResume();
+	mBeemApplication = BeemApplication.getApplication(this);
 	if (!mBeemApplication.isConnected())
 	    mBeemApplication.startBeemService();
 	mBeemApplication.callWhenConnectedToServer(new Handler(), new Runnable() {
diff -r b214244738f7 -r 471893ecd402 src/com/beem/project/beem/ui/ContactListSettings.java
--- a/src/com/beem/project/beem/ui/ContactListSettings.java	Fri Apr 24 13:19:42 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactListSettings.java	Fri Apr 24 13:21:23 2009 +0200
@@ -108,7 +108,7 @@
 		editor.putString(getString(R.string.PreferencePasswordKey), getWidgetText(R.id.password));
 		mIsChanged = true;
 	    }
-	    if (isChanged(R.id.host, R.string.PreferenceService)) {
+	    if (isChanged(R.id.service, R.string.PreferenceService)) {
 		editor.putString(getString(R.string.PreferenceService), getWidgetText(R.id.service));
 		mIsChanged = true;
 	    }
@@ -118,7 +118,7 @@
 		mIsChanged = true;
 	    }
 	    if (Integer.parseInt(getWidgetText(R.id.proxy_port)) != mSettings.getInt(
-		getString(R.string.PreferenceProxyPort), 1080)) {
+		getString(R.string.PreferenceProxyPort), 0)) {
 		editor
 		    .putInt(getString(R.string.PreferenceProxyPort), Integer.parseInt(getWidgetText(R.id.proxy_port)));
 		mIsChanged = true;
diff -r b214244738f7 -r 471893ecd402 src/com/beem/project/beem/ui/SendIM.java
--- a/src/com/beem/project/beem/ui/SendIM.java	Fri Apr 24 13:19:42 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Fri Apr 24 13:21:23 2009 +0200
@@ -109,6 +109,7 @@
     @Override
     protected void onResume() {
 	super.onResume();
+	mBeemApplication = BeemApplication.getApplication(this);
 	if (!mBeemApplication.isConnected())
 	    mBeemApplication.startBeemService();
 	mBeemApplication.callWhenConnectedToServer(mHandler, new Runnable() {