Changeset 21721

Timestamp:

11/23/2007 12:37:25 PM (1 year ago)

Author:

zacw

Message:

Display a status message in open chats when an account is disconnected or connects. Fixes #8441.

Files:

• trunk/Frameworks/Adium Framework/Source/AIAbstractAccount.m (modified) (4 diffs)

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

@@ -1052 +1052 @@
-- (void)didConnect
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    [self setStatusObject:nil forKey:@"Connecting" notify:NotifyLater];
-    [self setStatusObject:[NSNumber numberWithBool:YES] forKey:@"Online" notify:NotifyLater];
@@ -1064 +1076 @@
-    //Reset reconnection attempts
-    reconnectAttemptsPerformed = 0;
-
+
-        //Update our status and idle status to ensure our newly connected account is in the states we want it to be
-        if ([[self statusState] statusType] == AIOfflineStatusType) {
@@ -1179 +1191 @@
-- (void)didDisconnect
-{
+        //If we were online, display a status message in all of our open chats noting our disconnection
+        if ([[self statusObjectForKey:@"Online"] boolValue]) {
+                AIChat                  *chat = nil;
+                NSEnumerator    *enumerator = [[[adium interfaceController] openChats] objectEnumerator];
+                
+                while ((chat = [enumerator nextObject])) {
+                        if ([chat account] == self && [chat isOpen]) {
+                                [[adium contentController] displayEvent:AILocalizedString(@"You have disconnected","Displayed in an open chat when its account has been disconnected.")
+                                                                                                 ofType:@"disconnected"
+                                                                                                 inChat:chat];
+                        }
+                }
+        }
+        
-        //Remove all contacts
-        [self removeAllContacts];
-
+
-        //We are now offline
-    [self setStatusObject:nil forKey:@"Disconnecting" notify:NotifyLater];
@@ -1198 +1224 @@
-                // Let it try for 2 times and then cancel and wait for the network to return.
-                [self cancelAutoReconnect];
+
+                AILog(@"%@: Disconnected (\"%@\"): Waiting until network returns.", self, lastDisconnectionError);
+
-        } else if ([self shouldBeOnline] && lastDisconnectionError) {
-                AIReconnectDelayType shouldReconnect = [self shouldAttemptReconnectAfterDisconnectionError:&lastDisconnectionError];