witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone

Browse source 
Conflicts:
	Classes/LinphoneUI/UICallBar.m
This commit is contained in:
Yann Diorcet 2012-07-26 12:51:38 +02:00
commit b160ec47cb
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/LinphoneUI/UICallBar.m
View file

@ -217,9 +217,6 @@
// Set label multilines: IB lack !
[option3Button.titleLabel setLineBreakMode:UILineBreakModeWordWrap];
[option3Button.titleLabel setTextAlignment:UITextAlignmentCenter];
[optionsView setHidden:TRUE];
[padView setHidden:TRUE];
}
- (void)viewWillAppear:(BOOL)animated {
@ -238,8 +235,9 @@
LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0;
[self callUpdate:call state:state];
[self castelCommandsUpdate:[[LinphoneManager instance] castelCommands]];
[optionsView setHidden:TRUE];
[padView setHidden:TRUE];
}
- (void)viewWillDisappear:(BOOL)animated {