Remove 1.x-compatible ApplicationIconBadge logic.

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 267fa21b5bdc8a996e57ed8664ac1c0883bdb311..872e818cc12d337f286ddff1f1787d17318398f2 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -8210,24 +8210,20 @@ static _finline void _setHomePage(Cydia *self) {
         }
     }
 
         }
     }
 

+    NSLog(@"changes:#%u", changes);
+

     UITabBarItem *changesItem = [[[tabbar_ viewControllers] objectAtIndex:[self indexOfTabWithTag:kChangesTag]] tabBarItem];
     if (changes != 0) {
     UITabBarItem *changesItem = [[[tabbar_ viewControllers] objectAtIndex:[self indexOfTabWithTag:kChangesTag]] tabBarItem];
     if (changes != 0) {

+        _trace();

         NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
         [changesItem setBadgeValue:badge];
         [changesItem setAnimatedBadge:([essential_ count] > 0)];
         NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
         [changesItem setBadgeValue:badge];
         [changesItem setAnimatedBadge:([essential_ count] > 0)];

-
-        if ([self respondsToSelector:@selector(setApplicationBadge:)])
-            [self setApplicationBadge:badge];
-        else
-            [self setApplicationBadgeString:badge];
+        [self setApplicationIconBadgeNumber:changes];

     } else {
     } else {

+        _trace();

         [changesItem setBadgeValue:nil];
         [changesItem setAnimatedBadge:NO];
         [changesItem setBadgeValue:nil];
         [changesItem setAnimatedBadge:NO];

-
-        if ([self respondsToSelector:@selector(removeApplicationBadge)])
-            [self removeApplicationBadge];
-        else // XXX: maybe use setApplicationBadgeString also?
-            [self setApplicationIconBadgeNumber:0];
+        [self setApplicationIconBadgeNumber:0];

     }
 
     [self _updateData];
     }
 
     [self _updateData];

diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index afb4a34d0862241fcc926bcebee2a01165acb1e3..e6a79dce45a5a7d0102be9624a60231508e27cbe 100644 (file)
--- a/iPhonePrivate.h
+++ b/iPhonePrivate.h
@@ -195,9 +195,6 @@ typedef enum {
 - (void) applicationWillResignActive:(UIApplication *)application;
 - (void) applicationWillSuspend;
 - (void) launchApplicationWithIdentifier:(NSString *)identifier suspended:(BOOL)suspended;
 - (void) applicationWillResignActive:(UIApplication *)application;
 - (void) applicationWillSuspend;
 - (void) launchApplicationWithIdentifier:(NSString *)identifier suspended:(BOOL)suspended;

-- (void) removeApplicationBadge;
-- (void) setApplicationBadge:(NSString *)badge;
-- (void) setApplicationBadgeString:(NSString *)badge;

 - (void) setStatusBarShowsProgress:(BOOL)shows;
 - (void) _setSuspended:(BOOL)suspended;
 - (void) terminateWithSuccess;
 - (void) setStatusBarShowsProgress:(BOOL)shows;
 - (void) _setSuspended:(BOOL)suspended;
 - (void) terminateWithSuccess;