mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-27 16:09:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	submodules/linphone
This commit is contained in:
Yann Diorcet 2012-08-20 15:01:53 +02:00
commit 832d1d5bd9
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/LinphoneManager.h
View file

@ -81,6 +81,10 @@ typedef struct _LinphoneManagerSounds {
NSMutableArray *inhibitedEvent;
/* MODIFICATION: Add NSUSerdefault settings */
NSDictionary *currentSettings;
/**/
@public
CallContext currentCallContextBeforeGoingBackground;
}

2
Classes/LinphoneManager.m
View file

@ -1166,11 +1166,13 @@ static LinphoneCoreVTable linphonec_vtable = {
if ([device respondsToSelector:@selector(isMultitaskingSupported)])
backgroundSupported = [device isMultitaskingSupported];
BOOL isbackgroundModeEnabled;
if (backgroundSupported) {
isbackgroundModeEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"backgroundmode_preference"];
} else {
isbackgroundModeEnabled=false;
}
lp_config_set_int(linphone_core_get_config(theLinphoneCore),"app","backgroundmode_preference", isbackgroundModeEnabled);
[currentSettings release];
currentSettings = newSettings;

2
submodules/linphone

@ -1 +1 @@
Subproject commit c97efee37aea1ccae3c476a108e988e47f38faa4
Subproject commit 0a12fa9ce7af5c795722ce1f7ebad9bc85314d3b