From efaddfe875453a37263e93e886b6cb40e1409557 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 22 May 2013 17:02:52 +0200
Subject: [PATCH] update linphone submodule

---
 .classpath                            | 4 ++--
 custom_rules.xml                      | 2 ++
 src/org/linphone/LinphoneManager.java | 6 ++++++
 submodules/linphone                   | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.classpath b/.classpath
index b95f2cc1d..1e0614575 100644
--- a/.classpath
+++ b/.classpath
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="submodules/linphone/mediastreamer2/java/src"/>
 	<classpathentry kind="src" path="submodules/linphone/java/j2se"/>
 	<classpathentry kind="src" path="submodules/linphone/java/common"/>
 	<classpathentry kind="src" path="submodules/linphone/java/impl"/>
 	<classpathentry kind="src" path="submodules/externals/axmlrpc/src/main/java"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="submodules/linphone/coreapi/help/java"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
 	<classpathentry kind="lib" path="libs/gcm.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/custom_rules.xml b/custom_rules.xml
index 9bf088275..1039d86be 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -37,6 +37,8 @@
 			<class name="org.linphone.core.LinphoneProxyConfigImpl" />
 			<class name="org.linphone.core.PayloadTypeImpl" />
 			<class name="org.linphone.core.LpConfigImpl" />
+			<class name="org.linphone.core.LinphoneContentImpl" />
+			<class name="org.linphone.core.LinphoneInfoMessage" />
 		</javah>
 		<javah outputfile="gen/xml2lpc_jni.h">
 			<classpath>
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index e7eba0bb6..253d2cd7d 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -1702,4 +1702,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public void notifyReceived(LinphoneCore lc, LinphoneCall call,
 			LinphoneAddress from, byte[] event) {
 	}
+	@Override
+	public void transferState(LinphoneCore lc, LinphoneCall call,
+			State new_call_state) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/submodules/linphone b/submodules/linphone
index da87ffc3e..53d4d1b7f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit da87ffc3e63942ee29ac00da674afdc216e19774
+Subproject commit 53d4d1b7f8bcd5b604011dafef37224c1751bfc4