Ticket #1046: ticket1046fix.patch

Panels/JVDirectChatPanel.h

@@ -66 +66 @@
 - (void) echoSentMessageToDisplay:(JVMutableChatMessage *) message;
 - (JVMutableChatMessage *) currentMessage;
 
+- (void) addMessageToHistory:(id)message;
+
 - (void) performNotification:(NSString *) identifier withContextInfo:(NSDictionary *) context;
 
 - (NSUInteger) newMessagesWaiting;

Panels/JVDirectChatPanel.m

@@ -998 +998 @@
 }
 
 #pragma mark -
+#pragma mark History manipulation
+
+- (void) addMessageToHistory:(id) message {
+    if( ! [message length] ) return;
+    if( [_sendHistory count] )
+        [_sendHistory replaceObjectAtIndex:0 withObject:[[[NSAttributedString alloc] initWithString:@""] autorelease]];
+    [_sendHistory insertObject:[[message copy] autorelease] atIndex:1];
+    if( [_sendHistory count] > [[[NSUserDefaults standardUserDefaults] objectForKey:@"JVChatMaximumHistory"] unsignedIntValue] )
+        [_sendHistory removeObjectAtIndex:[_sendHistory count] - 1];    
+}
+
+#pragma mark -
 #pragma mark Notifications Handling
 
 /**
@@ -1066 +1078 @@
 
     _historyIndex = 0;
     if( ! [[send string] length] ) return;
-    if( [_sendHistory count] )
-        [_sendHistory replaceObjectAtIndex:0 withObject:[[[NSAttributedString alloc] initWithString:@""] autorelease]];
-    [_sendHistory insertObject:[[[send textStorage] copy] autorelease] atIndex:1];
-    if( [_sendHistory count] > [[[NSUserDefaults standardUserDefaults] objectForKey:@"JVChatMaximumHistory"] unsignedIntValue] )
-        [_sendHistory removeObjectAtIndex:[_sendHistory count] - 1];
+    [self addMessageToHistory:[send textStorage]];
 
     if( [sender isKindOfClass:[NSNumber class]] && [sender boolValue] ) action = YES;
 

Plug-Ins/Standard

@@ -608 +608 @@
     if( chatView && [msg length] ) {
         JVMutableChatMessage *cmessage = [JVMutableChatMessage messageWithText:msg sender:[connection localUser]];
         [chatView sendMessage:cmessage];
+        [chatView addMessageToHistory:msg];
         [chatView echoSentMessageToDisplay:cmessage];
         return YES;
     } else if( ( user || room ) && [msg length] ) {