adium-1.4 3129:26db2f9ac180: Credit "sorngard" for his contribut...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/26db2f9ac180
revision:	3129:26db2f9ac180
author:		Robert Vehse
date:		Sun Oct 24 15:05:02 2010 +0200

Credit "sorngard" for his contribution to the Norwegian localisation. Refs #13464.
Subject: adium-1.4 3130:f5d4f8a939d0: Merge

details:	http://hg.adium.im/adium-1.4/rev/f5d4f8a939d0
revision:	3130:f5d4f8a939d0
author:		Robert Vehse
date:		Sun Oct 24 15:06:45 2010 +0200

Merge

diffs (52 lines):

diff -r c6a273de6355 -r f5d4f8a939d0 Frameworks/Adium Framework/Source/AIXMLElement.m
--- a/Frameworks/Adium Framework/Source/AIXMLElement.m	Sat Oct 23 13:34:43 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIXMLElement.m	Sun Oct 24 15:06:45 2010 +0200
@@ -197,8 +197,11 @@
 - (void)addEscapedObject:(id)obj
 {
 	//Warn but don't assert if null is added.  Adding nothing is a no-op, but we may want to investigate where this is happening further.
-	if (!obj) NSLog(@"Warning: Attempted to add (null) to %@", obj);
-
+	if (!obj) {
+		NSLog(@"Attempted to add null to AIXMLElement %@, backtrace available in debug mode", obj);
+		AILogWithBacktrace(@"Warning: Attempted to add (null) to AIXMLElement %@", obj);
+		return;
+	}
 	NSAssert2(([obj isKindOfClass:[NSString class]] || [obj isKindOfClass:[AIXMLElement class]]), @"%@: addObject: %@ is of incorrect class",self,obj);
 	
 	[contents addObject:obj];
diff -r c6a273de6355 -r f5d4f8a939d0 Resources/Credits.rtf
--- a/Resources/Credits.rtf	Sat Oct 23 13:34:43 2010 +0200
+++ b/Resources/Credits.rtf	Sun Oct 24 15:06:45 2010 +0200
@@ -202,6 +202,9 @@
 	Sebastian Sebus\'e6ter  
 \fs20 (Norwegian Bokm\'e5l)
 \fs24 \
+	Erik S\'f8rng\'e5rd  
+\fs20 (Norwegian Bokm\'e5l)
+\fs24 \
 	\uc0\u1040 \u1085 \u1090 \u1086 \u1085  \u1057 \u1086 \u1090 \u1082 \u1086 \u1074   
 \fs20 (Russian)
 \fs24 \
diff -r c6a273de6355 -r f5d4f8a939d0 Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/Content.html	Sat Oct 23 13:34:43 2010 +0200
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/Content.html	Sun Oct 24 15:06:45 2010 +0200
@@ -7,7 +7,7 @@
 		<div class="x-sender">%sender%</div>
 	</div>
 	<div class="x-message">
-		<div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
+		<div class="x-time" title="%time{dd MMM yyyy}%" onclick="style.display='none'">%time%</div>
 		<div class="x-text">%message%</div>
 	</div>
 	<div id="insert"></div>
diff -r c6a273de6355 -r f5d4f8a939d0 Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html	Sat Oct 23 13:34:43 2010 +0200
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html	Sun Oct 24 15:06:45 2010 +0200
@@ -1,5 +1,5 @@
 <div class="x-message %messageClasses% %service% %userIcons%">
-	<div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
+	<div class="x-time" title="%time{dd MMM yyyy}%" onclick="style.display='none'">%time%</div>
 	<div class="x-text">%message%</div>
 </div>
 <div id="insert"></div>