Changeset 14114

Timestamp:

11/20/2005 06:42:15 PM (3 years ago)

Author:

evands

Message:

Mark outgoing content objects as being in progress just as we do incoming content objects; this way our chat controller knows when chats shouldn't truly be closed. Fixes the test case of sending %_safari and then closing the window leading to two chats being opened when it is received. Fixes #460

Files:

• trunk/Source/AIContentController.m (modified) (2 diffs)

trunk/Source/AIContentController.m

@@ -185 +185 @@
-                                                                                                                userInfo:[NSDictionary dictionaryWithObjectsAndKeys:inObject,@"Object",nil]];
-                        }
-
-
-
-
+
-                        //Run the object through our incoming content filters
-                        if ([inObject filterContent]) {
+                                //Track that we are in the process of receiving this object
+                                [objectsBeingReceived addObject:inObject];
+
-                                [self filterAttributedString:[inObject message]
-                                                         usingFilterType:AIFilterContent
@@ -235 +235 @@
-        //Only proceed if the chat allows it; if it doesn't, it will handle calling this method again when it is ready
-        if ([[inObject chat] willBeginSendingContentObject:inObject]) {
+
-                //Run the object through our outgoing content filters
-                if ([inObject filterContent]) {
+                        //Track that we are in the process of send this object
+                        [objectsBeingReceived addObject:inObject];
+
-                        [self filterAttributedString:[inObject message]
-                                                 usingFilterType:AIFilterContent