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

diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
index 1c6c6715c2fd909f70e9d832e347f468f69d2e85..79f541ac5eddc52a387bef8f8c4f8de1041f0ecb 100644 (file)
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
@@ -155,6 +155,7 @@ public class TutorialBuddyStatus implements LinphoneCoreListener {
 
                                // create proxy config
                                LinphoneProxyConfig proxyCfg = lcFactory.createProxyConfig(mySipAddress, domain, null, true);
+                               proxyCfg.enablePublish(true);
                                lc.addProxyConfig(proxyCfg); // add it to linphone
                                lc.setDefaultProxyConfig(proxyCfg);
                                while (!proxyCfg.isRegistered()) {

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 84e9ee3dffdfe8eecaeaa5fe0fae3940c89a68fd..87261673789de1598d9982f7ef2d2be852054459 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -303,6 +303,13 @@ void linphone_proxy_config_enable_register(LinphoneProxyConfig *obj, bool_t val)
 #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);

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 50787d7e28696e411cebf76c2c6f0af25c5b88e4..10fde26fae0c588e070ab9f5c6ff58dc2958465a 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -725,7 +725,15 @@ extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setDialPrefix(JNI
        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
 

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index b77ad942272397a28245504129376f4a9b8a846d..f49c59f12e3f0d948f5ea73a3a078022bdb3d602 100644 (file)
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -215,7 +215,6 @@ void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int val){
 void linphone_proxy_config_enable_publish(LinphoneProxyConfig *obj, bool_t val){
        obj->publish=val;
 }
-
 /**
  * Starts editing a proxy configuration.
  *

diff --git a/java/common/org/linphone/core/LinphoneProxyConfig.java b/java/common/org/linphone/core/LinphoneProxyConfig.java
index 729fd249d5c389c2740ddc9d0738c8d80b4918c8..441ad51cfc12d1ec061777c09e6dfdf6cbf9847b 100644 (file)
--- a/java/common/org/linphone/core/LinphoneProxyConfig.java
+++ b/java/common/org/linphone/core/LinphoneProxyConfig.java
@@ -112,5 +112,18 @@ public interface LinphoneProxyConfig {
         * @return  the route set for this proxy configuration.
         */
        public String getRoute();
+       /**
+        * 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
+        *
+        */
+       public void enablePublish(boolean enable);
+       /**
+        * returns publish state for this proxy config (see {@link #enablePublish(boolean)} )
+        */
+       public boolean publishEnabled();
+       
        
 }

diff --git a/mediastreamer2 b/mediastreamer2
index bc6aeef2ee689c5efe5222c2e696bd1f42a4846c..28a6e7f22fbdd93a01676fc9cc47a2605c846d75 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit bc6aeef2ee689c5efe5222c2e696bd1f42a4846c
+Subproject commit 28a6e7f22fbdd93a01676fc9cc47a2605c846d75