]> git.0d.be Git - empathy.git/commitdiff
Be more compatible with Facebook emoticon codes
authorGiovanni Campagna <gcampagna@src.gnome.org>
Mon, 28 Jan 2013 09:21:49 +0000 (10:21 +0100)
committerGiovanni Campagna <gcampagna@src.gnome.org>
Sun, 15 Jun 2014 14:19:40 +0000 (16:19 +0200)
Since we support Facebook chat, and interoperate with the chat from the
browser, we need to support roughly the same emoticon codes.

https://bugzilla.gnome.org/show_bug.cgi?id=692689

libempathy-gtk/empathy-smiley-manager.c

index 44ea817becd583c2122794504e597b3b41d11166..47a60640db78c82845a737e00fb1ab74f3b5f74f 100644 (file)
@@ -269,10 +269,11 @@ empathy_smiley_manager_load (EmpathySmileyManager *manager)
        /* From fd.o icon-naming spec */
        empathy_smiley_manager_add (manager, "face-angel",      "O:-)",  "O:)",  NULL);
        empathy_smiley_manager_add (manager, "face-angry",      "X-(",   ":@",   NULL);
-       empathy_smiley_manager_add (manager, "face-cool",       "B-)",   NULL);
+       empathy_smiley_manager_add (manager, "face-cool",       "B-)",   "B-|",  NULL);
        empathy_smiley_manager_add (manager, "face-crying",     ":'(",           NULL);
        empathy_smiley_manager_add (manager, "face-devilish",   ">:-)",  ">:)",  NULL);
        empathy_smiley_manager_add (manager, "face-embarrassed",":-[",   ":[",   ":-$", ":$", NULL);
+       empathy_smiley_manager_add (manager, "face-glasses",    "8-)",   NULL);
        empathy_smiley_manager_add (manager, "face-kiss",       ":-*",   ":*",   NULL);
        empathy_smiley_manager_add (manager, "face-laugh",      ":-))",  ":))",  NULL);
        empathy_smiley_manager_add (manager, "face-monkey",     ":-(|)", ":(|)", NULL);
@@ -280,14 +281,16 @@ empathy_smiley_manager_load (EmpathySmileyManager *manager)
        empathy_smiley_manager_add (manager, "face-raspberry",  ":-P",   ":P",   ":-p", ":p", NULL);
        empathy_smiley_manager_add (manager, "face-sad",        ":-(",   ":(",   NULL);
        empathy_smiley_manager_add (manager, "face-sick",       ":-&",   ":&",   NULL);
-       empathy_smiley_manager_add (manager, "face-smile",      ":-)",   ":)",   NULL);
+       empathy_smiley_manager_add (manager, "face-smile",      ":-)",   ":)",   ":]",  "=)", NULL);
        empathy_smiley_manager_add (manager, "face-smile-big",  ":-D",   ":D",   ":-d", ":d", NULL);
        empathy_smiley_manager_add (manager, "face-smirk",      ":-!",   ":!",   NULL);
        empathy_smiley_manager_add (manager, "face-surprise",   ":-O",   ":O",   ":-o", ":o", NULL);
        empathy_smiley_manager_add (manager, "face-tired",      "|-)",   "|)",   NULL);
-       empathy_smiley_manager_add (manager, "face-uncertain",  ":-/",   ":/",   NULL);
+       empathy_smiley_manager_add (manager, "face-uncertain",  ":-/",   ":/",   ":-\\", ":\\", NULL);
        empathy_smiley_manager_add (manager, "face-wink",       ";-)",   ";)",   NULL);
        empathy_smiley_manager_add (manager, "face-worried",    ":-S",   ":S",   ":-s", ":s", NULL);
+
+       empathy_smiley_manager_add (manager, "emblem-favorite", "<3", NULL);
 }
 
 static EmpathySmileyHit *