# HG changeset patch
# User nikita@nikita-rack
# Date 1240324730 -7200
# Node ID fc47ca00ad95cfff8d3e6cfc478ccbdf14be88d8
# Parent  666ffa5135b950ddda2c7f26cd5a98048c7f3e02# Parent  c93e4b69f031e4eceef368ac0f828288b1c85e5f
popop merge

diff -r c93e4b69f031 -r fc47ca00ad95 AndroidManifest.xml
--- a/AndroidManifest.xml	Mon Apr 20 21:46:52 2009 +0200
+++ b/AndroidManifest.xml	Tue Apr 21 16:38:50 2009 +0200
@@ -7,10 +7,12 @@
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
+				<category android:name="android.intent.category.ACCOUNT_CREATE" />
 			</intent-filter>
 		</activity>
 		<activity android:name=".ui.ContactListSettings" android:label="@string/app_name" />
 		<activity android:name=".ui.SendIM" android:label="@string/app_name" />
+		<activity android:name=".ui.AccountCreation" android:label="@string/app_name" />
 		<service android:name="BeemService" android:enabled="true"
 			android:label="Beem Service" android:permission="com.beem.project.beem.BEEM_SERVICE">
 			<intent-filter>
diff -r c93e4b69f031 -r fc47ca00ad95 default.properties
--- a/default.properties	Mon Apr 20 21:46:52 2009 +0200
+++ b/default.properties	Tue Apr 21 16:38:50 2009 +0200
@@ -7,8 +7,6 @@
 # "build.properties", and override values to adapt the script to your
 # project structure.
 
-# Project target.
-target=android-3
 # apk configurations. This property allows creation of APK files with limited
 # resources. For example, if your application contains many locales and
 # you wish to release multiple smaller apks instead of a large one, you can
@@ -20,3 +18,5 @@
 #     apk-config-european=en,fr,it,de,es
 #     apk-config-northamerica=en,es
 apk-configurations=
+# Project target.
+target=android-3
diff -r c93e4b69f031 -r fc47ca00ad95 project.aidl
--- a/project.aidl	Mon Apr 20 21:46:52 2009 +0200
+++ b/project.aidl	Tue Apr 21 16:38:50 2009 +0200
@@ -4,5 +4,5 @@
 
 parcelable com.beem.project.beem.BeemException
 parcelable com.beem.project.beem.service.Message
+parcelable com.beem.project.beem.service.PresenceAdapter
 parcelable com.beem.project.beem.service.Contact
-parcelable com.beem.project.beem.service.PresenceAdapter
diff -r c93e4b69f031 -r fc47ca00ad95 res/menu/contactlistmenu.xml
--- a/res/menu/contactlistmenu.xml	Mon Apr 20 21:46:52 2009 +0200
+++ b/res/menu/contactlistmenu.xml	Tue Apr 21 16:38:50 2009 +0200
@@ -1,4 +1,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:title="Creer ou Editer un compte" android:id="@+id/account_edit" android:icon="@drawable/xmpp"/>
 	<item android:title="L'equipe Beem" android:id="@+id/account_about"/>
+	<item android:title="TEMP/createAccount" android:id="@+id/account_create"/>
 </menu>
diff -r c93e4b69f031 -r fc47ca00ad95 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Mon Apr 20 21:46:52 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Tue Apr 21 16:38:50 2009 +0200
@@ -37,7 +37,8 @@
 public class ContactList extends ExpandableListActivity {
 
     private static final String TAG = "CONTACTLIST_ACT";
-    private static final int PREFERENCECHANGED = 0; 
+    private static final int PREFERENCECHANGED = 0;
+    private static final int CREATEACCOUNT = 1;
     private IXmppFacade mService = null;
     private SharedPreferences mSettings;
     private Handler mHandler;
@@ -146,6 +147,9 @@
 		return true;
 	    case R.id.account_about:
 		return true;
+	    case R.id.account_create:
+		startActivity(new Intent(this, AccountCreation.class));
+		return true;
 	    default:
 		return false;
 	}
diff -r c93e4b69f031 -r fc47ca00ad95 src/com/beem/project/beem/ui/ContactListSettings.java
--- a/src/com/beem/project/beem/ui/ContactListSettings.java	Mon Apr 20 21:46:52 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactListSettings.java	Tue Apr 21 16:38:50 2009 +0200
@@ -4,7 +4,6 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
-import android.util.Log;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;