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

update linphone submodule, add stun setting, change icon

Browse source
This commit is contained in:
Simon Morlat 2012-03-20 17:31:08 +01:00
parent 650828fc15
commit c36e794c2e
6 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Settings.bundle/Root.plist
View file

@ -98,6 +98,20 @@
<key>KeyboardType</key>
<string>NumbersAndPunctuation</string>
</dict>
<dict>
<key>Key</key>
<string>stun_preference</string>
<key>Title</key>
<string>Stun server</string>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>AutocapitalizationType</key>
<string>None</string>
<key>AutocorrectionType</key>
<string>No</string>
<key>DefaultValue</key>
<string></string>
</dict>
</array>
<key>StringsTable</key>
<string>Root</string>

3
linphone-Info.plist
View file

@ -12,8 +12,7 @@
<string></string>
<key>CFBundleIconFiles</key>
<array>
<string>icone-linphone-57.png</string>
<string>icone-linphone-72.png</string>
<string>App_Apple_Icon_DES_57.png</string>
</array>
<key>CFBundleIdentifier</key>
<string>de.busch-jaeger.phone</string>

4
linphone.xcodeproj/project.pbxproj
View file

@ -275,6 +275,7 @@
34CA8539148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CA8538148F692A00503C01 /* MainScreenWithVideoPreview.m */; };
34CA853A148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CA8538148F692A00503C01 /* MainScreenWithVideoPreview.m */; };
34E28E7A14D98F6D00D84BDD /* 01.wav in Resources */ = {isa = PBXBuildFile; fileRef = 34E28E7914D98F6D00D84BDD /* 01.wav */; };
5749FCB21518D6C100F0712D /* App_Apple_Icon_DES_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 5749FCB11518D6C100F0712D /* App_Apple_Icon_DES_57.png */; };
70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; };
7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; };
70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; };
@ -670,6 +671,7 @@
34CA8537148F692A00503C01 /* MainScreenWithVideoPreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainScreenWithVideoPreview.h; sourceTree = "<group>"; };
34CA8538148F692A00503C01 /* MainScreenWithVideoPreview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainScreenWithVideoPreview.m; sourceTree = "<group>"; };
34E28E7914D98F6D00D84BDD /* 01.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = 01.wav; path = Resources/01.wav; sourceTree = "<group>"; };
5749FCB11518D6C100F0712D /* App_Apple_Icon_DES_57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = App_Apple_Icon_DES_57.png; path = Resources/App_Apple_Icon_DES_57.png; sourceTree = "<group>"; };
70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = "<group>"; };
7066FC0B13E830E400EFC6DC /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "liblinphone-sdk/apple-darwin/lib/libvpx.a"; sourceTree = "<group>"; };
70E542F213E147E3002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
@ -1222,6 +1224,7 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
5749FCB11518D6C100F0712D /* App_Apple_Icon_DES_57.png */,
34E28E7914D98F6D00D84BDD /* 01.wav */,
34ACD07414D2DBB300EE0B0A /* BuschJaeger */,
34A6ECEA14CF13CB00460C04 /* icone-linphone-72.png */,
@ -1461,6 +1464,7 @@
348848E714D98859005B0B54 /* bj_mute_on.png in Resources */,
348848E814D98859005B0B54 /* bj_start_call.png in Resources */,
34E28E7A14D98F6D00D84BDD /* 01.wav in Resources */,
5749FCB21518D6C100F0712D /* App_Apple_Icon_DES_57.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
linphonerc
View file

@ -20,7 +20,7 @@ default_proxy=-1
register_only_when_network_is_up=1
auto_net_state_mon=0
keepalive_period=30000
media_encryption=zrtp
media_encryption=none
incoming_calls_early_media=1
[rtp]

2
submodules/linphone

@ -1 +1 @@
Subproject commit 4006baf2895166f78b8fe4c2721fa77656607988
Subproject commit 6068c49f486f546bcb08102223fd79e49f2e0172

2
submodules/mssilk

@ -1 +1 @@
Subproject commit a0ad1cca900afc17204856fd7c2de7e8d511eaad
Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40