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

fix merge

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-28 15:36:06 +02:00
parent 6419fef416
commit 1b86c637f0
4 changed files with 10 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/KIF

@ -1 +1 @@
Subproject commit 7cf06309ad1e5b694f1ae6f2f40c0e8d386f7f06
Subproject commit 21a137bc8068f9fb738f835c6e285d44fe2ce4dd

9
Classes/SettingsView.m
View file

@ -754,15 +754,6 @@ static UICompositeViewDescription *compositeDescription = nil;
}
}
#pragma mark - UIAlertView delegate
- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
if (buttonIndex != 1)
return; /* cancel */
else
[self goToWizard];
}
#pragma mark - Mail composer for sending logs
- (void)sendEmailWithDebugAttachments {

50
linphone.xcodeproj/project.pbxproj
View file

@ -463,13 +463,6 @@
remoteGlobalIDString = EABD46AA1857A0C700A5F081;
remoteInfo = KIF;
};
630589FE1B4E816A00EFAE36 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EB72047C1680DDAD00278DA2;
remoteInfo = "KIF-OCUnit";
};
63058A001B4E816A00EFAE36 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */;
@ -484,13 +477,6 @@
remoteGlobalIDString = EABD46CD1857A0F300A5F081;
remoteInfo = "KIF Tests";
};
63058A041B4E816A00EFAE36 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EB60ECEB177F8DB3005A041A;
remoteInfo = "KIF Tests-OCUnit";
};
63058A061B4E816A00EFAE36 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */;
@ -1594,10 +1580,8 @@
isa = PBXGroup;
children = (
630589FD1B4E816A00EFAE36 /* libKIF.a */,
630589FF1B4E816A00EFAE36 /* libKIF-OCUnit.a */,
63058A011B4E816A00EFAE36 /* Test Host.app */,
63058A031B4E816A00EFAE36 /* KIF Tests - XCTest.xctest */,
63058A051B4E816A00EFAE36 /* KIF Tests-OCUnit.octest */,
63058A071B4E816A00EFAE36 /* KIF.framework */,
);
name = Products;
@ -2200,13 +2184,6 @@
remoteRef = 630589FC1B4E816A00EFAE36 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
630589FF1B4E816A00EFAE36 /* libKIF-OCUnit.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libKIF-OCUnit.a";
remoteRef = 630589FE1B4E816A00EFAE36 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
63058A011B4E816A00EFAE36 /* Test Host.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
@ -2221,13 +2198,6 @@
remoteRef = 63058A021B4E816A00EFAE36 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
63058A051B4E816A00EFAE36 /* KIF Tests-OCUnit.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "KIF Tests-OCUnit.octest";
remoteRef = 63058A041B4E816A00EFAE36 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
63058A071B4E816A00EFAE36 /* KIF.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
@ -3064,7 +3034,6 @@
"$(SRCROOT)/Classes/Utils/XMLRPC/",
);
INFOPLIST_FILE = "linphone-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(BUILT_PRODUCTS_DIR)",
"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib",
@ -3075,6 +3044,7 @@
LINK_WITH_STANDARD_LIBRARIES = YES;
ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
@ -3148,7 +3118,6 @@
"$(SRCROOT)/Classes/Utils/XMLRPC/",
);
INFOPLIST_FILE = "linphone-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(BUILT_PRODUCTS_DIR)",
"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
@ -3159,6 +3128,7 @@
LINK_WITH_STANDARD_LIBRARIES = YES;
ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
@ -3232,7 +3202,6 @@
"$(SRCROOT)/Classes/Utils/XMLRPC/",
);
INFOPLIST_FILE = "linphone-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(BUILT_PRODUCTS_DIR)",
"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
@ -3243,6 +3212,7 @@
LINK_WITH_STANDARD_LIBRARIES = YES;
ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
@ -3316,7 +3286,6 @@
"$(SRCROOT)/Classes/Utils/XMLRPC/",
);
INFOPLIST_FILE = "linphone-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(BUILT_PRODUCTS_DIR)",
"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
@ -3327,6 +3296,7 @@
LINK_WITH_STANDARD_LIBRARIES = YES;
ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
@ -3414,7 +3384,6 @@
Classes/Utils/XMLRPC/,
);
INFOPLIST_FILE = "TestsLiblinphone/LinphoneTesterTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
@ -3464,7 +3433,6 @@
Classes/Utils/XMLRPC/,
);
INFOPLIST_FILE = "TestsLiblinphone/LinphoneTesterTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
@ -3514,7 +3482,6 @@
Classes/Utils/XMLRPC/,
);
INFOPLIST_FILE = "TestsLiblinphone/LinphoneTesterTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
@ -3564,7 +3531,6 @@
Classes/Utils/XMLRPC/,
);
INFOPLIST_FILE = "TestsLiblinphone/LinphoneTesterTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
@ -3620,13 +3586,13 @@
Classes/Utils/XMLRPC/,
);
INFOPLIST_FILE = "LiblinphoneTester/LinphoneTester-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.liblinphoneTester";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2";
@ -3670,12 +3636,12 @@
Classes/Utils/XMLRPC/,
);
INFOPLIST_FILE = "LiblinphoneTester/LinphoneTester-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.liblinphoneTester";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2";
@ -3720,12 +3686,12 @@
Classes/Utils/XMLRPC/,
);
INFOPLIST_FILE = "LiblinphoneTester/LinphoneTester-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.liblinphoneTester";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2";
@ -3770,12 +3736,12 @@
Classes/Utils/XMLRPC/,
);
INFOPLIST_FILE = "LiblinphoneTester/LinphoneTester-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.liblinphoneTester";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2";

2
submodules/linphone

@ -1 +1 @@
Subproject commit f582965b14e8b777db47d52634ba518ec33cae23
Subproject commit 7cbbb6b17e4f1de3fa48f89c541092754f3455b4