From 9c614b4cca4ec05f2897430a7f082cc42293517d Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 6 Dec 2011 16:23:36 +0100
Subject: [PATCH] fix call with sip uri whitout userinfo

---
 Classes/IncallViewController.m | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index af3933b3b..d3b984f60 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -491,19 +491,23 @@ int callCount(LinphoneCore* lc) {
     const LinphoneAddress* addr = linphone_call_get_remote_address(call);
     
     if (addr) {
+		const char* lUserNameChars=linphone_address_get_username(addr);
+		NSString* lUserName = lUserNameChars?[[NSString alloc] initWithUTF8String:lUserNameChars]:NSLocalizedString(@"Unknown",nil);
         NSMutableString* mss = [[NSMutableString alloc] init];
         /* contact name */
         const char* n = linphone_address_get_display_name(addr);
         if (n) 
             [mss appendFormat:@"%s", n, nil];
         else
-            [mss appendFormat:@"%s", linphone_address_get_username(addr), nil];
+            [mss appendFormat:@"%@",lUserName , nil];
         
         if ([mss compare:label.text] != 0 || imageView.image == nil) {
             [label setText:mss];
         
-            imageView.image = [[LinphoneManager instance] getImageFromAddressBook:[NSString stringWithCString:linphone_address_get_username(addr) encoding: [NSString defaultCStringEncoding]]];
+            imageView.image = [[LinphoneManager instance] getImageFromAddressBook:lUserName];
         }
+		[mss release];
+		[lUserName release];
     } else {
         [label setText:@"plop"];
         imageView.image = nil;
@@ -530,6 +534,7 @@ int callCount(LinphoneCore* lc) {
             }
         }
         [detailLabel setText:ms];
+		[ms release];
     }
 
     if (accessoryView != nil) {