# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1261845902 -3600
# Node ID bccd99644eac57bb19a239697704db089dd585f7
# Parent  61f6095183a455dbfdc64f5fe6b9bd088a77728e
Change the image for status in the chat activity.
various correction in strings.

diff -r 61f6095183a4 -r bccd99644eac AndroidManifest.xml
--- a/AndroidManifest.xml	Sat Dec 26 17:38:52 2009 +0100
+++ b/AndroidManifest.xml	Sat Dec 26 17:45:02 2009 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.beem.project.beem" android:versionCode="1"
-	android:versionName="1.0">
+	android:versionName="0.1">
 	<application android:label="@string/app_name"
 		android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default"
 		android:debuggable="true" android:name="@string/app_name">
@@ -78,7 +78,6 @@
 	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
 	<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
 	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission>
-	<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
 
diff -r 61f6095183a4 -r bccd99644eac res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Sat Dec 26 17:38:52 2009 +0100
+++ b/res/values-fr/strings.xml	Sat Dec 26 17:45:02 2009 +0100
@@ -70,7 +70,7 @@
 	<string name="ChangeStatusActTitle">Beem - Changer mon statut</string>
 	<string name="ChangeStatusType">Mon statut</string>
 	<string name="ChangeStatusMessage">Mon message personnel</string>
-	<string name="OpenContactList">Ouvrir la liste des contactes</string>
+	<string name="OpenContactList">Ouvrir la liste des contacts</string>
 
 	
 	<string name="MenuAddContact">Ajouter un nouveau contact</string>
@@ -119,7 +119,7 @@
 	<string name="BeemChatManagerNewMessage">Vous avez reçu un nouveau message</string>
 
 	<!--  BeemBroadcastReceiver class -->
-	<string name="BeemBroadcastReceiverDisconnect">Vous avez été déconnecté(e)</string>
+	<string name="BeemBroadcastReceiverDisconnect">BEEM: Vous avez été déconnecté(e)</string>
 
 	<!--  XmppConnectionAdapter class -->
 	<string name="AcceptContactRequest">%s vient de vous ajouter à sa liste d\'amis.</string>
diff -r 61f6095183a4 -r bccd99644eac res/values/strings.xml
--- a/res/values/strings.xml	Sat Dec 26 17:38:52 2009 +0100
+++ b/res/values/strings.xml	Sat Dec 26 17:45:02 2009 +0100
@@ -119,7 +119,7 @@
 	<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
 
 	<!--  BeemBroadcastReceiver class -->
-	<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
+	<string name="BeemBroadcastReceiverDisconnect">BEEM: You have been disconnected</string>
 
 	<!--  XmppConnectionAdapter class -->
 	<string name="AcceptContactRequest">%s has just added you to his/her buddy list.</string>
diff -r 61f6095183a4 -r bccd99644eac src/com/beem/project/beem/ui/Chat.java
--- a/src/com/beem/project/beem/ui/Chat.java	Sat Dec 26 17:38:52 2009 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Sat Dec 26 17:45:02 2009 +0100
@@ -552,15 +552,15 @@
      */
     private void prepareIconsStatus() {
 	mStatusIconsMap.put(Status.CONTACT_STATUS_AVAILABLE, BitmapFactory.decodeResource(getResources(),
-	    R.drawable.status_available));
+	    android.R.drawable.presence_online));
 	mStatusIconsMap.put(Status.CONTACT_STATUS_AVAILABLE_FOR_CHAT, BitmapFactory.decodeResource(getResources(),
-	    R.drawable.status_available));
+	    android.R.drawable.presence_online));
 	mStatusIconsMap.put(Status.CONTACT_STATUS_AWAY, BitmapFactory.decodeResource(getResources(),
-	    R.drawable.status_away));
+	    android.R.drawable.presence_away));
 	mStatusIconsMap.put(Status.CONTACT_STATUS_BUSY, BitmapFactory.decodeResource(getResources(),
-	    R.drawable.status_dnd));
+	    android.R.drawable.presence_busy));
 	mStatusIconsMap.put(Status.CONTACT_STATUS_DISCONNECT, BitmapFactory.decodeResource(getResources(),
-	    R.drawable.status_offline));
+	    android.R.drawable.presence_offline));
 	mStatusIconsMap.put(Status.CONTACT_STATUS_UNAVAILABLE, BitmapFactory.decodeResource(getResources(),
 	    R.drawable.status_requested));
     }