From cc6eb92337f0da0ab44784e7a4a28d9d34795877 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 17 Mar 2008 10:17:45 +0000
Subject: additional mappings for existing emoticons. fixes #3762

---
 data/emoticons/static/emoticons.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'data/emoticons/static/emoticons.py')

diff --git a/data/emoticons/static/emoticons.py b/data/emoticons/static/emoticons.py
index 63cc117db..1507635c4 100644
--- a/data/emoticons/static/emoticons.py
+++ b/data/emoticons/static/emoticons.py
@@ -1,11 +1,11 @@
 # coding=utf-8
 emoticons = {
-	'smile.png': [':)', ':-)'],
+	'smile.png': [':)', ':-)', '^_^', '^^'],
 	'coolglasses.png': ['8-)', 'B-)', '(H)'],
 	'wink.png': [';)', ';-)'],
 	'biggrin.png': [':D', ':-D', ':>', ':->', 'xD'],
 	'unhappy.png': [':(', ':-('],
-	'cry.png': [":'(", ';-(', ';(', ";'-("],
+	'cry.png': [":'(", ';-(', ';(', ";'-(", ';_;'],
 	'frowning.png': [':/', ':-/', ':S', ':-S'],
 	'blush.png': [':$', ':-$'],
 	'angry.png': [':@', ':-@'],
@@ -13,11 +13,11 @@ emoticons = {
 	'kiss.png': [':*', ':-*', '(K)'],
 	'stare.png': [':|', ':-|'],
 	'devil.png': ['>:)', '>:-)', '(6)'],
-	'tongue.png': [':P', ':-P'],
-	'oh.png': [':O', ':-O'],
+	'tongue.png': [':P', ':-P', ':-þ', ':þ'],
+	'oh.png': [':O', ':-O', 'O.O', 'O_O'],
 	'heart.png': ['<3', '(L)'],
 	'lion.png': [':3', '>:3'],
-	'pussy.png': ['(@)'],
+	'pussy.png': ['(@)', '=^.^='],
 	'cuffs.png': ['(%)'],
 	'moon.png': ['(S)'],
 	'lamp.png': ['(I)'],
@@ -31,7 +31,7 @@ emoticons = {
 	'photo.png': ['(P)'],
 	'thumbup.png': ['(Y)'],
 	'hugleft.png': ['(})'],
-	'brheart.png': ['(U)'],
+	'brheart.png': ['(U)', '</3'],
 	'flower.png': ['(F)'],
 	'drink.png': ['(D)'],
 	'phone.png': ['(T)'],
-- 
cgit v1.2.3