Changeset 464 for trunk

Timestamp:

04/10/08 21:55:16 (17 years ago)

Author:

Nicholas Riley

Message:

CFUserNotification changes: info icon no longer displayed, so display bookmark helper app icon; remove no-longer-necessary CFUserNotificationCreate CFLog suppression.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEBookmarks.c (modified) (2 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEBookmarks.c

@@ -159 +159 @@
     SAFE_RELEASE(bundleURL);
 
+    // get the bookmark helper's icon
+    bundleURL = ICCF_GetBookmarkHelperURL(inst);
+    if (bundleURL == NULL) return kICBookmarkNoHelperErr;
+    
+    CFBundleRef bundle = CFBundleCreate(NULL, bundleURL);
+    SAFE_RELEASE(bundleURL);
+    if (bundle == NULL) return kICBookmarkNoHelperErr;
+    
+    CFStringRef iconFile = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleIconFile"));
+    if (iconFile != NULL) {
+        CFURLRef iconURL = CFBundleCopyResourceURL(bundle, iconFile, NULL, NULL);
+        if (iconURL != NULL) {
+            CFDictionaryAddValue(dict, kCFUserNotificationIconURLKey, iconURL);
+            CFRelease(iconURL);
+        }
+    }
+
     const CFStringRef textFieldTitles[] = { ICCF_CopyLocalizedString(CFSTR("Location:")), ICCF_CopyLocalizedString(CFSTR("Name:")), ICCF_CopyLocalizedString(CFSTR("Description:")) };
     const CFStringRef textFieldValues[] = { url, CFSTR(""), CFSTR("") };
@@ -173 +190 @@
     if (textFieldValuesArray != NULL) CFRelease(textFieldValuesArray);
 
-    // XXX suppress log message from Apple's code:
-    // 2003-02-02 17:48:26.896 TextEdit[2790] CFLog (20): Add Bookmark:  Bookmark name and description are optional.
-    int errfd = dup(STDERR_FILENO), nullfd = open("/dev/null", O_WRONLY, 0);
-    // need to have something open in STDERR_FILENO because if it isn't,
-    // CFLog will log to /dev/console
-    dup2(nullfd, STDERR_FILENO);
-    close(nullfd);
     CFUserNotificationRef notification = CFUserNotificationCreate(NULL, 0, kCFUserNotificationPlainAlertLevel, &err, dict);
-    dup2(errfd, STDERR_FILENO);
-    close(errfd);
     if (notification == NULL) {
         CFRelease(dict);