data/emoticons/noto-emoticons/emoticons_theme.py

@@ -10,7 +10,7 @@
         ('u263a.png', None),  # Category image
 
         # subgroup: face-positive
-        ('u1f600.png', [u'\U0001f600']),
+        ('u1f600.png', [u'\U0001f600', ':>']),
         ('u1f601.png', [u'\U0001f601']),
         ('u1f602.png', [u'\U0001f602', ':\'-)', ':\')']),
         ('u1f923.png', [u'\U0001f923']),
@@ -40,9 +40,9 @@
         ('u1f60f.png', [u'\U0001f60f']),
         ('u1f623.png', [u'\U0001f623']),
         ('u1f625.png', [u'\U0001f625']),
-        ('u1f62e.png', [u'\U0001f62e']),
+        ('u1f62e.png', [u'\U0001f62e', '=-O', ':-O', ':O']),
         ('u1f910.png', [u'\U0001f910']),
-        ('u1f62f.png', [u'\U0001f62f']),
+        ('u1f62f.png', [u'\U0001f62f', ':o']),
         ('u1f62a.png', [u'\U0001f62a']),
         ('u1f62b.png', [u'\U0001f62b']),
         ('u1f634.png', [u'\U0001f634']),
@@ -57,7 +57,7 @@
         ('u1f615.png', [u'\U0001f615']),
         ('u1f643.png', [u'\U0001f643']),
         ('u1f911.png', [u'\U0001f911']),
-        ('u1f632.png', [u'\U0001f632', '=-O', ':-O', ':O']),
+        ('u1f632.png', [u'\U0001f632']),
 
         # subgroup: face-negative
         ('u2639.png', [u'\u2639', ':-/', ':/', ':-\\', ':\\', ':-S', ':S', ':-[', ':[']),

gajim/conversation_textview.py

@@ -918,13 +918,12 @@ def print_special_text(self, special_text, other_tags, graphics=True,
             if special_text.startswith(scheme):
                 text_is_valid_uri = True
 
-        possible_emot_ascii_caps = special_text.upper() # emoticons keys are CAPS
         if iter_:
             end_iter = iter_
         else:
             end_iter = buffer_.get_end_iter()
 
-        pixbuf = emoticons.get_pixbuf(possible_emot_ascii_caps)
+        pixbuf = emoticons.get_pixbuf(special_text)
         if app.config.get('emoticons_theme') and pixbuf and graphics:
             # it's an emoticon
             anchor = buffer_.create_child_anchor(end_iter)

gajim/emoticons.py

@@ -87,9 +87,9 @@ def load(path):
     def add_emoticon(codepoint_, sub, mod_list=None):
         pix = sub.get_pixbuf()
         for alternate in codepoint_:
-            codepoints[alternate.upper()] = pix
+            codepoints[alternate] = pix
             if pix not in pixbufs:
-                pixbufs[pix] = alternate.upper()
+                pixbufs[pix] = alternate
         if mod_list is not None:
             mod_list.append(pix)
         else: