X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/2f7f84d62451875f15d4ae8242b58689eb2bd44c..65c2a944b9f6d3acc94b06dd73d4ca89ce03515d:/ITAppleEventCenter.m

diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index 535154b..50c7b88 100755
--- 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;
 }
 
@@ -60,16 +53,16 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 	    //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);
-
+//joe add the ITFDEBUG stuff back?
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
@@ -125,12 +118,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 	    //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);
@@ -191,12 +184,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 	    //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);
@@ -251,11 +244,11 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
-	}*/
+	}
 
     //NSLog(@"_sendString: %s", sendString);
 
@@ -317,12 +310,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 	    //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);
@@ -385,12 +378,12 @@ 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.");
 	    return nil;
 	}
-	*/
+	
     //NSLog(@"_sendString: %s", sendString);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
@@ -437,7 +430,11 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AppleEvent event, reply;
 
     //AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
-    AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
+    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+	    //NSLog(@"Error getting PID of application! Exiting.");
+	    return 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);
@@ -472,7 +469,10 @@ 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];
@@ -481,6 +481,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         //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];
@@ -520,12 +521,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 	    //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);
@@ -576,12 +577,12 @@ return result;
 
     AEBuildError buildError;
     OSStatus err;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 	    //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);