update news and credits; put file name and line number in inspector tooltips

AUTHORS

@@ -66,7 +66,7 @@ Other Contributors
 Third-Party Resources
 Thanks to:
         Niels Provos for use of libevent <http://monkey.org/~provos/libevent/>
-	Thomas Bernard for use of MiniUPnP. <http://miniupnp.tuxfamily.org/>
+	Thomas Bernard for use of MiniUPnP and libnatpmp. <http://miniupnp.tuxfamily.org/>
         The Growl Development Team for use of Growl. <http://growl.info/>
         Andy Matuschak for use of Sparkle. <http://sparkle.andymatuschak.org/>
         M. Uli Kusterer for use of UKKQueue.

NEWS

@@ -2,7 +2,7 @@ NEWS file for Transmission <http://transmission.m0k.org/>
 
 1.00 (zzzz/xx/yy)
 - All Platforms:
-   + UPnP now performed by MiniUPnP
+   + Port forwarding now performed by MiniUPnP and libnatpmp
    + Option to prefer not using encryption
    + Restore `scrape' feature in the command-line interface client
    + Updated icon

macosx/Credits.rtf

@@ -148,7 +148,7 @@ Image Contributors
 
 \b0 Thanks to:\
 	Niels Provos for use of libevent. <http://monkey.org/~provos/libevent/>\
-	Thomas Bernard for use of MiniUPnP. <http://miniupnp.tuxfamily.org/>\
+	Thomas Bernard for use of MiniUPnP and libnatpmp. <http://miniupnp.tuxfamily.org/>\
 	The Growl Development Team for use of Growl. <http://growl.info/>\
 	Andy Matuschak for use of Sparkle. <http://sparkle.andymatuschak.org/>\
 	M. Uli Kusterer for use of UKKQueue.}

macosx/MessageWindowController.m

@@ -113,11 +113,22 @@
     if ((messages = tr_getQueuedMessages()) == NULL)
         return;
     
+    NSMutableDictionary * message;
     for (currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
-        [fMessages addObject: [NSDictionary dictionaryWithObjectsAndKeys:
-                                [NSString stringWithUTF8String: currentMessage->message], @"Message",
-                                [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
-                                [NSNumber numberWithInt: currentMessage->level], @"Level", nil]];
+    {
+        message  = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                    [NSString stringWithUTF8String: currentMessage->message], @"Message",
+                    [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
+                    [NSNumber numberWithInt: currentMessage->level], @"Level", nil];
+        
+        if (currentMessage->file != NULL)
+        {
+            [message setObject: [NSString stringWithUTF8String: currentMessage->file] forKey: @"File"];
+            [message setObject: [NSNumber numberWithInt: currentMessage->line] forKey: @"Line"];
+        }
+                                
+        [fMessages addObject: message];
+    }
     
     tr_freeMessageList(messages);
     
@@ -319,7 +330,15 @@
             level = @"";
     }
     
-    return [NSString stringWithFormat: @"%@ [%@] %@", [message objectForKey: @"Date"], level, [message objectForKey: @"Message"]];
+    NSString * fileString, * file = [message objectForKey: @"File"];
+    if ((file = [message objectForKey: @"File"]))
+        fileString = [NSString stringWithFormat: @" %@:%d", [message objectForKey: @"File"],
+                                        [[message objectForKey: @"Line"] intValue]];
+    else
+        fileString = @"";
+    
+    return [NSString stringWithFormat: @"%@%@ [%@] %@", [message objectForKey: @"Date"], fileString, level,
+                                                            [message objectForKey: @"Message"]];
 }
 
 @end