Commit da84bc3c authored by jehan's avatar jehan

implemet iphone OS 3.x bacward compatibility

parent a12e2ae8
......@@ -139,29 +139,41 @@
if (sender == one) {
newAddress = [address.text stringByAppendingString:@"1"];
linphone_core_play_dtmf(mCore, '1', -1);
} else if (sender == two) {
newAddress = [address.text stringByAppendingString:@"2"];
linphone_core_play_dtmf(mCore, '2', -1);
} else if (sender == three) {
newAddress = [address.text stringByAppendingString:@"3"];
linphone_core_play_dtmf(mCore, '3', -1);
} else if (sender == four) {
newAddress = [address.text stringByAppendingString:@"4"];
linphone_core_play_dtmf(mCore, '4', -1);
} else if (sender == five) {
newAddress = [address.text stringByAppendingString:@"5"];
linphone_core_play_dtmf(mCore, '5', -1);
} else if (sender == six) {
newAddress = [address.text stringByAppendingString:@"6"];
linphone_core_play_dtmf(mCore, '6', -1);
} else if (sender == seven) {
newAddress = [address.text stringByAppendingString:@"7"];
linphone_core_play_dtmf(mCore, '7', -1);
} else if (sender == eight) {
newAddress = [address.text stringByAppendingString:@"8"];
linphone_core_play_dtmf(mCore, '8', -1);
} else if (sender == nine) {
newAddress = [address.text stringByAppendingString:@"9"];
linphone_core_play_dtmf(mCore, '9', -1);
} else if (sender == star) {
newAddress = [address.text stringByAppendingString:@"*"];
linphone_core_play_dtmf(mCore, '*', -1);
} else if (sender == zero) {
newAddress = [address.text stringByAppendingString:@"0"];
linphone_core_play_dtmf(mCore, '0', -1);
//start timer for +
[self performSelector:@selector(doKeyZeroLongPress) withObject:nil afterDelay:0.5];
} else if (sender == hash) {
linphone_core_play_dtmf(mCore, '#', -1);
newAddress = [address.text stringByAppendingString:@"#"];
} else if (sender == back) {
if ([address.text length] >0) {
......@@ -213,9 +225,8 @@
[NSObject cancelPreviousPerformRequestsWithTarget:self
selector:@selector(doKeyZeroLongPress)
object:nil];
} else {
ms_message("unknown up event from dial pad");
}
}
linphone_core_stop_dtmf(mCore);
}
-(void)doKeyZeroLongPress {
......
This diff is collapsed.
......@@ -118,7 +118,7 @@ LinphoneCoreVTable linphonec_vtable = {
- (void)applicationDidEnterBackground:(UIApplication *)application {
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000
//#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000
struct addrinfo hints;
struct addrinfo *res=NULL;
......@@ -205,7 +205,7 @@ LinphoneCoreVTable linphonec_vtable = {
}
}
#endif
//#endif
}
......@@ -591,8 +591,8 @@ extern void libmsilbc_init();
, sizeof (audioRouteOverride)
, &audioRouteOverride);
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000
if ([UIApplication sharedApplication].applicationState == UIApplicationStateBackground) {
//#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000
if (backgroundSupported && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground) {
// Create a new notification
UILocalNotification* notif = [[[UILocalNotification alloc] init] autorelease];
if (notif)
......@@ -606,7 +606,7 @@ extern void libmsilbc_init();
}
} else
#endif
//#endif
{
UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:[NSString stringWithFormat:@" %@ is calling you",from]
delegate:self cancelButtonTitle:@"Decline" destructiveButtonTitle:@"Answer" otherButtonTitles:nil];
......
......@@ -10,7 +10,7 @@
1D3623260D0F684500981E51 /* linphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* linphoneAppDelegate.m */; };
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
22058C71116E305000B08DDD /* icone-linphone-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* icone-linphone-57.png */; };
220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; };
220FAD3210765B400068D98F /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; };
......@@ -797,7 +797,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 3.1;
LIBRARY_SEARCH_PATHS = "";
LINK_WITH_STANDARD_LIBRARIES = YES;
PREBINDING = NO;
......@@ -857,7 +857,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 3.1;
LIBRARY_SEARCH_PATHS = "";
LINK_WITH_STANDARD_LIBRARIES = YES;
PREBINDING = NO;
......@@ -873,7 +873,7 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 3.1;
PREBINDING = NO;
SDKROOT = iphoneos4.0;
};
......
linphone @ 69a85452
Subproject commit 6757edcdeedfd57545e66a3e373d51f5e21c2823
Subproject commit 69a854529f565dcb321867b3f5e63cd1321b1661
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment