Use O instead of 0 for smileys face-angel and face-surprise. Fixes bug #508520.

[empathy.git] / libempathy-gtk / empathy-smiley-manager.c

diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index cb726fcddef27afe9bd62092b02de2e33d966865..502af2d4eb887b99d905ba0c1ee4a5ca426310c6 100644 (file)
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -2,22 +2,22 @@
 /*
  * Copyright (C) 2007 Collabora Ltd.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * 
- * Authors: Xavier Claessens <xclaesse@gmail.com>
+ * Authors: Dafydd Harrie <dafydd.harries@collabora.co.uk>
+ *          Xavier Claessens <xclaesse@gmail.com>
  */
 
 #include <config.h>
@@ -266,19 +266,20 @@ empathy_smiley_manager_load (EmpathySmileyManager *manager)
        g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
 
        /* From fd.o icon-naming spec */
-       empathy_smiley_manager_add (manager, "face-angel",      "0:-)",  "0:)",  NULL);
+       empathy_smiley_manager_add (manager, "face-angel",      "O:-)",  "O:)",  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-devil-grin", ">:-)",  ">:)",  NULL);
-       empathy_smiley_manager_add (manager, "face-devil-sad",  ">:-(",  ">:(",  NULL);
-       empathy_smiley_manager_add (manager, "face-glasses",    "B-)",   "B)",   NULL);
+       empathy_smiley_manager_add (manager, "face-devilish",   ">:-)",  ">:)",  NULL);
+        empathy_smiley_manager_add (manager, "face-embarrassed",":-[",   ":[",   ":-$", ":$", NULL);
        empathy_smiley_manager_add (manager, "face-kiss",       ":-*",   ":*",   NULL);
        empathy_smiley_manager_add (manager, "face-monkey",     ":-(|)", ":(|)", NULL);
        empathy_smiley_manager_add (manager, "face-plain",      ":-|",   ":|",   NULL);
+        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-smile",      ":-)",   ":)",   NULL);
-       empathy_smiley_manager_add (manager, "face-smile-big",  ":-D",   ":D",   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",   ":-0",   ":0",   NULL);
+       empathy_smiley_manager_add (manager, "face-surprise",   ":-O",   ":O",   NULL);
        empathy_smiley_manager_add (manager, "face-wink",       ";-)",   ";)",   NULL);
 }