From 903fc38a9128a0f05e658989ee354c517a7d62e6 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 13 Dec 2010 16:48:42 +0100 Subject: [PATCH] Merge --- .../java/org/linphone/core/tutorials/TutorialRegistration.java | 2 +- coreapi/linphonecore_jni.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java index 49689ba32..9fbcb25c7 100644 --- a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java +++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java @@ -64,7 +64,7 @@ public class TutorialRegistration implements LinphoneCoreListener { * Registration state notification listener */ public void registrationState(LinphoneCore lc, LinphoneProxyConfig cfg,RegistrationState cstate, String smessage) { - write(cfg.getIdentity() + " : "+smessage+"\n"); + write(cfg.getIdentity() + " : "+smessage); } public void show(LinphoneCore lc) {} diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 64c5997d6..dc3969b8d 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -993,7 +993,6 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_sendMessage(JNIEnv* } -<<<<<<< HEAD extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv* env ,jobject thiz ,jlong lc @@ -1084,7 +1083,7 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDownloadBandwidth(JNI extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setUploadBandwidth(JNIEnv *env, jobject thiz, jlong lc, jint bw){ linphone_core_set_upload_bandwidth((LinphoneCore *)lc, (int) bw); - +} extern "C" int Java_org_linphone_core_LinphoneProxyConfigImpl_getState(JNIEnv* env,jobject thiz,jlong ptr) { return (int) linphone_proxy_config_get_state((const LinphoneProxyConfig *) ptr); }