# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1260305544 -3600
# Node ID 521f96cb736d424ba329b9d0d88164b7fd36a8b1
# Parent  b3ac11346ea56b592756276775bc996248f10f32
petites modifs dans l'createaccount

diff -r b3ac11346ea5 -r 521f96cb736d libs/smack.jar
Binary file libs/smack.jar has changed
diff -r b3ac11346ea5 -r 521f96cb736d libs/smackx-debug.jar
Binary file libs/smackx-debug.jar has changed
diff -r b3ac11346ea5 -r 521f96cb736d libs/smackx-jingle.jar
Binary file libs/smackx-jingle.jar has changed
diff -r b3ac11346ea5 -r 521f96cb736d libs/smackx.jar
Binary file libs/smackx.jar has changed
diff -r b3ac11346ea5 -r 521f96cb736d res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Fri Dec 04 17:40:13 2009 +0100
+++ b/res/values-fr/strings.xml	Tue Dec 08 21:52:24 2009 +0100
@@ -274,9 +274,9 @@
 	<string name="chat_no_more_chats">Aucune conversation en cours</string>
 
 	<string name="contact_status_msg_available">Disponible</string>
-	<string name="contact_status_msg_available_chat">Disponible pour clavarder</string>
+	<string name="contact_status_msg_available_chat">Disponible pour discuter</string>
 	<string name="contact_status_msg_dnd">Occupé(e)</string>
-	<string name="contact_status_msg_away">Parti(e)</string>
+	<string name="contact_status_msg_away">Absent(e)</string>
 	<string name="contact_status_msg_xa">Indisponible</string>
 	<string name="contact_status_msg_offline">Hors ligne</string>
 
diff -r b3ac11346ea5 -r 521f96cb736d src/com/beem/project/beem/ui/CreateAccount.java
--- a/src/com/beem/project/beem/ui/CreateAccount.java	Fri Dec 04 17:40:13 2009 +0100
+++ b/src/com/beem/project/beem/ui/CreateAccount.java	Tue Dec 08 21:52:24 2009 +0100
@@ -66,7 +66,6 @@
 
 import com.beem.project.beem.R;
 
-// TODO: Auto-generated Javadoc
 /**
  * This class represents an activity which allows the user to create an account on the XMPP server saved in settings.
  * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
@@ -270,7 +269,7 @@
 	final String passwordConfirmFielddValue = ((EditText) findViewById(R.id.create_account_confirm_password))
 	    .getText().toString();
 
-	return passwordFieldValue.equals(passwordConfirmFielddValue);
+	return passwordFieldValue.equals(passwordConfirmFielddValue) && !passwordConfirmFielddValue.equals("");
     }
 
     /**
diff -r b3ac11346ea5 -r 521f96cb736d src/com/beem/project/beem/ui/Login.java
--- a/src/com/beem/project/beem/ui/Login.java	Fri Dec 04 17:40:13 2009 +0100
+++ b/src/com/beem/project/beem/ui/Login.java	Tue Dec 08 21:52:24 2009 +0100
@@ -96,7 +96,7 @@
 	super.onStart();
 	mIsConfigured = mSettings.getBoolean("PreferenceIsConfigured", false);
 	// TODO utiliser une options des preference plutot.
-	if (mIsConfigured && !mIsResult) {
+	if (mIsConfigured && !mIsResult && BeemConnectivity.isConnected(getApplicationContext())) {
 	    mTextView.setText("");
 	    Intent i = new Intent(this, LoginAnim.class);
 	    startActivityForResult(i, 42);