make the message count a static variable

diff --git a/macosx/MessageWindowController.h b/macosx/MessageWindowController.h
index dbe97219ee04413afeb976e92bdb8225286ab01f..f125459768433ed918ef30e23e77dbd76c457348 100644 (file)
--- a/macosx/MessageWindowController.h
+++ b/macosx/MessageWindowController.h
@@ -32,7 +32,6 @@
     IBOutlet NSButton * fSaveButton, * fClearButton;
     
     NSMutableArray * fMessages;
-    NSUInteger fIndex;
     
     NSDictionary * fAttributes;
     

diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index 5b66cf7412ef42bae4c38d8c75218e4dd28b03c4..32b3581b6473ebd0e02abb797d6bc8e0fdcb3fed 100644 (file)
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -120,7 +120,6 @@
     }
     
     fMessages = [[NSMutableArray alloc] init];
-    fIndex = 0;
 }
 
 - (void) windowDidBecomeKey: (NSNotification *) notification
@@ -139,6 +138,8 @@
 
 - (void) updateLog: (NSTimer *) timer
 {
+    static NSUInteger currentIndex = 0;
+    
     tr_msg_list * messages;
     if ((messages = tr_getQueuedMessages()) == NULL)
         return;
@@ -151,7 +152,7 @@
         NSDictionary * message  = [NSDictionary dictionaryWithObjectsAndKeys:
                                     [NSString stringWithUTF8String: currentMessage->message], @"Message",
                                     [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
-                                    [NSNumber numberWithUnsignedInteger: fIndex++], @"Index", //more accurate when sorting by date
+                                    [NSNumber numberWithUnsignedInteger: currentIndex++], @"Index", //more accurate when sorting by date
                                     [NSNumber numberWithInteger: currentMessage->level], @"Level",
                                     name, @"Name",
                                     [NSString stringWithUTF8String: currentMessage->file], @"File",
@@ -163,7 +164,7 @@
     tr_freeMessageList(messages);
     
     NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
-    BOOL shouldScroll = [scroller floatValue] == 1.0 || [scroller isHidden] || [scroller knobProportion] == 1.0;
+    const BOOL shouldScroll = [scroller floatValue] == 1.0 || [scroller isHidden] || [scroller knobProportion] == 1.0;
     
     NSUInteger total = [fMessages count];
     if (total > MAX_MESSAGES)