adium-1.4 3244:ffd8f4929a6d: Updated the iChat emoticon set to b...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/ffd8f4929a6d
revision:	3244:ffd8f4929a6d
author:		Evan Schoenberg
date:		Sun Nov 14 09:32:46 2010 -0600

Updated the iChat emoticon set to be complete as of Mac OS X 10.5's version of iChat. Patch from quinntaylor - thanks. Fixes #14234
(transplanted from c700d3105427becb5052b01da753145391f77b60)

diffs (178 lines):

diff -r 3a23c59ac2ac -r ffd8f4929a6d Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist
--- a/Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist	Sun Nov 14 09:29:02 2010 -0600
+++ b/Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist	Sun Nov 14 09:32:46 2010 -0600
@@ -14,6 +14,16 @@
 	</array>
 	<key>Emoticons</key>
 	<dict>
+		<key>ambivalent</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>:-|</string>
+				<string>:|</string>
+			</array>
+			<key>Name</key>
+			<string>Thinking</string>
+		</dict>
 		<key>angry</key>
 		<dict>
 			<key>Equivalents</key>
@@ -26,6 +36,24 @@
 			<key>Name</key>
 			<string>Angry</string>
 		</dict>
+		<key>confused</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>:-S</string>
+			</array>
+			<key>Name</key>
+			<string>Confused</string>
+		</dict>
+		<key>crazy</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>%-)</string>
+			</array>
+			<key>Name</key>
+			<string>Crazy</string>
+		</dict>
 		<key>embarrassed</key>
 		<dict>
 			<key>Equivalents</key>
@@ -40,7 +68,7 @@
 		<dict>
 			<key>Equivalents</key>
 			<array>
-				<string>:'(</string>
+				<string>:'(</string>
 			</array>
 			<key>Name</key>
 			<string>Cry</string>
@@ -81,6 +109,25 @@
 			<key>Name</key>
 			<string>Gasp</string>
 		</dict>
+		<key>grin</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>^_^</string>
+				<string>:))</string>
+			</array>
+			<key>Name</key>
+			<string>Laugh</string>
+		</dict>
+		<key>heart</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string><3</string>
+			</array>
+			<key>Name</key>
+			<string>Heart</string>
+		</dict>
 		<key>laugh</key>
 		<dict>
 			<key>Equivalents</key>
@@ -95,7 +142,11 @@
 		<dict>
 			<key>Equivalents</key>
 			<array>
+				<string>(A)</string>
 				<string>O:-)</string>
+				<string>O:)</string>
+				<string>o:-)</string>
+				<string>o:)</string>
 			</array>
 			<key>Name</key>
 			<string>Halo</string>
@@ -174,6 +225,69 @@
 			<key>Name</key>
 			<string>Cool</string>
 		</dict>
+		<key>naughty</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>(6)</string>
+				<string>>:-)</string>
+				<string>>:)</string>
+				<string>>:-D</string>
+				<string>>:D</string>
+			</array>
+			<key>Name</key>
+			<string>Naughty</string>
+		</dict>
+		<key>nerd</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>:-B</string>
+			</array>
+			<key>Name</key>
+			<string>Nerd</string>
+		</dict>
+		<key>sarcastic</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>:-></string>
+				<string>:></string>
+				<string>^o)</string>
+			</array>
+			<key>Name</key>
+			<string>Sarcastic</string>
+		</dict>
+		<key>sick</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>:-&</string>
+				<string>+o(</string>
+			</array>
+			<key>Name</key>
+			<string>Sick</string>
+		</dict>
+		<key>thumbsdown</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>(N)</string>
+				<string>(n)</string>
+			</array>
+			<key>Name</key>
+			<string>Thumbs Down</string>
+		</dict>
+		<key>thumbsup</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>(Y)</string>
+				<string>(y)</string>
+			</array>
+			<key>Name</key>
+			<string>Thumbs Up</string>
+		</dict>
 		<key>wink</key>
 		<dict>
 			<key>Equivalents</key>
@@ -184,6 +298,15 @@
 			<key>Name</key>
 			<string>Wink</string>
 		</dict>
+		<key>yum</key>
+		<dict>
+			<key>Equivalents</key>
+			<array>
+				<string>:-d</string>
+			</array>
+			<key>Name</key>
+			<string>Yum</string>
+		</dict>
 	</dict>
 </dict>
 </plist>