From f279fd1160bf292f5b0a643d80636e36df308f64 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Thu, 24 Nov 2011 15:37:49 +0100
Subject: [PATCH] Minor UI fixes. Change linphone version to 1.1

---
 Classes/IncallViewController.m | 6 ++++--
 linphone-Info.plist            | 4 ++--
 submodules/linphone            | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index bfce10358..008a05010 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -558,6 +558,7 @@ int callCount(LinphoneCore* lc) {
     
     NSMutableString* ms = [[NSMutableString alloc] init ];
     const MSList* calls = linphone_core_get_calls(lc);
+    bool isFirst = true;
     while (calls) {
         LinphoneCall* call = (LinphoneCall*)calls->data;
         if (isInConference(call)) {
@@ -565,9 +566,9 @@ int callCount(LinphoneCore* lc) {
             
             const char* n = linphone_address_get_display_name(addr);
             if (n) 
-                [ms appendFormat:@"%s ", n, nil];
+                [ms appendFormat:(isFirst?@"%s":@", %s"), n, nil];
             else
-                [ms appendFormat:@"%s ", linphone_address_get_username(addr), nil];
+                [ms appendFormat:(isFirst?@"%s":@", %s"), linphone_address_get_username(addr), nil];
             
             //if (call == selectedCall)
             //    [self updateActive:YES cell:cell];
@@ -578,6 +579,7 @@ int callCount(LinphoneCore* lc) {
                  cell.accessoryType = UITableViewCellAccessoryCheckmark;
                 
             }
+            isFirst = false;
         }
         calls = calls->next;
     }
diff --git a/linphone-Info.plist b/linphone-Info.plist
index dccfa7f39..549e8cff8 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.9</string>
+	<string>3.4.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7.3</string>
+	<string>1.1</string>
 	<key>NSMainNibFile</key>
 	<string>PhoneMainView</string>
 	<key>UIApplicationExitsOnSuspend</key>
diff --git a/submodules/linphone b/submodules/linphone
index 0d04b9451..53b732a7d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0d04b9451bf845e8bd7f047504f689292e099554
+Subproject commit 53b732a7d32fe1f3005f39e446fb860de0afa97c