--- a/.classpath	Wed Aug 12 22:00:10 2009 +0200
+++ b/.classpath	Tue Aug 25 02:08:51 2009 +0200
@@ -4,8 +4,6 @@
 	<classpathentry kind="lib" path="libs/smackx-debug.jar"/>
 	<classpathentry kind="lib" path="libs/smackx-jingle.jar"/>
 	<classpathentry kind="lib" path="libs/jlibrtp-0.2.2.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -14,5 +12,7 @@
 	<classpathentry kind="lib" path="libs/security.jar"/>
 	<classpathentry kind="lib" path="libs/smack.jar"/>
 	<classpathentry kind="lib" path="libs/smackx.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

--- a/src/com/beem/project/beem/ui/CreateAccount.java	Wed Aug 12 22:00:10 2009 +0200
+++ b/src/com/beem/project/beem/ui/CreateAccount.java	Tue Aug 25 02:08:51 2009 +0200
@@ -176,7 +176,7 @@
      * @return Registered proxy username
      */
     private String getRegisteredProxyUsername() {
-	return Settings.getString(getString(R.string.settings_key_proxy_username), DEFAULT_STRING_VALUE);
+	return mSettings.getString(getString(R.string.settings_key_proxy_username), DEFAULT_STRING_VALUE);
     }
 
     /**

--- a/src/com/beem/project/beem/ui/EditSettings.java	Wed Aug 12 22:00:10 2009 +0200
+++ b/src/com/beem/project/beem/ui/EditSettings.java	Tue Aug 25 02:08:51 2009 +0200
@@ -502,7 +502,7 @@
      * Save settings in shared preferences.
      */
     private void saveSettings() {
-	final SharedPreferences.Editor settingsEditor = settings.edit();
+	final SharedPreferences.Editor settingsEditor = mSettings.edit();
 	final boolean proxyUseCheckBoxValue = getCheckBoxValue(R.id.settings_proxy_use);
 
 	if (getRegisteredProxyUse() != proxyUseCheckBoxValue)