Fix the C++ MobileSubstrate API adapters.

diff --git a/Tweak.mm b/Tweak.mm
index 8581f2bae9bfdf81e49e79ad4708f8e343703ad4..8e6a74d67471cd64b32717d47f2575c409a1d6d6 100644 (file)
--- a/Tweak.mm
+++ b/Tweak.mm
@@ -5,6 +5,7 @@
 #import <CoreGraphics/CGGeometry.h>
 #import <SpringBoard/SBButtonBar.h>
 #import <SpringBoard/SBIcon.h>
 #import <CoreGraphics/CGGeometry.h>
 #import <SpringBoard/SBButtonBar.h>
 #import <SpringBoard/SBIcon.h>

+#import <SpringBoard/SBIconModel.h>

 
 MSHook(float, SBButtonBar$leftMarginForIconRowArray$, SBButtonBar *self, SEL sel, NSArray *row) {
     return [row indexOfObject:[NSNull null]] == NSNotFound ? 4 : _SBButtonBar$leftMarginForIconRowArray$(self, sel, row);
 
 MSHook(float, SBButtonBar$leftMarginForIconRowArray$, SBButtonBar *self, SEL sel, NSArray *row) {
     return [row indexOfObject:[NSNull null]] == NSNotFound ? 4 : _SBButtonBar$leftMarginForIconRowArray$(self, sel, row);


@@ -64,13 +65,21 @@ MSHook(CGPoint, SBButtonBar$originForIconAtX$Y$, SBButtonBar *self, SEL sel, int
     return origin;
 }
 
     return origin;
 }
 

+static int $SBIconModel$maxIconListCount(SBIconModel *self, SEL sel) {
+    return 16;
+}
+

 extern "C" void TweakInitialize() {
     Class $SBButtonBar(objc_getClass("SBButtonBar"));
 extern "C" void TweakInitialize() {
     Class $SBButtonBar(objc_getClass("SBButtonBar"));

-    _SBButtonBar$leftMarginForIconRowArray$ = MSHookMessage($SBButtonBar, @selector(leftMarginForIconRowArray:), &$SBButtonBar$leftMarginForIconRowArray$);
+    MSHookMessage($SBButtonBar, @selector(leftMarginForIconRowArray:), MSHake(SBButtonBar$leftMarginForIconRowArray$));

     MSHookMessage($SBButtonBar, @selector(maxIconColumns), &$SBButtonBar$maxIconColumns);
     MSHookMessage($SBButtonBar, @selector(topIconPadding), &$SBButtonBar$topIconPadding);
     MSHookMessage($SBButtonBar, @selector(maxIconColumns), &$SBButtonBar$maxIconColumns);
     MSHookMessage($SBButtonBar, @selector(topIconPadding), &$SBButtonBar$topIconPadding);

-    _SBButtonBar$originForIconAtX$Y$ = MSHookMessage($SBButtonBar, @selector(originForIconAtX:Y:), &$SBButtonBar$originForIconAtX$Y$);
+    MSHookMessage($SBButtonBar, @selector(originForIconAtX:Y:), MSHake(SBButtonBar$originForIconAtX$Y$));

 
     Class $SBIcon(objc_getClass("SBIcon"));
 
     Class $SBIcon(objc_getClass("SBIcon"));

-    _SBIcon$setOrigin$ = MSHookMessage($SBIcon, @selector(setOrigin:), &$SBIcon$setOrigin$);
+    MSHookMessage($SBIcon, @selector(setOrigin:), MSHake(SBIcon$setOrigin$));
+
+    Class $SBIconModel(objc_getClass("SBIconModel"));
+    Class $$SBIconModel(object_getClass($SBIconModel));
+    MSHookMessage($$SBIconModel, @selector(maxIconListCount), &$SBIconModel$maxIconListCount);

 }
 }

diff --git a/control b/control
index c95c96956c6b8cc649cc3d0148947bff50db6fc4..0d58b9fdf67bcd3611a300e5665a20d834168dfb 100644 (file)
--- a/control
+++ b/control
@@ -3,9 +3,9 @@ Priority: optional
 Section: Tweaks
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
 Architecture: iphoneos-arm
 Section: Tweaks
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
 Architecture: iphoneos-arm

-Version: 0.9.2978-1
+Version: 0.9.3012-1

 Description: fits even more stuff right down there
 Description: fits even more stuff right down there

-Name: Five Icon Dock
-Depends: mobilesubstrate (>= 0.9.2555-1)
+Name: Five+ Icon Dock
+Depends: mobilesubstrate (>= 0.9.3005-1), firmware (>= 2.2)

 Author: Jay Freeman (saurik) <saurik@saurik.com>
 Depiction: http://cydia.saurik.com/info/com.saurik.iphone.fid/
 Author: Jay Freeman (saurik) <saurik@saurik.com>
 Depiction: http://cydia.saurik.com/info/com.saurik.iphone.fid/