From 10e386121ba4948552718ab9defe06e1f5e194b1 Mon Sep 17 00:00:00 2001
From: js <js-gajim@webkeks.org>
Date: Tue, 26 Aug 2008 13:32:44 +0000
Subject: [PATCH] Fix #4087.

---
 data/emoticons/animated/emoticons.py   | 11 +++++------
 data/emoticons/static-big/emoticons.py | 10 +++++-----
 data/emoticons/static/emoticons.py     | 10 +++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/data/emoticons/animated/emoticons.py b/data/emoticons/animated/emoticons.py
index cf6d79f83..59591e6cc 100644
--- a/data/emoticons/animated/emoticons.py
+++ b/data/emoticons/animated/emoticons.py
@@ -1,11 +1,11 @@
 # coding=utf-8
 emoticons = {
-	'smile.png': [':-)', ':)', '^_^', '^^'],
+	'smile.png': [':-)', ':)'],
 	'coolglasses.png': ['B-)', '(H)'],
 	'wink.gif': [';-)', ';)'],
-	'biggrin.png': [':-D', ':D', ':->', ':>', 'xD'],
+	'biggrin.png': [':-D', ':D'],
 	'unhappy.png': [':-(', ':('],
-	'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-(", ';_;'],
+	'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("],
 	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
 	'blush.png': [':-$', ':$'],
 	'angry.png': [':-@', ':@'],
@@ -14,7 +14,7 @@ emoticons = {
 	'stare.png': [':-|', ':|'],
 	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
 	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': ['=-O', ':-O', ':O', 'O.O', 'O_O'],
+	'oh.png': ['=-O', ':-O', ':O'],
 	'heart.png': ['<3', '(L)', '*IN LOVE*'],
 	'pussy.png': ['(@)'],
 	'cuffs.png': ['(%)'],
@@ -49,5 +49,4 @@ emoticons = {
 	'puke.gif': [':-!'],
 }
 
-
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/data/emoticons/static-big/emoticons.py b/data/emoticons/static-big/emoticons.py
index 34d47c822..3c2d08b72 100644
--- a/data/emoticons/static-big/emoticons.py
+++ b/data/emoticons/static-big/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'],
+	'biggrin.png': [':-D', ':D'],
 	'unhappy.png': [':-(', ':('],
-	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-(", ';_;'],
+	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
 	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
 	'blush.png': [':-$', ':$'],
 	'angry.png': [':-@', ':@'],
@@ -14,7 +14,7 @@ emoticons = {
 	'stare.png': [':-|', ':|'],
 	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
 	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': ['=-O', ':-O', ':O', 'O.O', 'O_O'],
+	'oh.png': ['=-O', ':-O', ':O'],
 	'heart.png': ['<3', '(L)', '*IN LOVE*'],
 	'lion.png': [':3', '>:3'],
 	'pussy.png': ['(@)', '=^.^='],
@@ -42,4 +42,4 @@ emoticons = {
 	'puke.png': [':-!'],
 }
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/data/emoticons/static/emoticons.py b/data/emoticons/static/emoticons.py
index 34d47c822..3c2d08b72 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'],
+	'biggrin.png': [':-D', ':D'],
 	'unhappy.png': [':-(', ':('],
-	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-(", ';_;'],
+	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
 	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
 	'blush.png': [':-$', ':$'],
 	'angry.png': [':-@', ':@'],
@@ -14,7 +14,7 @@ emoticons = {
 	'stare.png': [':-|', ':|'],
 	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
 	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': ['=-O', ':-O', ':O', 'O.O', 'O_O'],
+	'oh.png': ['=-O', ':-O', ':O'],
 	'heart.png': ['<3', '(L)', '*IN LOVE*'],
 	'lion.png': [':3', '>:3'],
 	'pussy.png': ['(@)', '=^.^='],
@@ -42,4 +42,4 @@ emoticons = {
 	'puke.png': [':-!'],
 }
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3: