From a2933ec175a6456cdcd7fcf12e7437c25c6b2dc3 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sat, 8 Dec 2007 20:17:25 +0000
Subject: [PATCH] update message log and strings file

---
 macosx/English.lproj/Localizable.strings | Bin 49520 -> 49878 bytes
 macosx/MessageWindowController.m         |   9 +++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings
index feeb932161c9d11cd9548e5f3a0456f4e3d0cf47..438ef03796f29e4809b5f1520bd8aa1d526313ce 100644
GIT binary patch
delta 376
zcmey+#C)xlc|(fk<e)SgRY!&bAk1N?WKdvm1kyPSN<fw^5Gw)sP`Sw;E5#?P#0X42
zz|S`Mg{=W6LPjx0bh1G;2a1T|WIeBt$$ERaHXqWQpg4Jl_le0;K3tO*cuPz+*k?7l
z$D3<&gU==L$$XnsCZ%vpR!EJQd_awB@|k3X$^X(MCTFE2OfC?Unq0R{Wb(396QDCS
zKuRa~rSUN9Gbl_xUMW9$RT>X3kj)UpkjhZZP|A=yd1IO++=(|*9N?<?t2HNoNQda;
zuU4FVj)w<mVg=aLe`z&vJwR`P^i2MfE(G!rP>&W|?#E`6$pV=?o3k<&34lUvvOqQ8
j<ZG2iU_<Px8sG|NRN76Jt9FC)K^hZk_%`pT-r))WGN^;U

delta 296
zcmccC%KV{;c|(fkWQTomn=fchP@LpxHCfJAXL5qiiOqe!m&7OYrBzJ6kfJp?A+=?)
zLy+F&Eomm~0St)@r3}TB?HyDnJNSuAK9I>Z*(h5?T#3P&feQ%r8MGJ_7@(>cQYR;B
z+5^?_OkS2@z=;rTtahHvlg%@krAB75U8W6^sh&X90Z4q+$^SA`CNIcR1F93*ydWz>
zVDbk`7S>{*BXYrxFsN3T>{Kf@`H`j2WRG-#$yu6alaJN%O>Ri%n7l57W3msJEdtU7
cmhY-wgkpjxM0JfDil{2k^Aei{YLB@B01TpLLjV8(

diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index 9fb1a9564..f11934913 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -330,12 +330,9 @@
             level = @"";
     }
     
-    NSString * fileString, * file = [message objectForKey: @"File"];
-    if ((file = [message objectForKey: @"File"]))
-        fileString = [NSString stringWithFormat: @" %@:%d", [message objectForKey: @"File"],
-                                        [[message objectForKey: @"Line"] intValue]];
-    else
-        fileString = @"";
+    NSString * file = [message objectForKey: @"File"],
+        * fileString = file ? [NSString stringWithFormat: @" %@:%@", [message objectForKey: @"File"], [message objectForKey: @"Line"]]
+                            : @"";
     
     return [NSString stringWithFormat: @"%@%@ [%@] %@", [message objectForKey: @"Date"], fileString, level,
                                                             [message objectForKey: @"Message"]];