Merge branch 'master' into dev_sal

Conflicts:
	console/commands.c

diff --cc console/commands.c
index 7b1a7912bc41cb9974d828c7f75ada65f9513cc2,d32e62667909e6939035f0b56a673e060a966e6d..c1c33f8eb9ef22d27bdbd09ee3f927628357362a
--- 1/console/commands.c
--- 2/console/commands.c
+++ b/console/commands.c
@@@ -1376,15 -1376,17 +1376,16 @@@ static int lpc_cmd_register(LinphoneCor
                return 1;
        }
        if (passwd[0]!='\0'){
 -              osip_from_t *from;
 +              LinphoneAddress *from;
                LinphoneAuthInfo *info;
 -              osip_from_init(&from);
 -              if (osip_from_parse(from,identity)==0){
 +              if ((from=linphone_address_new(identity))!=NULL){
                        char realm[128];
 -                      snprintf(realm,sizeof(realm)-1,"\"%s\"",from->url->host);
 -                      info=linphone_auth_info_new(from->url->username,NULL,passwd,NULL,NULL);
 +                      snprintf(realm,sizeof(realm)-1,"\"%s\"",linphone_address_get_domain(from));
 +                      info=linphone_auth_info_new(linphone_address_get_username(from),NULL,passwd,NULL,NULL);
                        linphone_core_add_auth_info(lc,info);
 +                      linphone_address_destroy(from);
+                       linphone_auth_info_destroy(info);
                }
 -              osip_from_free(from);
        }
        elem=linphone_core_get_proxy_config_list(lc);
        if (elem) {

diff --cc console/linphonec.c
Simple merge

diff --cc coreapi/linphonecore.h
Simple merge

diff --cc gtk-glade/logging.c
Simple merge