mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 02:58:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into tunnel

Browse source
This commit is contained in:
Jehan Monnier 2011-05-30 09:54:59 +02:00
commit 377589d1d3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/PhoneViewController.m
View file

@ -216,7 +216,7 @@
withDisplayName:displayName];
[call setEnabled:false];
[callDuration setText:NSLocalizedString(@"Calling...",nil)];
[speaker reset];
if ([speaker isOn]) [speaker toggle] ; //preset to off
}
-(void) displayIncallFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
@ -226,7 +226,7 @@
if (linphone_call_get_dir(linphone_core_get_current_call([LinphoneManager getLc])) == LinphoneCallIncoming) {
[self displayIncalViewforUser:username
withDisplayName:displayName];
[speaker reset];
if ([speaker isOn]) [speaker toggle] ; //preset to off;
}
}
//status reporting