Merge branch 'develop' of github.com:codenauts/HockeySDK-iOS into develop

This commit is contained in:
Andreas Linde 2012-07-03 17:57:54 +02:00
commit c5ee98c3ba
3 changed files with 9 additions and 1 deletions

View File

@ -131,6 +131,10 @@
[invocation setArgument:&project atIndex:3]; [invocation setArgument:&project atIndex:3];
[invocation setArgument:&key atIndex:4]; [invocation setArgument:&key atIndex:4];
[invocation invoke]; [invocation invoke];
if ([jmcInstance respondsToSelector:@selector(ping)]) {
[jmcInstance performSelector:@selector(ping)];
}
} }
#pragma clang diagnostic pop #pragma clang diagnostic pop

View File

@ -82,7 +82,7 @@ body { font: 13px 'Helvetica Neue', Helvetica; word-wrap:break-word; padding:8px
else else
webView_.frame = webViewRect; webView_.frame = webViewRect;
NSString *deviceWidth = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? [NSString stringWithFormat:@"%d", CGRectGetWidth(self.bounds)] : @"device-width"; NSString *deviceWidth = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? [NSString stringWithFormat:@"%.0f", CGRectGetWidth(self.bounds)] : @"device-width";
//BWHockeyLog(@"%@\n%@\%@", PSWebTableViewCellHtmlTemplate, deviceWidth, self.webViewContent); //BWHockeyLog(@"%@\n%@\%@", PSWebTableViewCellHtmlTemplate, deviceWidth, self.webViewContent);
NSString *contentHtml = [NSString stringWithFormat:PSWebTableViewCellHtmlTemplate, deviceWidth, self.webViewContent]; NSString *contentHtml = [NSString stringWithFormat:PSWebTableViewCellHtmlTemplate, deviceWidth, self.webViewContent];
[webView_ loadHTMLString:contentHtml baseURL:nil]; [webView_ loadHTMLString:contentHtml baseURL:nil];

View File

@ -297,6 +297,7 @@
"$(inherited)", "$(inherited)",
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = ""; GCC_VERSION = "";
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -321,6 +322,7 @@
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PREPROCESSOR_DEFINITIONS = HOCKEYLIB_STATIC_LIBRARY; GCC_PREPROCESSOR_DEFINITIONS = HOCKEYLIB_STATIC_LIBRARY;
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = ""; GCC_VERSION = "";
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -343,6 +345,7 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/../Vendor\"", "\"$(SRCROOT)/../Vendor\"",
); );
GCC_THUMB_SUPPORT = NO;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@ -357,6 +360,7 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/../Vendor\"", "\"$(SRCROOT)/../Vendor\"",
); );
GCC_THUMB_SUPPORT = NO;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;