Changeset 3619

Timestamp:

03/12/07 22:37:53 (2 years ago)

Author:

timothy

Message:

Fixes a crash reported 3 times today, and 35 times total. http://colloquy.info/admin/crashes.html?q=_refreshIcon&r=crash_thread

Files:

• trunk/Panels/JVChatRoomMember.m (modified) (3 diffs)
• trunk/Panels/JVChatRoomPanel.m (modified) (7 diffs)

trunk/Panels/JVChatRoomMember.m

@@ -12 +12 @@
-- (NSString *) _selfStoredNickname;
-- (NSString *) _selfCompositeName;
+- (void) _detach;
-@end
-
@@ -51 +52 @@
-
-- (void) dealloc {
-
-
-
-
+
-
-        [_user release];
@@ -758 +756 @@
-
-@implementation JVChatRoomMember (JVChatMemberPrivate)
+- (void) _detach {
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:MVChatUserInformationUpdatedNotification object:_user];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:MVChatUserStatusChangedNotification object:_user];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:MVChatUserAwayStatusMessageChangedNotification object:_user];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:MVChatUserIdleTimeUpdatedNotification object:_user];
+
+        _room = nil;
+}
+
-- (void) _refreshIcon:(NSNotification *) notification {
-        [[_room windowController] reloadListItem:self andChildren:NO];

trunk/Panels/JVChatRoomPanel.m

@@ -35 +35 @@
-- (NSString *) _selfStoredNickname;
-- (NSString *) _selfCompositeName;
+- (void) _detach;
-@end
-
@@ -88 +89 @@
-        [[NSNotificationCenter defaultCenter] removeObserver:self];
-
+        [_sortedMembers makeObjectsPerformSelector:@selector( _detach )];
+        [_nextMessageAlertMembers makeObjectsPerformSelector:@selector( _detach )];
+
-        [_sortedMembers release];
-        [_preferredTabCompleteNicknames release];
@@ -410 +414 @@
-- (void) joined {
-        _banListSynced = NO;
+
+        [_sortedMembers makeObjectsPerformSelector:@selector( _detach )];
-        [_sortedMembers removeAllObjects];
+
-        [_preferredTabCompleteNicknames removeAllObjects];
+
+        [_nextMessageAlertMembers makeObjectsPerformSelector:@selector( _detach )];
-        [_nextMessageAlertMembers removeAllObjects];
-
@@ -1004 +1013 @@
-        [self performNotification:@"JVChatMemberLeftRoom" withContextInfo:context];
-
+        [mbr _detach];
+
-        [_preferredTabCompleteNicknames removeObject:[mbr nickname]];
-        [_sortedMembers removeObjectIdenticalTo:mbr];
@@ -1073 +1084 @@
-                [_windowController showChatViewController:[_windowController activeChatViewController]];
-
+        [mbr _detach];
+
-        [_preferredTabCompleteNicknames removeObject:[mbr nickname]];
-        [_sortedMembers removeObjectIdenticalTo:mbr];
@@ -1120 +1133 @@
-        if( [_windowController selectedListItem] == mbr )
-                [_windowController showChatViewController:[_windowController activeChatViewController]];
+
+        [mbr _detach];
-
-        [_preferredTabCompleteNicknames removeObject:[mbr nickname]];
@@ -1422 +1437 @@
-                        while( ( member = [enumerator nextObject] ) ) {
-                                JVChatRoomMember *listItem = [self chatRoomMemberForUser:member];
-
+
+
+
+
-                        }
-                }