Changeset 240

Timestamp:

01/05/07 21:17:57 (2 years ago)

Author:

gbooker

Message:

Authenticated install and remove.

Files:

• trunk/CPFPerianPrefPaneController.m (modified) (10 diffs)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/CPFPerianPrefPaneController.m

@@ -1 +1 @@
-#import "CPFPerianPrefPaneController.h"
-#import <Security/Security.h>
+#include <sys/stat.h>
-
-#define ComponentInfoDictionaryKey      @"Components"
@@ -36 +37 @@
-}
-
+- (BOOL)systemInstalled
+{
+        NSString *myPath = [[self bundle] bundlePath];
+        
+        if([myPath hasPrefix:NSHomeDirectory()])
+                return NO;
+        return YES;
+}
+
-- (NSString *)quickTimeComponentDir
-{
-        NSString *myPath = [[self bundle] bundlePath];
-        NSString *basePath = nil;
-        
-[myPath hasPrefix:NSHomeDirectory()
+![self systemInstalled
-                basePath = NSHomeDirectory();
-        else
@@ -51 +60 @@
-- (NSString *)coreAudioComponentDir
-{
-        NSString *myPath = [[self bundle] bundlePath];
-        NSString *basePath = nil;
-        
-[myPath hasPrefix:NSHomeDirectory()
+![self systemInstalled
-                basePath = NSHomeDirectory();
-        else
@@ -211 +219 @@
-                        pclose(cmdFP);
-                }
+                unsetenv("DESTINATION");
-                fclose(fp);
-        }       
@@ -217 +226 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        NSString *containingDir = nil;
@@ -230 +315 @@
-        }
-        InstallStatus pieceStatus = [self installStatusForComponent:component type:type withMyVersion:myVersion];
-
-
-
-
-
-
+
+
+
-                if(result == NO)
-                        return NO;
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        return YES;
@@ -258 +351 @@
-        NSString *coreAudioComponentPath = [componentPath stringByAppendingPathComponent:@"CoreAudio"];
-        NSString *quickTimeComponentPath = [componentPath stringByAppendingPathComponent:@"QuickTime"];
-
-
+
+
+
+
+
+
+
+
+
+
-        
-        NSEnumerator *componentEnum = [myComponentsInfo objectEnumerator];
@@ -276 +377 @@
-                                break;
-                }
-
-
+
+
+
+
-        [self performSelectorOnMainThread:@selector(installComplete:) withObject:nil waitUntilDone:NO];
-        [pool release];
@@ -287 +390 @@
-        NSDictionary *infoDict = [[self bundle] infoDictionary];
-        NSDictionary *myComponentsInfo = [infoDict objectForKey:ComponentInfoDictionaryKey];
-
-
+
+
+
+
+
+
+
+
+
-        int tag = 0;
-        BOOL result = [[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation source:[self quickTimeComponentDir] destination:@"" files:[NSArray arrayWithObject:@"Perian.component"] tag:&tag];
@@ -309 +419 @@
-                BOOL result = [[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation source:directory destination:@"" files:[myComponent objectForKey:ComponentNameKey] tag:&tag];
-        }
+        if(auth != nil)
+                AuthorizationFree(auth, 0);
+        
-        [self performSelectorOnMainThread:@selector(installComplete:) withObject:nil waitUntilDone:NO];
-        [pool release];

trunk/Perian.xcodeproj/project.pbxproj

@@ -179 +179 @@
-                8F483B5E0A6426C1002CCA73 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F483B5D0A6426C1002CCA73 /* AudioToolbox.framework */; };
-                8F483B8C0A642886002CCA73 /* PerianAviImporter.r in Rez */ = {isa = PBXBuildFile; fileRef = 8F483B8B0A642886002CCA73 /* PerianAviImporter.r */; };
+                F53E18E50B4F483C003A0471 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F53E18E40B4F483C003A0471 /* Security.framework */; };
-                F59E09F10A670E570019A3F0 /* Perian.component in CopyFiles */ = {isa = PBXBuildFile; fileRef = 11A70AC10A3D0105002058D4 /* Perian.component */; };
-/* End PBXBuildFile section */
@@ -417 +418 @@
-                8F483BBC0A642B3D002CCA73 /* ff_MovieImportDispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ff_MovieImportDispatch.h; sourceTree = "<group>"; };
-                F50D440703EAD8DF01B1D299 /* FFusion.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = FFusion.icns; sourceTree = "<group>"; };
+                F53E18E40B4F483C003A0471 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
-                F560DECD03D61B6101ABA332 /* Components.k.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Components.k.h; sourceTree = "<group>"; };
-                F560DEFC03D61BE301ABA332 /* FFusionCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFusionCodec.h; sourceTree = "<group>"; };
@@ -460 +462 @@
-                        files = (
-                                83D1D6CF0B4C7AC400E09EC9 /* PreferencePanes.framework in Frameworks */,
+                                F53E18E50B4F483C003A0471 /* Security.framework in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -492 +495 @@
-                                11D4EEFC0A3CE7FA0066D45F /* Carbon.framework */,
-                                11D4EED50A3CE7EC0066D45F /* QuickTime.framework */,
+                                F53E18E40B4F483C003A0471 /* Security.framework */,
-                        );
-                        name = "External Frameworks and Libraries";