diff options
| author | Giovanni Campagna <gcampagna@src.gnome.org> | 2013-01-28 17:21:49 +0800 |
|---|---|---|
| committer | Giovanni Campagna <gcampagna@src.gnome.org> | 2014-06-15 22:19:40 +0800 |
| commit | 1d7db6929a00bf0fc87be40e3a9628ff6bed473a (patch) | |
| tree | e016c64108ee596b801818924ca7d26ffcbfa36f | |
| parent | 1460786fe3362c7b33a3f37f8f353e391e267566 (diff) | |
| download | gsoc2013-empathy-1d7db6929a00bf0fc87be40e3a9628ff6bed473a.tar gsoc2013-empathy-1d7db6929a00bf0fc87be40e3a9628ff6bed473a.tar.gz gsoc2013-empathy-1d7db6929a00bf0fc87be40e3a9628ff6bed473a.tar.bz2 gsoc2013-empathy-1d7db6929a00bf0fc87be40e3a9628ff6bed473a.tar.lz gsoc2013-empathy-1d7db6929a00bf0fc87be40e3a9628ff6bed473a.tar.xz gsoc2013-empathy-1d7db6929a00bf0fc87be40e3a9628ff6bed473a.tar.zst gsoc2013-empathy-1d7db6929a00bf0fc87be40e3a9628ff6bed473a.zip | |
Be more compatible with Facebook emoticon codes
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
| -rw-r--r-- | libempathy-gtk/empathy-smiley-manager.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c index 44ea817be..47a60640d 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -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 * |