Merged [21089]:
commit0169a6f581931959b63f2175af23cef46732a32f
authorEvan Schoenberg <evan@adiumx.com>
Thu, 20 Sep 2007 00:01:33 +0000 (20 00:01 +0000)
committerEvan Schoenberg <evan@adiumx.com>
Thu, 20 Sep 2007 00:01:33 +0000 (20 00:01 +0000)
tree097dc0c905617867ed5c72ee346080008a5ad00c
parent37984cd719af8fe29c91a3babe355beba28e2f77
Merged [21089]:
 * AIEmoticonPack now uses NSBundle to determine the path to an icon for an emoticon without regard to its extension. This also reverts [21084] since it is no longer needed.
 * Removed extensions specified in the iChat Emoticons.plist

git-svn-id: svn://svn.adiumx.com/adium/branches/adium-1.1@21090 1c916fce-81e2-0310-a464-8ca513f45935
Frameworks/Adium Framework/Source/AIEmoticonPack.h
Frameworks/Adium Framework/Source/AIEmoticonPack.m
Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist
Source/AIEmoticonController.m