# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1243622119 -7200
# Node ID cb15bad7d9caa16fc0653889d8a0ad270cc2809c
# Parent  d8e2cb1eb89570f0633075e6ccdd3a7e410e041c# Parent  5d168a9b6b82fef348a532c06e4ab31a29dbae5a
merge

diff -r d8e2cb1eb895 -r cb15bad7d9ca res/values/styles.xml
--- a/res/values/styles.xml	Fri May 29 20:34:30 2009 +0200
+++ b/res/values/styles.xml	Fri May 29 20:35:19 2009 +0200
@@ -6,6 +6,7 @@
 		<item name="android:typeface">sans</item>
 		<item name="android:capitalize">characters</item>
 		<item name="android:textColor">#FFFFFF</item>
+		<item name="android:enabled">false</item>
 	</style>
 	<style name="Theme.BEEM.Default" parent="@android:style/Theme">
 		<item name="android:windowBackground">@drawable/background</item>
diff -r d8e2cb1eb895 -r cb15bad7d9ca src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Fri May 29 20:34:30 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Fri May 29 20:35:19 2009 +0200
@@ -10,7 +10,6 @@
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.proxy.ProxyInfo;
 import org.jivesoftware.smack.proxy.ProxyInfo.ProxyType;
-
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -20,6 +19,7 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
+import android.widget.ArrayAdapter;
 
 import com.beem.project.beem.service.XmppConnectionAdapter;
 import com.beem.project.beem.service.XmppFacade;
@@ -74,8 +74,10 @@
 	// TODO mettre a false par defaut et remplacer les valeurs par defaut
 	mUseProxy = mSettings.getBoolean(getString(R.string.settings_key_proxy_use), false);
 	if (mUseProxy) {
-	    String stype = mSettings.getString(getString(R.string.PreferenceProxyType),
-		    getString(R.string.PreferenceProxyTypeHttp));
+	    ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.proxy_types,
+		    android.R.layout.simple_spinner_item);
+	    int pos = mSettings.getInt(getString(R.string.settings_key_proxy_type), 0);
+	    String stype = adapter.getItem(pos).toString();
 	    String phost = mSettings.getString(getString(R.string.settings_key_proxy_server), "");
 	    String puser = mSettings.getString(getString(R.string.settings_key_proxy_username), "");
 	    String ppass = mSettings.getString(getString(R.string.settings_key_proxy_password), "");