From 0416e6d41b7b1fa4c6bbcb943525b8f8d453cdd3 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 1 Jun 2011 15:26:03 +0200 Subject: [PATCH] fix incoming call display name add compilation flad TARGET_OS_IPHONE to sdk --- Classes/PhoneViewController.m | 4 ++-- submodules/build/iphone-config.site | 4 ++-- submodules/externals/exosip | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index 4c1663ef4..c7da2c342 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -244,14 +244,14 @@ if (notif) { notif.repeatInterval = 0; - notif.alertBody =[NSString stringWithFormat:NSLocalizedString(@" %@ is calling you",nil),displayName?displayName:username]; + notif.alertBody =[NSString stringWithFormat:NSLocalizedString(@" %@ is calling you",nil),[displayName length]>0?displayName:username]; notif.alertAction = @"Answer"; notif.soundName = @"oldphone-mono-30s.caf"; [[UIApplication sharedApplication] presentLocalNotificationNow:notif]; } } else { - mIncomingCallActionSheet = [[UIActionSheet alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@" %@ is calling you",nil),displayName?displayName:username] + mIncomingCallActionSheet = [[UIActionSheet alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@" %@ is calling you",nil),[displayName length]>0?displayName:username] delegate:self cancelButtonTitle:NSLocalizedString(@"Decline",nil) destructiveButtonTitle:NSLocalizedString(@"Answer",nil) diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index a94022d09..fb13cfd87 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -23,8 +23,8 @@ SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; echo "Selecting SDK path = ${SYSROOT_PATH}" -CC="${SDK_BIN_PATH}/gcc-${GCC_VERSION} -std=c99 -arch ${ARCH} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION}" -CXX="${SDK_BIN_PATH}/g++-${GCC_VERSION} -arch ${ARCH} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION}" +CC="${SDK_BIN_PATH}/gcc-${GCC_VERSION} -std=c99 -arch ${ARCH} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE" +CXX="${SDK_BIN_PATH}/g++-${GCC_VERSION} -arch ${ARCH} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE" LD="${SDK_BIN_PATH}/ld-${GCC_VERSION} -arch ${ARCH}" AR=${SDK_BIN_PATH}/ar RANLIB=${SDK_BIN_PATH}/ranlib diff --git a/submodules/externals/exosip b/submodules/externals/exosip index b11684733..361a5cfe2 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit b1168473330ffd2e51c4984e9604b1fed913f932 +Subproject commit 361a5cfe25a31d503b0d9e46960d6908c6672aad