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

This commit is contained in:
Yann Diorcet 2012-11-23 11:36:54 +01:00
commit 23bcb80a3a
3 changed files with 4 additions and 4 deletions

View file

@ -541,7 +541,7 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY";
- (BOOL)removeHistory:(History*)ahistory delegate:(id<BuschJaegerConfigurationDelegate>)delegate {
NSString *url = [NSString stringWithFormat:@"%@/adduser.cgi?type=delhistory&id=%d", [self getGateway], ahistory.ID];
NSString *url = [NSString stringWithFormat:@"%@/cgi-bin/adduser.cgi?type=delhistory&id=%d", [self getGateway], ahistory.ID];
NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
if(request != nil) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, (unsigned long)NULL), ^(void) {

View file

@ -59,7 +59,7 @@
history.date = [dateFormat dateFromString:stringDate];
[dateFormat release];
history.stationID = [[line substringWithRange:[result rangeAtIndex:3]] intValue];
history.stationID = [[line substringWithRange:[result rangeAtIndex:3]] intValue] -1;
history.incoming = [[line substringWithRange:[result rangeAtIndex:4]] compare:@"i" options:NSCaseInsensitiveSearch] == 0;

View file

@ -45,11 +45,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.2.1</string>
<string>0.2.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.2.1</string>
<string>0.2.2</string>
<key>NSMainNibFile</key>
<string>BuschJaegerApp</string>
<key>NSMainNibFile~ipad</key>