Changeset 142 for trunk/ICeCoffEE/ICeCoffEE/APEMain.m

Timestamp:

06/14/03 09:54:54 (21 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE 1.4a1

File:

• trunk/ICeCoffEE/ICeCoffEE/APEMain.m (modified) (4 diffs)

trunk/ICeCoffEE/ICeCoffEE/APEMain.m

@@ -130 +130 @@
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "mouseUp:") &&
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "draggingEntered:") &&
-            ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "draggingExited:") &&
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "_optionClickEvent:::") ,
             ICapeprintf("ICeCoffEE APE: loaded in TermSubview for Terminal!\n");
@@ -190 +189 @@
 }
 
+void ICCF_GetCFTypePref(CFStringRef prefKey, CFTypeRef *val, CFTypeID type) {
+    if (*val != NULL) {
+        CFRelease(*val);
+        *val = NULL;
+    }
+    
+    *val = CFPreferencesCopyAppValue(prefKey, kICBundleIdentifier);
+
+    if (*val == NULL) return;
+
+    if (CFGetTypeID(*val) != type) {
+        CFRelease(*val);
+        *val = NULL;
+        return;
+    }
+}
+
 // to test: defaults write net.sabi.ICeCoffEE "Excluded Applications" -array '{CFBundleID = "com.apple.projectbuilder"; }' '{CFBundleID = "net.sabi.Pester"; }' '{CFBundleID = "com.apple.foobar"; }'
 static void ICCF_MigratePrefs() {
@@ -230 +246 @@
                 excludedAppBundle = CFBundleCreate(NULL, excludedAppURL);
                 if (excludedAppBundle != NULL) {
-                    APEToolsAddToExcludeList(kICBundleIdentifier, excludedAppBundle);
+                    APEToolsAddToExcludeList(kICBundleIdentifier, excludedAppBundle, CFSTR("Migrated from ICeCoffEE 1.0-1.2"), NO);
                 } else postponeMigrationForApp = YES; // can't create bundle
             } else postponeMigrationForApp = YES; // can't find app
@@ -256 +272 @@
     ICCF_prefs.servicesInContextualMenu = ICCF_GetBooleanPref(kICServicesInContextualMenu, YES);
     ICCF_prefs.servicesInMenuBar = ICCF_GetBooleanPref(kICServicesInMenuBar, NO);
+    ICCF_GetCFTypePref(kICServiceOptions, (CFTypeRef *)&ICCF_prefs.serviceOptions, CFDictionaryGetTypeID());
+    ICCF_prefs.terminalRequireOptionForSelfDrag = ICCF_GetBooleanPref(kICTerminalRequireOptionForSelfDrag, NO);
     ICCF_prefs.errorSoundEnabled = ICCF_GetBooleanPref(kICErrorSoundEnabled, NO);
     ICCF_prefs.errorDialogEnabled = ICCF_GetBooleanPref(kICErrorDialogEnabled, YES);