git.ithinksw.org / ITFoundation.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
More error checking
[ITFoundation.git] / ITAppleEventCenter.m
diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index 2466e43..bceb1ab 100755 (executable)
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -1,12 +1,6 @@
 #import "ITAppleEventCenter.h"
-
-Boolean MyAEIdleCallback (
-                                        EventRecord * theEvent,
-                                        SInt32 * sleepTime,
-                                        RgnHandle * mouseRgn
-                                        );
-
-Boolean MyAEIdleCallback (
+//oh, wait, i forgot i had this open.
+static Boolean MyAEIdleCallback (
                                         EventRecord * theEvent,
                                         SInt32 * sleepTime,
                                         RgnHandle * mouseRgn
@@ -30,10 +24,9 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
 - (id)init
 {
-    if (self = [super init])
-          {
-          idleUPP = NewAEIdleUPP(MyAEIdleCallback);
-          }
+    if (self = [super init]) {
+        idleUPP = NewAEIdleUPP(MyAEIdleCallback);
+    }
     return self;
 }
 
@@ -47,7 +40,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID   eID    = *((unsigned long*)[eventID UTF8String]);
-
+    int pid;
     NSString *nssendString = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]];
     const char *sendString = [nssendString UTF8String];
     NSString  *_finalString = nil;
@@ -59,29 +52,29 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     AEBuildError buildError;
     OSStatus err;
-    OSErr err2, err3;
-    /*
+    OSErr berr, err2, err3;
+    
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           NSLog(@"Error getting PID of application! Exiting.");
+           //NSLog(@"Error getting PID of application! Exiting.");
            return nil;
        }
-       */
+       
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
-
-    [self printCarbonDesc:&sendEvent];
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+//joe add the ITFDEBUG stuff back?
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
 
@@ -89,12 +82,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         result = malloc(resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
                 _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
             }
@@ -102,8 +95,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return _finalString;
 }
@@ -113,6 +106,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID   eID    = *((unsigned long*)[eventID UTF8String]);
+    int pid;
 
     const char *sendString = [nssendString UTF8String];
     NSString  *_finalString = nil;
@@ -123,30 +117,30 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr,err;
     OSErr err2, err3;
-    /*
+    
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           NSLog(@"Error getting PID of application! Exiting.");
+           //NSLog(@"Error getting PID of application! Exiting.");
            return nil;
        }
-       */
+       
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
-
-    [self printCarbonDesc:&sendEvent];
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+       NSLog(@"sending...");
+    if (!berr) [self printCarbonDesc:&sendEvent];
 
-    if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+    if (berr) {
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
-
-    [self printCarbonDesc:&replyEvent];
+    NSLog(@"replying...");
+    if (!err) [self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
 
@@ -154,12 +148,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         result = malloc(resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
                 _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
             }
@@ -167,8 +161,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return _finalString;
 }
@@ -178,6 +172,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    int pid;
 
     NSString *nssendString = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]];
     const char *sendString = [nssendString UTF8String];
@@ -190,45 +185,45 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     AEBuildError buildError;
     OSStatus err;
-    OSErr err2, err3;
-    /*
+    OSErr berr, err2, err3;
+    
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           NSLog(@"Error getting PID of application! Exiting.");
+           //NSLog(@"Error getting PID of application! Exiting.");
            return nil;
        }
-       */
+       
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             }
         }
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return result;
 }
@@ -238,6 +233,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    int pid;
 
     NSString *nssendString = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() } }", [key UTF8String], [object UTF8String]];
     const char *sendString = [nssendString UTF8String];
@@ -249,30 +245,30 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr,err;
     OSErr err2, err3;
-    /*
+    
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           NSLog(@"Error getting PID of application! Exiting.");
+           //NSLog(@"Error getting PID of application! Exiting.");
            return nil;
-       }*/
+       }
 
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
 
@@ -280,12 +276,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         result = malloc(resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
                 _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
             }
@@ -293,8 +289,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return _finalString;
 }
@@ -310,51 +306,52 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     long result = 0;
 
     AppleEvent sendEvent, replyEvent;
+    int pid;
 
     DescType resultType;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr, err;
     OSErr err2, err3;
-    /*
+    
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           NSLog(@"Error getting PID of application! Exiting.");
+           //NSLog(@"Error getting PID of application! Exiting.");
            return nil;
        }
-       */
-    // NSLog(@"_sendString: %s", sendString);
+       
+    // //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             }
         }
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return result;
 }
@@ -365,6 +362,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     const char *sendString;
     int i;
     NSString  *_finalString = nil;
+    int pid;
 
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
@@ -375,7 +373,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr, err;
     OSErr err2, err3;
 
     for (i = 1; i < [array count]; i++) {
@@ -385,28 +383,28 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     }
     buildString = [@"'----':obj " stringByAppendingString:buildString];
     sendString = [buildString UTF8String];
-    /*
+    
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           NSLog(@"Error getting PID of application! Exiting.");
+           //NSLog(@"Error getting PID of application! Exiting.");
            return nil;
        }
-       */
+       
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[buildString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[buildString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
 
@@ -414,17 +412,19 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         result=malloc(resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
                 _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
             }
         }
         free(result);
     }
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
     return _finalString;
 }
 
@@ -434,17 +434,23 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
     AEDesc dest;
-    AppleEvent event, reply;
+    int pid;
 
+    AppleEvent event, reply;
+    OSStatus cerr,cerr2,err;
     //AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
-    AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
-    AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event);
-[self printCarbonDesc:&event];
-    AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
-[self printCarbonDesc:&reply];
-    AEDisposeDesc(&dest);
-    AEDisposeDesc(&event);
-    AEDisposeDesc(&reply);
+    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+           //NSLog(@"Error getting PID of application! Exiting.");
+           return nil;
+       }
+       cerr = AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
+    cerr2 = AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event);
+//[self printCarbonDesc:&event];
+    err = AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
+//[self printCarbonDesc:&reply];
+    if (!cerr2) AEDisposeDesc(&dest);
+    if (!cerr) AEDisposeDesc(&event);
+    if (!err) AEDisposeDesc(&reply);
 }
 
 - (void)printCarbonDesc:(AEDesc*)desc {
@@ -464,6 +470,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     NSString *nssendString = [NSString stringWithFormat:@"'----':obj { form:'indx', want:'%s', seld:abso($616C6C20$), from:'null'() }", [key UTF8String]];
     const char *sendString = [nssendString UTF8String];
     AEArrayDataPointer result = nil;
+    int pid;
 
     AppleEvent sendEvent, replyEvent;
 
@@ -472,21 +479,25 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     OSStatus err;
 
     //NSLog(@"_sendString: %s", sendString);
-
+if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+           //NSLog(@"Error getting PID of application! Exiting.");
+           return nil;
+       }
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
+
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
           SInt32 count, resultCount;
 
@@ -511,6 +522,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     const char *sendString = [string UTF8String];
     SInt32 result = 0;
+    int pid;
 
     AppleEvent sendEvent, replyEvent;
 
@@ -518,48 +530,48 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr, err;
     OSErr err2, err3;
-    /*
+    
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           NSLog(@"Error getting PID of application! Exiting.");
+           //NSLog(@"Error getting PID of application! Exiting.");
            return nil;
        }
-       */
+       
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             }
         }
     }
 
 
-AEDisposeDesc(&sendEvent);
-AEDisposeDesc(&replyEvent);
-NSLog(@"waffles say %d",result);
+if (!berr) AEDisposeDesc(&sendEvent);
+if (!err) AEDisposeDesc(&replyEvent);
+//NSLog(@"waffles say %d",result);
 return result;
 }
 
@@ -568,6 +580,7 @@ return result;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    int pid;
 
     const char *sendString = [string UTF8String];
     AEArrayDataPointer result = NULL;
@@ -575,29 +588,29 @@ return result;
     AppleEvent sendEvent, replyEvent;
 
     AEBuildError buildError;
-    OSStatus err;
-    /*
+    OSStatus berr, err;
+    
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           NSLog(@"Error getting PID of application! Exiting.");
+           //NSLog(@"Error getting PID of application! Exiting.");
            return nil;
        }
-       */
+       
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
           SInt32 count, resultCount;
 
@@ -608,8 +621,8 @@ return result;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return result;
 }
iThink Software's custom extensions to Apple's Foundation framework.