Skip to content

objc: Make sendMode work. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

objc: Make sendMode work. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions objc-appscript/trunk/src/Appscript/command.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,22 +178,22 @@ - (id)sendWithError:(out NSError **)error {
if (!(considsAndIgnoresFlags && kAECaseConsiderMask))
[ignoreListDesc insertDescriptor: [NSAppleEventDescriptor descriptorWithEnumCode: kAECase]
atIndex: 0];
if (considsAndIgnoresFlags && kAEDiacriticIgnoreMask)
if (considsAndIgnoresFlags & kAEDiacriticIgnoreMask)
[ignoreListDesc insertDescriptor: [NSAppleEventDescriptor descriptorWithEnumCode: kAEDiacritic]
atIndex: 0];
if (considsAndIgnoresFlags && kAEWhiteSpaceIgnoreMask)
if (considsAndIgnoresFlags & kAEWhiteSpaceIgnoreMask)
[ignoreListDesc insertDescriptor: [NSAppleEventDescriptor descriptorWithEnumCode: kAEWhiteSpace]
atIndex: 0];
if (considsAndIgnoresFlags && kAEHyphensIgnoreMask)
if (considsAndIgnoresFlags & kAEHyphensIgnoreMask)
[ignoreListDesc insertDescriptor: [NSAppleEventDescriptor descriptorWithEnumCode: kAEHyphens]
atIndex: 0];
if (considsAndIgnoresFlags && kAEExpansionIgnoreMask)
if (considsAndIgnoresFlags & kAEExpansionIgnoreMask)
[ignoreListDesc insertDescriptor: [NSAppleEventDescriptor descriptorWithEnumCode: kAEExpansion]
atIndex: 0];
if (considsAndIgnoresFlags && kAEPunctuationIgnoreMask)
if (considsAndIgnoresFlags & kAEPunctuationIgnoreMask)
[ignoreListDesc insertDescriptor: [NSAppleEventDescriptor descriptorWithEnumCode: kAEPunctuation]
atIndex: 0];
if (considsAndIgnoresFlags && kASNumericStringsIgnoreMask)
if (considsAndIgnoresFlags & kASNumericStringsIgnoreMask)
[ignoreListDesc insertDescriptor: [NSAppleEventDescriptor descriptorWithEnumCode: kASNumericStrings]
atIndex: 0];
[AS_event setAttribute: ignoreListDesc forKeyword: enumConsiderations];
Expand Down Expand Up @@ -285,7 +285,7 @@ - (NSString *)description {
if (timeout != kAEDefaultTimeout)
result = [NSString stringWithFormat: @"[%@ timeout: %i]", result, timeout / 60];
if (sendMode != (kAEWaitReply | kAECanSwitchLayer)) {
if (sendMode & ~(kAEWaitReply | kAEQueueReply | kAENoReply) == kAECanSwitchLayer) {
if ((sendMode & ~(kAEWaitReply | kAEQueueReply | kAENoReply)) == kAECanSwitchLayer) {
if (sendMode & kAENoReply)
result = [NSString stringWithFormat: @"[%@ ignoreReply]", result];
if (sendMode & kAEQueueReply)
Expand Down
2 changes: 1 addition & 1 deletion objc-appscript/trunk/src/Appscript/sendthreadsafe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ OSStatus AEMSendMessageThreadSafe(
assert(eventPtr != NULL);
assert(replyPtr != NULL);

if (sendMode && kAEWaitReply) {
if (sendMode & kAEWaitReply) {
replyPort = MACH_PORT_NULL;

// Set up the reply port if necessary.
Expand Down