Merge remote-tracking branch 'public/master' into belle-sip

Conflicts:
	NEWS
	coreapi/linphonecore.c
	java/impl/org/linphone/core/LinphoneAddressImpl.java

NEWS

@@ -3,10 +3,10 @@ linphone-3.7...??
 	* IP dual stack: can use IPv6 and IPv4 simultaneously
 	* fully asynchronous behavior: no more lengthly DNS or connections 
 
-linphone-3.7...??
-	* multiple SIP transports simualtaneously now allowed
-	* IP dual stack: can use IPv6 and IPv4 simultaneously
-	* fully asynchronous behavior: no more lengthly DNS or connections 
+llinphone-3.6.1 -- June 17, 2013
+	* fix memory leak with some video cameras on windows.
+	
+	Requires: mediastreamer2 = 2.9.1 and ortp = 0.22.0
 
 linphone-3.6.0 -- May 27, 2013
 	UI:

README.macos

@@ -7,6 +7,10 @@ You need:
  - Macports: http://www.macports.org/
    Download and install macports using its user friendly installer.
 
+- In order to enable generation of bundle for multiple macos version it is recommended to edit /opt/local/etc/macports/macports.conf to add the 
+  following line:
+ macosx_deployment_target 10.6
+
 - Install build time dependencies
  $ sudo port install automake autoconf libtool intltool
 
@@ -17,7 +21,22 @@ You need:
  $ sudo port install ffmpeg-devel -gpl2
  $ sudo port install libvpx
  $ sudo port install readline
- 
+
+
+- Install gtk. It is recommended to use the quartz backend for better integration.
+ $ sudo port install gtk2 +quartz +no_x11
+ $ sudo port install gtk-osx-application -python27
+ $ sudo port install hicolor-icon-theme
+
+- Install additional librairies required for wizard (linphone.org account creation assistant)
+ $ sudo port install libsoup
+
+- Install sqlite3 for message storage
+ $ sudo port install sqlite3
+
+The softwares below need to be compiled manually. To ensure compatibility with multiple mac os version it is recommended to do:
+ $ export MACOSX_DEPLOYMENT_TARGET=10.6 
+
 - Install srtp (optional) for call encryption
  $ sudo port install srtp
  If that fails, get from source:
@@ -31,17 +50,6 @@ You need:
  $ cd zrtpcpp && cmake -Denable-ccrtp=false . && make
  $ sudo make install
 
-- Install gtk. It is recommended to use the quartz backend for better integration.
- $ sudo port install gtk2 +quartz +no_x11
- $ sudo port install gtk-osx-application -python27
- $ sudo port install hicolor-icon-theme
- 
-- Install additional librairies required for wizard (linphone.org account creation assistant)
- $ sudo port install libsoup
- 
- - Install sqlite3 for message storage
- $ sudo port install sqlite3
- 
  ** WARNING 2013-03-06 glib-networking is currently broken in macports - generates crashes or hangs when used in a bundle **
  As a temporary workaround, build a newer version by yourself:
  $ wget http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.34/glib-networking-2.34.2.tar.xz
@@ -58,7 +66,6 @@ You need:
 
  $ ./configure --prefix=/opt/local && make && sudo make install
 
-
 - Compile linphone
 
  If you got the source code from git, run ./autogen.sh first.
@@ -82,8 +89,7 @@ Use git:
  $ sudo touch touch /opt/local/lib/charset.alias
 
 Then run, inside linphone source tree:
- 1. Run configure as told before but with "--enable-relativeprefix" appended.
- 
+ Run configure as told before but with "--enable-relativeprefix" appended.
  $ make
  $ make bundle
 

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.6.0],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.6.1],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 
@@ -29,7 +29,7 @@ AC_SUBST(LINPHONE_VERSION)
 AC_MSG_NOTICE([$PACKAGE_NAME-$PACKAGE_VERSION		A full featured audio/video sip phone.])
 AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 tar-pax])
 AC_SUBST([LIBTOOL_DEPS])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
 AC_SUBST([docdir], [${datadir}/doc])

coreapi/linphonecore.c

@@ -2890,7 +2890,7 @@ int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call){
 	if (call->dest_proxy && call->dest_proxy->op){
 		/*give a chance to update the contact address if connectivity has changed*/
 		sal_op_set_contact(call->op,sal_op_get_contact(call->dest_proxy->op));
-	}
+	}else sal_op_set_contact(call->op,NULL);
 	return sal_call_update(call->op,subject);
 }
 

coreapi/linphonecore_jni.cc

@@ -1539,7 +1539,14 @@ extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_getDomain(JNIEnv*
 		return NULL;
 	}
 }
-
+extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setDomain(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jstring jdomain) {
+	const char* domain = env->GetStringUTFChars(jdomain, NULL);
+    linphone_address_set_domain((LinphoneAddress*)ptr, domain);
+	env->ReleaseStringUTFChars(jdomain, domain);
+}
 extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_toString(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr) {

java/impl/org/linphone/core/LinphoneAddressImpl.java

@@ -33,6 +33,7 @@ public class LinphoneAddressImpl implements LinphoneAddress {
 	private native void setDomain(long ptr,String domain);
 	private native void setUserName(long ptr,String username);
 	private native String toString(long ptr);
+	private native void setDomain(long ptr, String domain);
 	
 	protected LinphoneAddressImpl(String identity)  throws LinphoneCoreException{
 		nativePtr = newLinphoneAddressImpl(identity, null);
@@ -92,7 +93,7 @@ public class LinphoneAddressImpl implements LinphoneAddress {
 		return getPortInt();
 	}
 	public void setDomain(String domain) {
-		setDomain(nativePtr,domain);
+		setDomain(nativePtr, domain);
 	}
 	public void setPort(String port) {
 		throw new RuntimeException("Not implemented");

mediastreamer2

@@ -1 +1 @@
-Subproject commit 318a2192108cdfb4946fb9eb73c35f8a055d121f
+Subproject commit 94b4434c34d1ae9de5438b9cfa614ee1821eb709

oRTP

@@ -1 +1 @@
-Subproject commit 462296433f10bd84cb605edb0b38d16a4cd81d9e
+Subproject commit 020d921f876ed04d434425fb2176642bbe9b3004