Changeset 23862

Timestamp:

06/09/2008 01:40:48 AM (6 months ago)

Author:

applmak

Message:

When making a new chat, and we detect that an error has occurred...
Rather than simply setting the error message and continuing, we now return nil, which stops futher processing and tells the user of the error.
Fixes #8864.

Files:

• trunk/Frameworks/Adium Framework/Source/AIAccount.m (modified) (3 diffs)

trunk/Frameworks/Adium Framework/Source/AIAccount.m

@@ -970 +970 @@
-                [[NSScriptCommand currentCommand] setScriptErrorNumber:errOSACantAssign];
-                [[NSScriptCommand currentCommand] setScriptErrorString:@"Can't create a chat without specifying its containing window."];
+                return nil;
-        }
-        
@@ -977 +978 @@
-                        [[NSScriptCommand currentCommand] setScriptErrorNumber:errOSACantAssign];
-                        [[NSScriptCommand currentCommand] setScriptErrorString:@"Can't find that contact!"];
+                        return nil;
-                }
-                AIMessageWindowController *chatWindowController = nil;
@@ -995 +997 @@
-                        [[NSScriptCommand currentCommand] setScriptErrorNumber:errOSACantAssign];
-                        [[NSScriptCommand currentCommand] setScriptErrorString:@"Can't create chat in that chat window."];
+                        return nil;
-                }
-