Merge branch 'master' of saurik.com:cydia

3 files changed, 61 insertions, 22 deletions

diff --git a/Cydia.mm b/Cydia.mm
index 973efb2..936856d 100644
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1634,11 +1634,11 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 }
 
 - (NSString *) depictionForPackage:(NSString *)package {
-    return depiction_.empty() ? nil : [depiction_ stringByReplacingOccurrencesOfString:@"*" withString:package];
+    return depiction_.empty() ? nil : [static_cast<id>(depiction_) stringByReplacingOccurrencesOfString:@"*" withString:package];
 }
 
 - (NSString *) supportForPackage:(NSString *)package {
-    return support_.empty() ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package];
+    return support_.empty() ? nil : [static_cast<id>(support_) stringByReplacingOccurrencesOfString:@"*" withString:package];
 }
 
 - (NSDictionary *) record {
@@ -2180,7 +2180,7 @@ struct PackageNameOrdering :
         _end
 
         bool changed(false);
-        NSString *key([id_ lowercaseString]);
+        NSString *key([static_cast<id>(id_) lowercaseString]);
 
         _profile(Package$initWithVersion$Metadata)
             metadata_ = [Packages_ objectForKey:key];
@@ -2486,9 +2486,9 @@ struct PackageNameOrdering :
 
     UIImage *icon(nil);
     if (!icon_.empty())
-        if ([icon_ hasPrefix:@"file:///"])
+        if ([static_cast<id>(icon_) hasPrefix:@"file:///"])
             // XXX: correct escaping
-            icon = [UIImage imageAtPath:[icon_ substringFromIndex:7]];
+            icon = [UIImage imageAtPath:[static_cast<id>(icon_) substringFromIndex:7]];
     if (icon == nil) if (section != nil)
         icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
     if (icon == nil) if (source_ != nil) if (NSString *dicon = [source_ defaultIcon])
@@ -8252,7 +8252,7 @@ static _finline void _setHomePage(Cydia *self) {
     [page setDelegate:self];
 
     CYNavigationController *navController = (CYNavigationController *) [tabbar_ selectedViewController];
-    [navController setViewControllers:[NSArray arrayWithObject:page] animated:NO];
+    [navController setViewControllers:[NSArray arrayWithObject:page]];
     for (CYNavigationController *page in [tabbar_ viewControllers]) {
         if (page != navController) [page setViewControllers:nil];
     }
diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index de959c9..678b8b6 100644
--- a/iPhonePrivate.h
+++ b/iPhonePrivate.h
@@ -1,7 +1,10 @@
 #ifndef CYDIA_UIKITPRIVATE_H
+#define CYDIA_UIKITPRIVATE_H
 
+// #include <*> {{{
 #include <GraphicsServices/GraphicsServices.h>
-
+// }}}
+// typedef enum {*} *; {{{
 typedef enum {
     UIGestureAttributeMinDegrees,                 /*float*/
     UIGestureAttributeMaxDegrees,                 /*float*/
@@ -28,11 +31,12 @@ typedef enum {
     UIProgressIndicatorStyleSmallBlack,
     UIProgressIndicatorStyleTinyWhite,
 } UIProgressIndicatorStyle;
-
-
+// }}}
+// @class *; {{{
 @class WebView;
+// }}}
 
-
+// @interface NS* (*) {{{
 @interface NSString (Apple)
 - (NSString *) stringByAddingPercentEscapes;
 - (NSString *) stringByReplacingCharacter:(UniChar)from withCharacter:(UniChar)to;
@@ -51,8 +55,8 @@ typedef enum {
 @interface NSValue (Apple)
 + (NSValue *) valueWithSize:(CGSize)size;
 @end
-
-
+// }}}
+// @interface UI* (*) {{{
 @interface UIActionSheet (Apple)
 - (void) setContext:(NSString *)context;
 - (NSString *) context;
@@ -149,8 +153,9 @@ typedef enum {
 - (void) makeKey:(UIApplication *)application;
 - (void) orderFront:(UIApplication *)application;
 @end
+// }}}
 
-
+// @interface * : UIView {{{
 @interface UIFormAssistant : UIView
 + (UIFormAssistant *) sharedFormAssistant;
 - (CGRect) peripheralFrame;
@@ -264,8 +269,8 @@ typedef enum {
 - (void) webViewDidPreventDefaultForEvent:(WebView *)view;
 - (void) webViewFormEditedStatusHasChanged:(WebView *)changed;
 @end
-
-
+// }}}
+// @interface *Button : * {{{
 @interface UINavigationButton : UIButton
 - (id) initWithTitle:(NSString *)title style:(UINavigationButtonStyle)style;
 - (void) setBarStyle:(UIBarStyle)style;
@@ -283,21 +288,49 @@ typedef enum {
 
 @interface UIThreePartButton : UIPushButton
 @end
-
-
+// }}}
+// @interface * : NS* {{{
 @interface WebDefaultUIKitDelegate : NSObject
 + (WebDefaultUIKitDelegate *) sharedUIKitDelegate;
 @end
+// }}}
 
+// #ifndef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER {{{
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#define AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
 
-extern "C" CFStringRef const kGSDisplayIdentifiersCapability;
+typedef enum {
+    UIModalPresentationFullScreen,
+    UIModalPresentationPageSheet,
+    UIModalPresentationFormSheet,
+    UIModalPresentationCurrentContext,
+} UIModalPresentationStyle;
 
-extern "C" float const UIWebViewGrowsAndShrinksToFitHeight;
-extern "C" float const UIWebViewScalesToFitScale;
+#define kSCNetworkReachabilityFlagsConnectionOnTraffic kSCNetworkReachabilityFlagsConnectionAutomatic
+#define kSCNetworkReachabilityFlagsConnectionOnDemand (1 << 5)
 
+@class NSUndoManager;
+@class UIPasteboard;
+
+@interface UIActionSheet (iPad)
+- (void) showFromBarButtonItem:(UIBarButtonItem *)item animated:(BOOL)animated;
+@end
 
+@interface UIViewController (iPad)
+- (void) setModalPresentationStyle:(UIModalPresentationStyle)style;
+@end
+
+#endif//AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+// }}}
+
+// extern *; {{{
+extern CFStringRef const kGSDisplayIdentifiersCapability;
+extern float const UIWebViewGrowsAndShrinksToFitHeight;
+extern float const UIWebViewScalesToFitScale;
+// }}}
+// extern "C" *(); {{{
 extern "C" UIImage *_UIImageWithName(NSString *name);
 extern "C" void UISetColor(CGColorRef color);
-
+// }}}
 
 #endif//CYDIA_UIKITPRIVATE_H
diff --git a/makefile b/makefile
index 1d189f0..3898b49 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,10 @@
+ifeq (o,O)
+ios := 2.0
+gcc := 4.0
+else
 ios := 3.2
+gcc := 4.2
+endif
 
 flags := 
 link := 
@@ -34,7 +40,7 @@ link += -lpcre
 link += -multiply_defined suppress
 
 #cycc = cycc -r4.2 -i$(ios) -o$@
-gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++
+gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
 cycc = $(gxx) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=$(ios) -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
 
 all: Cydia