pidgin: 6ffba072: Fix Yahoo emoticon sets and make Yahoo-J...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 6ffba0724b246f1a87f83b1b19299aefcdd48142
Ancestor: 39fc4acd81cf1796220d3ed4fff0b17bc5acf6de
Author: darkrain42 at pidgin.im
Date: 2009-08-16T04:06:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6ffba0724b246f1a87f83b1b19299aefcdd48142

Modified files:
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c

ChangeLog: 

Fix Yahoo emoticon sets and make Yahoo-Japan consistent.

Sorry, rekkanoryo.

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/libyahoo.c	7fd6f0efe49d91771c7018051a9445a35cdcfc8b
+++ libpurple/protocols/yahoo/libyahoo.c	edbe55a4e456ef702fcea77291ee77210e87aed4
@@ -278,7 +278,7 @@ static PurplePluginInfo info =
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoo",                                     /**< id             */
-	"Yahoo!",	                                      /**< name           */
+	"Yahoo",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! Protocol Plugin"),
============================================================
--- libpurple/protocols/yahoo/libyahoojp.c	1f179cfb524cb18e66273aca1fdd80fd636ba2c3
+++ libpurple/protocols/yahoo/libyahoojp.c	d76e5cf4139ccc6f0c284cf06a1387e8f709eec5
@@ -174,7 +174,7 @@ static PurplePluginInfo info =
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoojp",                                     /**< id             */
-	"Yahoo! JAPAN",	                                      /**< name           */
+	"Yahoo JAPAN",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! JAPAN Protocol Plugin"),