From 37351a172bbb07e7afc2f77e87793ffc18b4dcf4 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 17 Jun 2009 20:26:13 +0000 Subject: [PATCH] Random namespace protection. --- Library.mm | 14 +++++++------- conffiles | 1 - control | 2 +- makefile | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 conffiles diff --git a/Library.mm b/Library.mm index 914d49a..598cbbb 100644 --- a/Library.mm +++ b/Library.mm @@ -133,13 +133,13 @@ Class $SBUIController; Class $SBWidgetApplicationIcon; @interface NSDictionary (WinterBoard) -- (UIColor *) colorForKey:(NSString *)key; -- (BOOL) boolForKey:(NSString *)key; +- (UIColor *) wb$colorForKey:(NSString *)key; +- (BOOL) wb$boolForKey:(NSString *)key; @end @implementation NSDictionary (WinterBoard) -- (UIColor *) colorForKey:(NSString *)key { +- (UIColor *) wb$colorForKey:(NSString *)key { NSString *value = [self objectForKey:key]; if (value == nil) return nil; @@ -147,7 +147,7 @@ Class $SBWidgetApplicationIcon; return nil; } -- (BOOL) boolForKey:(NSString *)key { +- (BOOL) wb$boolForKey:(NSString *)key { if (NSString *value = [self objectForKey:key]) return [value boolValue]; return false; @@ -376,7 +376,7 @@ MSHook(UIImage *, SBIconModel$getCachedImagedForIcon$, SBIconModel *self, SEL se } MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) { - if (![Info_ boolForKey:@"ComposeStoreIcons"]) + if (![Info_ wb$boolForKey:@"ComposeStoreIcons"]) if (NSString *path = $pathForIcon$([self application])) return [UIImage imageWithContentsOfFile:path]; return _SBApplicationIcon$icon(self, sel); @@ -556,7 +556,7 @@ _trace(); if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"]) style = [number intValue]; - if (UIColor *color = [Info_ colorForKey:@"NavigationBarTint"]) + if (UIColor *color = [Info_ wb$colorForKey:@"NavigationBarTint"]) tint = color; return [self wb$initWithFrame:frame withBarStyle:style withTintColor:tint]; @@ -1035,7 +1035,7 @@ MSHook(id, SBIconLabel$initWithSize$label$, SBIconLabel *self, SEL sel, CGSize s MSHook(void, SBIconLabel$setInDock$, SBIconLabel *self, SEL sel, BOOL docked) { id &_label(MSHookIvar(self, "_label")); - if (![Info_ boolForKey:@"UndockedIconLabels"]) + if (![Info_ wb$boolForKey:@"UndockedIconLabels"]) docked = true; if (_label != nil && [_label respondsToSelector:@selector(setInDock:)]) [_label setInDock:docked]; diff --git a/conffiles b/conffiles deleted file mode 100644 index 2ad2a04..0000000 --- a/conffiles +++ /dev/null @@ -1 +0,0 @@ -/Applications/WinterBoard.app/Info.plist diff --git a/control b/control index 326fcbc..e205df2 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Priority: optional Section: System Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 0.9.2922-1 +Version: 0.9.2931-1 Description: more powerful, open-source SummerBoard Name: WinterBoard Depends: mobilesubstrate (>= 0.9.2660-1), killall diff --git a/makefile b/makefile index d567b7a..883e5b2 100644 --- a/makefile +++ b/makefile @@ -28,7 +28,7 @@ package: cp -a WinterBoard.plist winterboard/Library/MobileSubstrate/DynamicLibraries cp -a *.theme winterboard/Library/Themes find winterboard/Library/Themes -name .svn | while read -r line; do rm -rf "$${line}"; done - cp -a conffiles control preinst prerm winterboard/DEBIAN + cp -a control preinst prerm winterboard/DEBIAN cp -a Test.sh icon.png WinterBoard.dylib WinterBoard UIImages Info.plist winterboard/Applications/WinterBoard.app dpkg-deb -b winterboard winterboard_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb -- 2.45.2