Changeset 439 for trunk

Timestamp:

03/05/08 11:35:32 (17 years ago)

Author:

Nicholas Riley

Message:

Fix up comments and simplify control flow in ICCF_SetServicesMenu

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServices.m (modified) (1 diff)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServices.m

@@ -125 +125 @@
 
 void ICCF_SetServicesMenu(NSMenu *servicesMenu) {
-    // in 10.3, this populates the menu; in 10.4, it attaches a delegate (NSServiceMaster)
+    // attaches a delegate (NSServiceMaster in 10.4, NSServiceMenuDelegate in 10.5)
     [[NSApplication sharedApplication] setServicesMenu: servicesMenu];
     id delegate;
-    if ( (delegate = [servicesMenu delegate]) != nil) {
-        // populate menu so we have something to filter
-        if ([delegate respondsToSelector: @selector(menuNeedsUpdate:)]) {
-            [delegate menuNeedsUpdate: servicesMenu];
+    if ( (delegate = [servicesMenu delegate]) == nil)
+        return;
+    
+    // populate menu so we have something to filter; delegate reponds to one of these methods
+    if ([delegate respondsToSelector: @selector(menuNeedsUpdate:)]) {
+        [delegate menuNeedsUpdate: servicesMenu];
+    }
+    if ([delegate respondsToSelector: @selector(menu:updateItem:atIndex:shouldCancel:)]) {
+        int itemCount = [delegate numberOfItemsInMenu: servicesMenu];
+        for (int i = 0 ; i < itemCount ; i++) {
+            [servicesMenu addItemWithTitle: @"" action: NULL keyEquivalent: @""];
         }
-        if ([delegate respondsToSelector: @selector(menu:updateItem:atIndex:shouldCancel:)]) {
-            int itemCount = [delegate numberOfItemsInMenu: servicesMenu];
-            for (int i = 0 ; i < itemCount ; i++) {
-                [servicesMenu addItemWithTitle: @"" action: NULL keyEquivalent: @""];
-            }
-            for (int i = 0 ; i < itemCount ; i++) {
-                if (![delegate menu: servicesMenu updateItem: (NSMenuItem *)[servicesMenu itemAtIndex: i] atIndex: i shouldCancel: NO])
-                    break;
-            }
+        for (int i = 0 ; i < itemCount ; i++) {
+            if (![delegate menu: servicesMenu updateItem: (NSMenuItem *)[servicesMenu itemAtIndex: i] atIndex: i shouldCancel: NO])
+                break;
         }
     }