# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250395581 0
# Node ID 6d3f3473cb4c805903a8110bedfb45c677c0954b
# Parent  6b05a0e36ffbbb772a0819703fed1512621b6417
Fix Yahoo emoticon sets and make Yahoo-Japan consistent.

Sorry, rekkanoryo.

diff -r 6b05a0e36ffb -r 6d3f3473cb4c libpurple/protocols/yahoo/libyahoo.c
--- a/libpurple/protocols/yahoo/libyahoo.c	Sun Aug 16 03:23:54 2009 +0000
+++ b/libpurple/protocols/yahoo/libyahoo.c	Sun Aug 16 04:06:21 2009 +0000
@@ -278,7 +278,7 @@
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoo",                                     /**< id             */
-	"Yahoo!",	                                      /**< name           */
+	"Yahoo",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! Protocol Plugin"),
diff -r 6b05a0e36ffb -r 6d3f3473cb4c libpurple/protocols/yahoo/libyahoojp.c
--- a/libpurple/protocols/yahoo/libyahoojp.c	Sun Aug 16 03:23:54 2009 +0000
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Sun Aug 16 04:06:21 2009 +0000
@@ -174,7 +174,7 @@
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoojp",                                     /**< id             */
-	"Yahoo! JAPAN",	                                      /**< name           */
+	"Yahoo JAPAN",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! JAPAN Protocol Plugin"),