# HG changeset patch
# User nikita@nikita-lab
# Date 1245504522 -7200
# Node ID cc4c230b5bd2aef8bd2f239fb2e01a72f0e59fd8
# Parent  17422d221dc1ddcbfa07c23f0931aebca0f393f3# Parent  7c67ea0a501c7b399f4ed4bd022a1c518112c796
merge

diff -r 7c67ea0a501c -r cc4c230b5bd2 .classpath
--- a/.classpath	Fri Jun 19 12:03:44 2009 +0200
+++ b/.classpath	Sat Jun 20 15:28:42 2009 +0200
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/smack.jar"/>
+	<classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/nikita/devel/smack_src_3_1_0"/>
 	<classpathentry kind="lib" path="libs/smackx-debug.jar"/>
 	<classpathentry kind="lib" path="libs/smackx-jingle.jar"/>
-	<classpathentry kind="lib" path="libs/smackx.jar"/>
+	<classpathentry kind="lib" path="libs/smackx.jar" sourcepath="/home/nikita/devel/smack_src_3_1_0"/>
 	<classpathentry kind="lib" path="libs/jlibrtp-0.2.2.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
diff -r 7c67ea0a501c -r cc4c230b5bd2 AndroidManifest.xml
--- a/AndroidManifest.xml	Fri Jun 19 12:03:44 2009 +0200
+++ b/AndroidManifest.xml	Sat Jun 20 15:28:42 2009 +0200
@@ -41,4 +41,5 @@
 	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission>
 	<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission>
 	<uses-sdk android:minSdkVersion="3"></uses-sdk>
+
 </manifest> 
diff -r 7c67ea0a501c -r cc4c230b5bd2 src/com/beem/project/beem/service/BeemChatManager.java
--- a/src/com/beem/project/beem/service/BeemChatManager.java	Fri Jun 19 12:03:44 2009 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Sat Jun 20 15:28:42 2009 +0200
@@ -104,7 +104,7 @@
 	public void processMessage(Chat chat, Message message) {
 	    ChatAdapter newchat = getChat(chat);
 	    try {
-
+		Log.d(TAG, message.getBody());
 		if (message.getBody() != null)
 		    newchat.addMessage(new com.beem.project.beem.service.Message(message));
 		final int n = mRemoteMessageListeners.beginBroadcast();