Changeset 904 for branches/perian-1.1

Timestamp:

05/26/08 13:58:12 (6 months ago)

Author:

astrange

Message:

Copy r903 from trunk.

Files:

• branches/perian-1.1/CPFPerianPrefPaneController.m (modified) (3 diffs)

branches/perian-1.1/CPFPerianPrefPaneController.m

@@ -647 +647 @@
-        NSDictionary *infoDict = [self myInfoDict];
-        NSDictionary *myComponentsInfo = [infoDict objectForKey:ComponentInfoDictionaryKey];
+        NSFileManager *fileManager = [NSFileManager defaultManager];
+        NSString *componentPath;
-
-        [errorString release];
@@ -656 +658 @@
-        
-        int tag = 0;
-BOOL result = NO
+componentPath = [[self quickTimeComponentDir:userInstalled] stringByAppendingPathComponent:@"Perian.component"]
-        if(auth != nil && !userInstalled)
-[[self quickTimeComponentDir:userInstalled] stringByAppendingPathComponent:@"Perian.component"]
-
-result = [[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation source:[self quickTimeComponentDir:userInstalled] destination:@"" files:[NSArray arrayWithObject:@"Perian.component"] tag:&tag
+componentPath
+
+[fileManager removeFileAtPath:componentPath handler:nil
-        
-        NSEnumerator *componentEnum = [myComponentsInfo objectEnumerator];
@@ -668 +670 @@
-                ComponentType type = [[myComponent objectForKey:ComponentTypeKey] intValue];
-                NSString *directory = [self basePathForType:type user:userInstalled];
+                componentPath = [directory stringByAppendingPathComponent:[myComponent objectForKey:ComponentNameKey]];
-                if(auth != nil && !userInstalled)
-[directory stringByAppendingPathComponent:[myComponent objectForKey:ComponentNameKey]]
+componentPath
-                else
-result = [[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation source:directory destination:@"" files:[NSArray arrayWithObject:[myComponent objectForKey:ComponentNameKey]] tag:&tag
+[fileManager removeFileAtPath:componentPath handler:nil
-        }
-        if(auth != nil)