diff --git a/Classes/CallHistoryTableViewController.m b/Classes/CallHistoryTableViewController.m index 674bdda6f..70fe667bc 100644 --- a/Classes/CallHistoryTableViewController.m +++ b/Classes/CallHistoryTableViewController.m @@ -143,6 +143,7 @@ [cell.detailTextLabel setText:[NSString stringWithFormat:@"%s"/* [%s]"*/,username/*,callLogs->start_date*/]]; } else { [cell.textLabel setText:[[NSString alloc] initWithCString:username encoding:[NSString defaultCStringEncoding]]]; + [cell.detailTextLabel setText:nil]; } @@ -170,8 +171,20 @@ } const char* username = linphone_address_get_username(partyToCall)!=0?linphone_address_get_username(partyToCall):""; const char* displayName = linphone_address_get_display_name(partyToCall)!=0?linphone_address_get_display_name(partyToCall):""; + const char* domain = linphone_address_get_domain(partyToCall); + + LinphoneProxyConfig* proxyCfg; + linphone_core_get_default_proxy(myLinphoneCore,&proxyCfg); + + NSString* phoneNumber; + + if (proxyCfg && (strcmp(domain, linphone_proxy_config_get_domain(proxyCfg)) == 0)) { + phoneNumber = [[NSString alloc] initWithCString:username encoding:[NSString defaultCStringEncoding]]; + } else { + phoneNumber = [[NSString alloc] initWithCString:linphone_address_as_string_uri_only(partyToCall) encoding:[NSString defaultCStringEncoding]]; + } [self.phoneControllerDelegate - setPhoneNumber:[[NSString alloc] initWithCString:username encoding:[NSString defaultCStringEncoding]] + setPhoneNumber: phoneNumber withDisplayName:[[NSString alloc] initWithCString:displayName encoding:[NSString defaultCStringEncoding]]]; [self.linphoneDelegate selectDialerTab]; diff --git a/Classes/MoreViewController.xib b/Classes/MoreViewController.xib index 134dcf6d8..37ed2da9e 100644 --- a/Classes/MoreViewController.xib +++ b/Classes/MoreViewController.xib @@ -10,8 +10,8 @@ YES + - YES @@ -163,7 +163,7 @@ 292 - {{23, 7}, {263, 154}} + {{23, 11}, {263, 154}} NO NO @@ -171,7 +171,7 @@ NO NSImage - linphone.png + linphone-3-250x130.png diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index baa41c515..edf88b0ec 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -73,14 +73,15 @@ if (sender == call) { if (!linphone_core_in_call(mCore)) { + LinphoneProxyConfig* proxyCfg; + //get default proxy + linphone_core_get_default_proxy(mCore,&proxyCfg); + if ([address.text length] == 0) return; //just return - if ([address.text hasPrefix:@"sip:"]) { + if ([address.text hasPrefix:@"sip:"] | proxyCfg==nil) { linphone_core_invite(mCore, [address.text cStringUsingEncoding:[NSString defaultCStringEncoding]]); } else { char normalizedUserName[256]; - LinphoneProxyConfig* proxyCfg; - //get default proxy - linphone_core_get_default_proxy(mCore,&proxyCfg); NSString* toUserName = [NSString stringWithString:[address text]]; linphone_proxy_config_normalize_number(proxyCfg,[toUserName cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName)); LinphoneAddress* tmpAddress = linphone_address_new(linphone_core_get_identity(mCore)); @@ -113,10 +114,6 @@ -(IBAction) doKeyPad:(id)sender { if (!linphone_core_in_call(mCore)) { //outcall behavior - //remove sip: if first digits - if ([address.text isEqualToString:@"sip:"]) { - [address setText:@""]; - } NSString* newAddress = nil; if (sender == one) { @@ -150,7 +147,7 @@ newAddress = [address.text substringToIndex: [address.text length]-1]; } } else { - NSLog(@"unknown event from diad pad"); + ms_message(@"unknown event from diad pad"); return; } if (newAddress != nil) { @@ -196,7 +193,7 @@ selector:@selector(doKeyZeroLongPress) object:nil]; } else { - NSLog(@"unknown up event from dial pad"); + ms_message(@"unknown up event from dial pad"); } } @@ -374,7 +371,7 @@ } [peerLabel setText:@""]; [callDuration setText:@""]; - + break; } default: diff --git a/Classes/linphoneAppDelegate.m b/Classes/linphoneAppDelegate.m index 112372d50..c370255ff 100644 --- a/Classes/linphoneAppDelegate.m +++ b/Classes/linphoneAppDelegate.m @@ -166,7 +166,7 @@ LinphoneCoreVTable linphonec_vtable = { } - (void)applicationDidBecomeActive:(UIApplication *)application { if (isStarted) { - NSLog(@"becomming active, make sure we are registered"); + ms_message(@"becomming active, make sure we are registered"); [self doRegister]; } else { isStarted=true; @@ -238,6 +238,11 @@ LinphoneCoreVTable linphonec_vtable = { NSString* username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username_preference"]; NSString* domain = [[NSUserDefaults standardUserDefaults] stringForKey:@"domain_preference"]; NSString* accountPassword = [[NSUserDefaults standardUserDefaults] stringForKey:@"password_preference"]; + + //clear auth info list + linphone_core_clear_all_auth_info(myLinphoneCore); + //clear existing proxy config + linphone_core_clear_proxy_config(myLinphoneCore); if (username && [username length] >0 && domain && [domain length]>0) { @@ -257,10 +262,6 @@ LinphoneCoreVTable linphonec_vtable = { NSString* prefix = [[NSUserDefaults standardUserDefaults] stringForKey:@"prefix_preference"]; //possible valid config detected LinphoneProxyConfig* proxyCfg; - //clear auth info list - linphone_core_clear_all_auth_info(myLinphoneCore); - //clear existing proxy config - linphone_core_clear_proxy_config(myLinphoneCore); proxyCfg = linphone_proxy_config_new(); // add username password diff --git a/linphone-Info.plist b/linphone-Info.plist index 5716fe566..0f27e929c 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -11,7 +11,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile - linphone2.png + linphone2-57x57.png CFBundleIdentifier org.linphone.phone CFBundleInfoDictionaryVersion diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 7573cb5a3..bf934ccbb 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -27,13 +27,12 @@ 2242D91A10D66C2100E9963F /* mic_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91810D66C2100E9963F /* mic_active.png */; }; 2242D91B10D66C2100E9963F /* mic_muted.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91910D66C2100E9963F /* mic_muted.png */; }; 2242D9C910D691F900E9963F /* GenericTabViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2242D9C810D691F900E9963F /* GenericTabViewController.m */; }; - 2245667810768B7300F10948 /* linphone2.png in Resources */ = {isa = PBXBuildFile; fileRef = 2245667710768B7300F10948 /* linphone2.png */; }; - 2245667A10768B9000F10948 /* linphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 2245667910768B9000F10948 /* linphone.png */; }; 2245671D107699F700F10948 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2245671C107699F700F10948 /* Settings.bundle */; }; 224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; }; + 225862E21140F5D700C5A737 /* linphone-3-250x130.png in Resources */ = {isa = PBXBuildFile; fileRef = 225862E11140F5D700C5A737 /* linphone-3-250x130.png */; }; + 225862F21140FC4F00C5A737 /* linphone2-57x57.png in Resources */ = {isa = PBXBuildFile; fileRef = 225862F11140FC4F00C5A737 /* linphone2-57x57.png */; }; 2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2264B6D111200342002C2C53 /* SystemConfiguration.framework */; }; 2273785E10A3703300526073 /* libmsiounit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2273785D10A3703300526073 /* libmsiounit.a */; }; - 2273798810A48EF000526073 /* oldphone.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2273798710A48EF000526073 /* oldphone.wav */; }; 2274401A106F31BD006EC466 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; }; 2274402F106F335E006EC466 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; }; 2274550810700509006EC466 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; @@ -170,40 +169,40 @@ 220FACE9107654FC0068D98F /* speex_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_resampler.h; sourceTree = ""; }; 220FACEA107654FC0068D98F /* speex_stereo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_stereo.h; sourceTree = ""; }; 220FACEB107654FC0068D98F /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = ""; }; - 220FACF7107657EC0068D98F /* libeXosip2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libeXosip2.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; - 220FACF8107657EC0068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libgsm.a"; sourceTree = SOURCE_ROOT; }; - 220FACF9107657EC0068D98F /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/liblinphone.a"; sourceTree = SOURCE_ROOT; }; - 220FACFA107657EC0068D98F /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libmediastreamer.a"; sourceTree = SOURCE_ROOT; }; - 220FACFB107657EC0068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libortp.a"; sourceTree = SOURCE_ROOT; }; - 220FACFC107657EC0068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libosip2.a"; sourceTree = SOURCE_ROOT; }; - 220FACFD107657EC0068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libosipparser2.a"; sourceTree = SOURCE_ROOT; }; - 220FACFE107657EC0068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libspeex.a"; sourceTree = SOURCE_ROOT; }; - 220FACFF107657EC0068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libspeexdsp.a"; sourceTree = SOURCE_ROOT; }; - 220FAD17107659840068D98F /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/liblinphone.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2810765B400068D98F /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libeXosip2.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2910765B400068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libgsm.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2A10765B400068D98F /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/liblinphone.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2B10765B400068D98F /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libmediastreamer.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2C10765B400068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libortp.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2D10765B400068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libosip2.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2E10765B400068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libosipparser2.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libspeex.a"; sourceTree = SOURCE_ROOT; }; - 220FAD3010765B400068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/libspeexdsp.a"; sourceTree = SOURCE_ROOT; }; + 220FACF7107657EC0068D98F /* libeXosip2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libeXosip2.a; path = "../liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; + 220FACF8107657EC0068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = SOURCE_ROOT; }; + 220FACF9107657EC0068D98F /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = SOURCE_ROOT; }; + 220FACFA107657EC0068D98F /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = SOURCE_ROOT; }; + 220FACFB107657EC0068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = SOURCE_ROOT; }; + 220FACFC107657EC0068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = SOURCE_ROOT; }; + 220FACFD107657EC0068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = SOURCE_ROOT; }; + 220FACFE107657EC0068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = SOURCE_ROOT; }; + 220FACFF107657EC0068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = SOURCE_ROOT; }; + 220FAD17107659840068D98F /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2810765B400068D98F /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "../liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2910765B400068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2A10765B400068D98F /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2B10765B400068D98F /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2C10765B400068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2D10765B400068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2E10765B400068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = SOURCE_ROOT; }; + 220FAD3010765B400068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = SOURCE_ROOT; }; 220FAE4A10767A6A0068D98F /* PhoneMainView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PhoneMainView.xib; sourceTree = ""; }; - 2237D4081084D7A9001383EE /* oldphone-mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "oldphone-mono.wav"; path = "rings/oldphone-mono.wav"; sourceTree = ""; }; + 2237D4081084D7A9001383EE /* oldphone-mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "oldphone-mono.wav"; path = "../liblinphone-sdk/apple-darwin/share/sounds/linphone/rings/oldphone-mono.wav"; sourceTree = ""; }; 2242D91410D66BF300E9963F /* in_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = in_call.png; path = Resources/in_call.png; sourceTree = ""; }; 2242D91510D66BF300E9963F /* out_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = out_call.png; path = Resources/out_call.png; sourceTree = ""; }; - 2242D91810D66C2100E9963F /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = ../linphone/pixmaps/mic_active.png; sourceTree = SOURCE_ROOT; }; - 2242D91910D66C2100E9963F /* mic_muted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_muted.png; path = ../linphone/pixmaps/mic_muted.png; sourceTree = SOURCE_ROOT; }; + 2242D91810D66C2100E9963F /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_active.png"; sourceTree = SOURCE_ROOT; }; + 2242D91910D66C2100E9963F /* mic_muted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_muted.png; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_muted.png"; sourceTree = SOURCE_ROOT; }; 2242D9C710D691F900E9963F /* GenericTabViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericTabViewController.h; sourceTree = ""; }; 2242D9C810D691F900E9963F /* GenericTabViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenericTabViewController.m; sourceTree = ""; }; - 2245667710768B7300F10948 /* linphone2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone2.png; path = ../linphone/pixmaps/linphone2.png; sourceTree = SOURCE_ROOT; }; - 2245667910768B9000F10948 /* linphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone.png; path = ../linphone/pixmaps/linphone.png; sourceTree = SOURCE_ROOT; }; 2245671C107699F700F10948 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; 224567C1107B968500F10948 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 225862E11140F5D700C5A737 /* linphone-3-250x130.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-3-250x130.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-3-250x130.png"; sourceTree = SOURCE_ROOT; }; + 225862F11140FC4F00C5A737 /* linphone2-57x57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone2-57x57.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone2-57x57.png"; sourceTree = SOURCE_ROOT; }; + 2258633C11410BAC00C5A737 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; 2264B6D111200342002C2C53 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; - 2273785D10A3703300526073 /* libmsiounit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsiounit.a; path = "../liblinphone-sdk/armv6-apple-darwin/lib/mediastreamer/plugins/libmsiounit.a"; sourceTree = SOURCE_ROOT; }; - 2273798710A48EF000526073 /* oldphone.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = oldphone.wav; path = rings/oldphone.wav; sourceTree = ""; }; + 2273785D10A3703300526073 /* libmsiounit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsiounit.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsiounit.a"; sourceTree = SOURCE_ROOT; }; 22744019106F31BD006EC466 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 2274402E106F335E006EC466 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 22744043106F33FC006EC466 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; @@ -227,9 +226,9 @@ 22F2508B107141E100AC9B3F /* PhoneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhoneViewController.h; sourceTree = ""; }; 22F2508C107141E100AC9B3F /* PhoneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhoneViewController.m; sourceTree = ""; }; 22F2508D107141E100AC9B3F /* PhoneViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PhoneViewController.xib; sourceTree = ""; }; - 22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = ../linphone/share/ringback.wav; sourceTree = SOURCE_ROOT; }; - 22F255131073EEE600AC9B3F /* green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = green.png; path = ../linphone/pixmaps/green.png; sourceTree = SOURCE_ROOT; }; - 22F255141073EEE600AC9B3F /* red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = red.png; path = ../linphone/pixmaps/red.png; sourceTree = SOURCE_ROOT; }; + 22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = "../liblinphone-sdk/apple-darwin/share/sounds/linphone/ringback.wav"; sourceTree = SOURCE_ROOT; }; + 22F255131073EEE600AC9B3F /* green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = green.png; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/green.png"; sourceTree = SOURCE_ROOT; }; + 22F255141073EEE600AC9B3F /* red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = red.png; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/red.png"; sourceTree = SOURCE_ROOT; }; 22F51EF5107FA66500F98953 /* untitled.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = untitled.plist; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -313,7 +312,7 @@ 220FACDF107654FC0068D98F /* speex */, ); name = include; - path = "../liblinphone-sdk/armv6-apple-darwin/include"; + path = "../liblinphone-sdk/apple-darwin/include"; sourceTree = SOURCE_ROOT; }; 220FAC78107654FC0068D98F /* eXosip2 */ = { @@ -487,16 +486,6 @@ path = speex; sourceTree = ""; }; - 22F2546F1073D95B00AC9B3F /* share */ = { - isa = PBXGroup; - children = ( - 2273798710A48EF000526073 /* oldphone.wav */, - 2237D4081084D7A9001383EE /* oldphone-mono.wav */, - ); - name = share; - path = ../linphone/share; - sourceTree = SOURCE_ROOT; - }; 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( @@ -536,6 +525,7 @@ 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */, 22B5F03410CE6B2F00777D97 /* AddressBook.framework */, 2264B6D111200342002C2C53 /* SystemConfiguration.framework */, + 2258633C11410BAC00C5A737 /* README */, ); name = CustomTemplate; sourceTree = ""; @@ -552,18 +542,18 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 2237D4081084D7A9001383EE /* oldphone-mono.wav */, + 225862F11140FC4F00C5A737 /* linphone2-57x57.png */, + 225862E11140F5D700C5A737 /* linphone-3-250x130.png */, 22E0A783111C1BA800B04932 /* Speaker-32-on.png */, 22E0A784111C1BA800B04932 /* Speaker-32-off.png */, 2242D91810D66C2100E9963F /* mic_active.png */, 2242D91910D66C2100E9963F /* mic_muted.png */, 2242D91410D66BF300E9963F /* in_call.png */, 2242D91510D66BF300E9963F /* out_call.png */, - 2245667910768B9000F10948 /* linphone.png */, - 2245667710768B7300F10948 /* linphone2.png */, 22F255131073EEE600AC9B3F /* green.png */, 22F255141073EEE600AC9B3F /* red.png */, 22F254801073D99800AC9B3F /* ringback.wav */, - 22F2546F1073D95B00AC9B3F /* share */, 8D1107310486CEB800E47090 /* linphone-Info.plist */, 2274550710700509006EC466 /* linphonerc */, 220FAE4A10767A6A0068D98F /* PhoneMainView.xib */, @@ -629,12 +619,9 @@ 22F255151073EEE600AC9B3F /* green.png in Resources */, 22F255161073EEE600AC9B3F /* red.png in Resources */, 220FAE4B10767A6A0068D98F /* PhoneMainView.xib in Resources */, - 2245667810768B7300F10948 /* linphone2.png in Resources */, - 2245667A10768B9000F10948 /* linphone.png in Resources */, 2245671D107699F700F10948 /* Settings.bundle in Resources */, 22F51EF6107FA66500F98953 /* untitled.plist in Resources */, 2237D4091084D7A9001383EE /* oldphone-mono.wav in Resources */, - 2273798810A48EF000526073 /* oldphone.wav in Resources */, 227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */, 2242D91610D66BF300E9963F /* in_call.png in Resources */, 2242D91710D66BF300E9963F /* out_call.png in Resources */, @@ -644,6 +631,8 @@ 22E0A786111C1BA800B04932 /* Speaker-32-off.png in Resources */, 22E0A821111C44E100B04932 /* MoreViewController.xib in Resources */, 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */, + 225862E21140F5D700C5A737 /* linphone-3-250x130.png in Resources */, + 225862F21140FC4F00C5A737 /* linphone2-57x57.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -677,16 +666,9 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - HEADER_SEARCH_PATHS = ""; - "HEADER_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/armv6-apple-darwin/include\""; - "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "\"$(SRCROOT)/../liblinphone-sdk/i386-apple-darwin/include\""; + HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include/**"; INFOPLIST_FILE = "linphone-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/armv6-apple-darwin/lib\"/**"; - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/i386-apple-darwin/lib\"/**"; + LIBRARY_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/lib/**"; PRODUCT_NAME = linphone; SDKROOT = iphoneos3.0; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; @@ -700,15 +682,9 @@ COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - "HEADER_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/armv6-apple-darwin/include\""; - "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "\"$(SRCROOT)/../liblinphone-sdk/i386-apple-darwin/include\""; + HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include/**"; INFOPLIST_FILE = "linphone-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/armv6-apple-darwin/lib\"/**"; - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/i386-apple-darwin/lib\"/**"; + LIBRARY_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/lib/**"; PRODUCT_NAME = linphone; }; name = Release; @@ -717,7 +693,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: jehan monnier"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -725,6 +701,7 @@ LIBRARY_SEARCH_PATHS = ""; LINK_WITH_STANDARD_LIBRARIES = YES; PREBINDING = NO; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "09801E17-63DB-47FD-A203-166EDD1E55A1"; SDKROOT = iphoneos3.1; }; name = Distribution; @@ -740,16 +717,9 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - HEADER_SEARCH_PATHS = ""; - "HEADER_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/armv6-apple-darwin/include\""; - "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "\"$(SRCROOT)/../liblinphone-sdk/i386-apple-darwin/include\""; + HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include/**"; INFOPLIST_FILE = "linphone-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/armv6-apple-darwin/lib\"/**"; - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=*]" = "\"$(SRCROOT)/../liblinphone-sdk/i386-apple-darwin/lib\"/**"; + LIBRARY_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/lib/**"; PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos3.0;