Mercurial Mercurial > beem > otr / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge avec marseille
authorPhilippe Lago <lago_p@epitech.net>
Fri, 24 Apr 2009 13:21:23 +0200
changeset 172 471893ecd402
parent 171 b214244738f7 (current diff)
parent 170 e892a47de086 (diff)
child 175 0e59b0a9509b
merge avec marseille
src/com/beem/project/beem/ui/ContactList.java file | annotate | diff | comparison | revisions 
--- 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() {
--- 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;
--- 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() {
BEEM-OTR