diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index b8f1dae48..3e998cb74 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -25,6 +25,7 @@
 
 
 using namespace belledonnecomm;
+using namespace ::std;
 
 Mutex TunnelManager::sMutex;
 
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index a7ccef402..802afe725 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -4393,7 +4393,7 @@ void linphone_core_refresh_registers(LinphoneCore* lc) {
 	elem=linphone_core_get_proxy_config_list(lc);
 	for(;elem!=NULL;elem=elem->next){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
-		if (linphone_proxy_config_register_enabled(cfg) ) {
+		if (linphone_proxy_config_register_enabled(cfg) && linphone_proxy_config_get_expires(cfg)>0) {
 			linphone_proxy_config_refresh_register(cfg);
 		}
 	}
@@ -4403,7 +4403,7 @@ void __linphone_core_invalidate_registers(LinphoneCore* lc){
 	const MSList *elem=linphone_core_get_proxy_config_list(lc);
 	for(;elem!=NULL;elem=elem->next){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
-		if (linphone_proxy_config_register_enabled(cfg) ) {
+		if (linphone_proxy_config_register_enabled(cfg)) {
 			linphone_proxy_config_edit(cfg);
 			linphone_proxy_config_done(cfg);
 		}
@@ -4782,7 +4782,7 @@ void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *para
 	params->in_conference=FALSE;
 }
 
-void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, float cy) {
+void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float* cx, float* cy) {
     VideoStream* vstream = call->videostream;
     float zoom[3];
     
@@ -4790,18 +4790,18 @@ void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, f
         zoom_factor = 1;
     float halfsize = 0.5 * 1.0 / zoom_factor;
     
-    if ((cx - halfsize) < 0)
-        cx = 0 + halfsize;
-    if ((cx + halfsize) > 1)
-        cx = 1 - halfsize;
-    if ((cy - halfsize) < 0)
-        cy = 0 + halfsize;
-    if ((cy + halfsize) > 1)
-        cy = 1 - halfsize;
+    if ((*cx - halfsize) < 0)
+        *cx = 0 + halfsize;
+    if ((*cx + halfsize) > 1)
+        *cx = 1 - halfsize;
+    if ((*cy - halfsize) < 0)
+        *cy = 0 + halfsize;
+    if ((*cy + halfsize) > 1)
+        *cy = 1 - halfsize;
     
     zoom[0] = zoom_factor;
-    zoom[1] = cx;
-    zoom[2] = cy;
+    zoom[1] = *cx;
+    zoom[2] = *cy;
     ms_filter_call_method(vstream->output, MS_VIDEO_DISPLAY_ZOOM, &zoom);
 }
 
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index d3a514a69..bd10556a0 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1134,7 +1134,7 @@ typedef struct LinphoneTunnel LinphoneTunnel;
 */
 LinphoneTunnel *linphone_core_get_tunnel(LinphoneCore *lc);
     
-    void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, float cy);
+void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float* cx, float* cy);
 
 #ifdef __cplusplus
 }
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 49e0ec3cc..cf7675807 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -218,7 +218,7 @@ void linphone_proxy_config_enableregister(LinphoneProxyConfig *obj, bool_t val){
  * Sets the registration expiration time in seconds.
 **/
 void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int val){
-	if (val<=0) val=600;
+	if (val<0) val=600;
 	obj->expires=val;
 }
 
diff --git a/gtk/loginframe.c b/gtk/loginframe.c
index f1a67d9d5..08b90fe45 100644
--- a/gtk/loginframe.c
+++ b/gtk/loginframe.c
@@ -49,6 +49,7 @@ static gboolean do_login_noprompt(LinphoneProxyConfig *cfg){
 	tmp=linphone_address_as_string (addr);
 	do_login(ssctx,tmp,NULL);
 	linphone_address_destroy(addr);
+	linphone_gtk_load_identities();
 	return FALSE;
 }
 
@@ -62,14 +63,14 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
 	int nettype;
 	const char *passwd=NULL;
 
-
+	
 	if (linphone_core_get_download_bandwidth(lc)==512 &&
 		linphone_core_get_upload_bandwidth(lc)==512)
 		nettype=NetworkKindOpticalFiber;
 	else nettype=NetworkKindAdsl;
 	gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"login_internet_kind")),nettype);
-	gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"internet_kind")),nettype);
-
+	//gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"internet_kind")),nettype);
+	
 	if (linphone_gtk_get_ui_config_int("automatic_login",0) ){
 		g_timeout_add(250,(GSourceFunc)do_login_noprompt,cfg);
 		return;
@@ -88,7 +89,6 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
 	gtk_widget_hide(linphone_gtk_get_widget(mw,"disconnect_item"));
 	gtk_widget_hide(linphone_gtk_get_widget(mw,"main_frame"));
 	gtk_widget_show(linphone_gtk_get_widget(mw,"login_frame"));
-	gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"main_menu"),FALSE);
 	gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"options_menu"),FALSE);
 	str=g_strdup_printf(_("Please enter login information for %s"),linphone_proxy_config_get_domain(cfg));
 	gtk_label_set_text(GTK_LABEL(label),str);
@@ -118,7 +118,6 @@ void linphone_gtk_exit_login_frame(void){
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	gtk_widget_show(linphone_gtk_get_widget(mw,"main_frame"));
 	gtk_widget_hide(linphone_gtk_get_widget(mw,"login_frame"));
-	gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"main_menu"),TRUE);
 	gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"options_menu"),TRUE);
 	gtk_widget_show(linphone_gtk_get_widget(mw,"disconnect_item"));
 }
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 31300e384..f33415b46 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -409,7 +409,7 @@ public interface LinphoneCore {
 	/**
 	 * @return a list of LinphoneCallLog 
 	 */
-	public Vector getCallLogs();
+	public LinphoneCallLog[] getCallLogs();
 	
 	/**
 	 * This method is called by the application to notify the Linphone core library when network is reachable.
@@ -690,7 +690,7 @@ public interface LinphoneCore {
 	int getConferenceSize();
 	
 	void terminateAllCalls();
-	Vector getCalls();
+	LinphoneCall[] getCalls();
 	int getCallsNb();
 
 
diff --git a/mediastreamer2 b/mediastreamer2
index 43c192346..37474c877 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 43c1923468d962aa5577ebcf6d8674ef9d426e40
+Subproject commit 37474c877a7f4e1c458c6f9edf1302e75d929dd1
diff --git a/oRTP b/oRTP
index 41d13b7e4..07fa32444 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 41d13b7e491c7fc418987b63ff6ef80c7e8895a4
+Subproject commit 07fa32444a010965baec9562c9d07da5e5d6f2ce