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:
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/PhoneMainView.h
This commit is contained in:
Yann Diorcet 2012-08-20 11:14:17 +02:00
commit d4a7f9885f
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Classes/LinphoneManager.m
View file

@ -218,7 +218,7 @@ struct codec_name_pref_table codec_pref_table[]={
#pragma mark - Database Functions
- (void)openDatabase {
/*NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsPath = [paths objectAtIndex:0];
NSString *databaseDocumentPath = [documentsPath stringByAppendingPathComponent:@"database.txt"];
@ -229,6 +229,10 @@ struct codec_name_pref_table codec_pref_table[]={
if ([fileManager fileExistsAtPath:databaseDocumentPath] == NO) {
[LinphoneLogger logc:LinphoneLoggerLog format:"Create sqlite3 database"];
NSString *resourceDocumentPath = [[NSBundle mainBundle] pathForResource:@"database" ofType:@"sqlite"];
if ([fileManager fileExistsAtPath:resourceDocumentPath] == NO) {
[LinphoneLogger log:LinphoneLoggerError format:@"Can't find original database: %@", [error localizedDescription]];
return;
}
[fileManager copyItemAtPath:resourceDocumentPath toPath:databaseDocumentPath error:&error];
if(error != nil) {
[LinphoneLogger log:LinphoneLoggerError format:@"Can't copy database: %@", [error localizedDescription]];
@ -238,15 +242,15 @@ struct codec_name_pref_table codec_pref_table[]={
if(sqlite3_open([databaseDocumentPath UTF8String], &database) != SQLITE_OK) {
[LinphoneLogger log:LinphoneLoggerError format:@"Can't open \"%@\" sqlite3 database.", databaseDocumentPath];
}*/
}
}
- (void)closeDatabase {
/*if(database != NULL) {
if(database != NULL) {
if(sqlite3_close(database) != SQLITE_OK) {
[LinphoneLogger logc:LinphoneLoggerError format:"Can't close sqlite3 database."];
}
}*/
}
}

2
linphone.xcodeproj/project.pbxproj
View file

@ -1185,7 +1185,6 @@
D326483415887D4400930C67 /* Utils */ = {
isa = PBXGroup;
children = (
D37CD35515E22B0C0028869A /* ZBarSDK */,
D380801215C299D0005BE9BC /* ColorSpaceUtilites.m */,
D380801115C29984005BE9BC /* ColorSpaceUtilities.h */,
D32B9DFA15A2F131000B6DEC /* FastAddressBook.h */,
@ -1196,6 +1195,7 @@
D3F9A9EB15AF27620045320F /* UACellBackgroundView */,
C9B3A6FD15B485DB006F52EE /* Utils.h */,
D35860D515B549B500513429 /* Utils.m */,
D37CD35515E22B0C0028869A /* ZBarSDK */,
);
name = Utils;
sourceTree = "<group>";