Merge branch 'master' of git.linphone.org:linphone-private

diff --combined coreapi/linphonecore.h
index 84e9ee3dffdfe8eecaeaa5fe0fae3940c89a68fd,92aa86edd8e3ab6a032417324b581628be67a3ec..87261673789de1598d9982f7ef2d2be852054459
--- 1/coreapi/linphonecore.h
--- 2/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@@ -303,6 -303,13 +303,13 @@@ void linphone_proxy_config_enable_regis
  #define linphone_proxy_config_enableregister linphone_proxy_config_enable_register
  void linphone_proxy_config_edit(LinphoneProxyConfig *obj);
  int linphone_proxy_config_done(LinphoneProxyConfig *obj);
+ /**
+  * Indicates  either or not, PUBLISH must be issued for this #LinphoneProxyConfig .
+  * <br> In case this #LinphoneProxyConfig has been added to #LinphoneCore, follows the linphone_proxy_config_edit() rule.
+  * @param obj object pointer
+  * @param val if true, publish will be engaged
+  *
+  */
  void linphone_proxy_config_enable_publish(LinphoneProxyConfig *obj, bool_t val);
  void linphone_proxy_config_set_dial_escape_plus(LinphoneProxyConfig *cfg, bool_t val);
  void linphone_proxy_config_set_dial_prefix(LinphoneProxyConfig *cfg, const char *prefix);
@@@ -618,7 -625,7 +625,7 @@@ int linphone_core_pause_all_calls(Linph
  
  int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call);
  
 -int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, LinphoneCallParams *params);
 +int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params);
  
  LinphoneCallParams *linphone_core_create_default_call_parameters(LinphoneCore *lc);
  

diff --combined coreapi/linphonecore_jni.cc
index 50787d7e28696e411cebf76c2c6f0af25c5b88e4,9512843757f151464abfae5f2faaaa3a5ef07039..10fde26fae0c588e070ab9f5c6ff58dc2958465a
--- 1/coreapi/linphonecore_jni.cc
--- 2/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@@ -725,7 -725,15 +725,15 @@@ extern "C" void Java_org_linphone_core_
        linphone_proxy_config_set_dial_prefix((LinphoneProxyConfig*)proxyCfg,prefix);
        env->ReleaseStringUTFChars(jprefix, prefix);
  }
- 
+ extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_enablePublish(JNIEnv* env
+                                                                                                                                                               ,jobject thiz
+                                                                                                                                                               ,jlong proxyCfg
+                                                                                                                                                               ,jboolean val) {
+       linphone_proxy_config_enable_publish((LinphoneProxyConfig*)proxyCfg,val);
+ }
+ extern "C" jboolean Java_org_linphone_core_LinphoneProxyConfigImpl_publishEnabled(JNIEnv* env,jobject thiz,jlong proxyCfg) {
+       return linphone_proxy_config_publish_enabled((LinphoneProxyConfig*)proxyCfg);
+ }
  
  //Auth Info
  
@@@ -1022,15 -1030,15 +1030,15 @@@ extern "C" void Java_org_linphone_core_
  extern "C" jboolean Java_org_linphone_core_LinphoneCallParamsImpl_getVideoEnabled(JNIEnv *env, jobject thiz, jlong lcp){
        return linphone_call_params_video_enabled((LinphoneCallParams*)lcp);
  }
 -extern "C" jlong Java_org_linphone_core_LinphoneCallParamsImpl_copy(JNIEnv *env, jobject thiz, jlong lcp){
 -      return (jlong) linphone_call_params_copy((LinphoneCallParams*)lcp);
 +extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_destroy(JNIEnv *env, jobject thiz, jlong lc){
 +      return linphone_call_params_destroy((LinphoneCallParams*)lc);
  }
  extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createDefaultCallParams(JNIEnv *env, jobject thiz, jlong lc){
        return (jlong) linphone_core_create_default_call_parameters((LinphoneCore*)lc);
  }
  
 -extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getCurrentParams(JNIEnv *env, jobject thiz, jlong lc){
 -      return (jlong) linphone_call_get_current_params((LinphoneCall*)lc);
 +extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getCurrentParamsCopy(JNIEnv *env, jobject thiz, jlong lc){
 +      return (jlong) linphone_call_params_copy(linphone_call_get_current_params((LinphoneCall*)lc));
  }
  
  extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_enableCamera(JNIEnv *env, jobject thiz, jlong lc, jboolean b){
@@@ -1046,7 -1054,7 +1054,7 @@@ extern "C" jint Java_org_linphone_core_
  }
  
  extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_updateCall(JNIEnv *env, jobject thiz, jlong lc, jlong call, jlong params){
 -      return (jint) linphone_core_update_call((LinphoneCore *)lc, (LinphoneCall *)call, (LinphoneCallParams *)params);
 +      return (jint) linphone_core_update_call((LinphoneCore *)lc, (LinphoneCall *)call, (const LinphoneCallParams *)params);
  }