Use a UIWebDocumentView to get our shared WebView.

[winterboard.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index fda60e5024cff1a3e8061004dfa98ad06a05939c..80e18697cb329213010cdbcfe423ef5e5fb7104d 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -678,6 +678,8 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) {
 // %hook -[NSBundle pathForResource:ofType:] {{{
 MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, resource, NSString *, type) {
     NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type];
+    if ([file isEqualToString:@"Info.plist"])
+        return MSOldCall(resource, type);
     if (Debug_)
         NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file);
     if (NSString *path = $pathForFile$inBundle$(file, self, false, false))
@@ -995,13 +997,11 @@ MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage,
         "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;"
     , @"CalendarIconDayStyle"};
 
-    WBStringDrawingState wtfState = {&dayState, 1, nil, nil};
+    WBStringDrawingState skipState = {&dayState,
+        unsigned(kCFCoreFoundationVersionNumber > 800 ? 16 : 7)
+    , nil, nil};
 
-    WBStringDrawingState sizeState = {
-        kCFCoreFoundationVersionNumber > 800 ? &wtfState : &dayState
-    , 7, nil, nil};
-
-    WBStringDrawingState dateState = {&sizeState, 2, @""
+    WBStringDrawingState dateState = {&skipState, 2, @""
     , @"CalendarIconDateStyle"};
 
     stringDrawingState_ = &dateState;