Fixed a serious localization bug.

diff --git a/Cydia.mm b/Cydia.mm
index 7863dc856ecc2ab40a809d0d6433f255bb3c6d6d..f90aa0bb079ac654c5eb1bbd1405896564635087 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -39,8 +39,8 @@
 #define USE_SYSTEM_MALLOC 1
 
 /* #include Directives {{{ */
 #define USE_SYSTEM_MALLOC 1
 
 /* #include Directives {{{ */

-#import "UICaboodle.h"
-#import "UCLocalize.h"
+#import "UICaboodle/UCPlatform.h"
+#import "UICaboodle/UCLocalize.h"

 
 #include <objc/message.h>
 #include <objc/objc.h>
 
 #include <objc/message.h>
 #include <objc/objc.h>


@@ -113,8 +113,8 @@ extern "C" {
 
 #include <ext/hash_map>
 
 
 #include <ext/hash_map>
 

-#import "BrowserView.h"
-#import "ResetView.h"
+#import "UICaboodle/BrowserView.h"
+#import "UICaboodle/ResetView.h"

 
 #import "substrate.h"
 /* }}} */
 
 #import "substrate.h"
 /* }}} */


@@ -3728,6 +3728,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) localizedStringForKey:(NSString *)key value:(NSString *)value table:(NSString *)table {
 }
 
 - (NSString *) localizedStringForKey:(NSString *)key value:(NSString *)value table:(NSString *)table {

+    if (reinterpret_cast<id>(value) == [WebUndefined undefined])
+        value = nil;

     if (reinterpret_cast<id>(table) == [WebUndefined undefined])
         table = nil;
     return [[NSBundle mainBundle] localizedStringForKey:key value:value table:table];
     if (reinterpret_cast<id>(table) == [WebUndefined undefined])
         table = nil;
     return [[NSBundle mainBundle] localizedStringForKey:key value:value table:table];


@@ -3769,7 +3771,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (id) initWithBook:(RVBook *)book forWidth:(float)width {
 }
 
 - (id) initWithBook:(RVBook *)book forWidth:(float)width {

-    if ((self = [super initWithBook:book]) != nil) {
+    if ((self = [super initWithBook:book forWidth:width]) != nil) {

         cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_];
 
         WebView *webview([webview_ webView]);
         cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_];
 
         WebView *webview([webview_ webView]);

diff --git a/control b/control
index 0ab80234c286998fea1174b2fd7c39a11c2c235f..b604d4028d72d27da13fab8dafd47cbe49c0ca2d 100644 (file)
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Priority: required
 Section: Packaging
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
 Architecture: iphoneos-arm
 Section: Packaging
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
 Architecture: iphoneos-arm

-Version: 1.0.2913-1
+Version: 1.0.2932-1

 Replaces: com.sosiphone.addcydia
 Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds
 Pre-Depends: dpkg (>= 1.14.25-8)
 Replaces: com.sosiphone.addcydia
 Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds
 Pre-Depends: dpkg (>= 1.14.25-8)

diff --git a/makefile b/makefile
index 6407cd5a3eef69c356e5ef1c08adda3abd06476e..e13ebfabc7190e8097d0073c9c2824cc4bbd6b3f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -9,8 +9,8 @@ all: Cydia
 clean:
        rm -f Cydia
 
 clean:
        rm -f Cydia
 

-Cydia: Cydia.mm ../uicaboodle.m/*.mm ../mobilesubstrate/*.h #makefile
-       $(target)g++ -march=armv6 -mcpu=arm1176jzf-s -mthumb -I../uicaboodle.m -I../mobilesubstrate -fobjc-call-cxx-cdtors -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework IOKit -framework CoreFoundation -framework Foundation -framework CoreGraphics -framework GraphicsServices -framework QuartzCore -framework JavaScriptCore -framework WebCore -framework WebKit -lobjc -lapt-pkg -lpcre -fobjc-exceptions -F"$${PKG_ROOT}"/System/Library/PrivateFrameworks -multiply_defined suppress -lapr-1
+Cydia: Cydia.mm UICaboodle/*.mm ../mobilesubstrate/*.h #makefile
+       $(target)g++ -march=armv6 -mcpu=arm1176jzf-s -mthumb -I. -I../mobilesubstrate -fobjc-call-cxx-cdtors -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework IOKit -framework CoreFoundation -framework Foundation -framework CoreGraphics -framework GraphicsServices -framework QuartzCore -framework JavaScriptCore -framework WebCore -framework WebKit -lobjc -lapt-pkg -lpcre -fobjc-exceptions -F"$${PKG_ROOT}"/System/Library/PrivateFrameworks -multiply_defined suppress -lapr-1

 
 sign: Cydia
        CODESIGN_ALLOCATE=$$(which "$(target)codesign_allocate") ldid -Slaunch.xml Cydia
 
 sign: Cydia
        CODESIGN_ALLOCATE=$$(which "$(target)codesign_allocate") ldid -Slaunch.xml Cydia