comparison finch/gntsound.c @ 27760:e9cf897bd873

propagate from branch 'im.pidgin.pidgin' (head ae7f8e3acb446776f833c3b44514295ae56184b3) to branch 'im.pidgin.pidgin.yaz' (head 952151791a1f3b4e3469a5621f4cfa2de608a8b8)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 30 Jan 2008 10:53:22 +0000
parents 5152a14d06a3
children b7be2d6f96a3
comparison
equal deleted inserted replaced
27759:54479172725e 27760:e9cf897bd873
21 * 21 *
22 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
23 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA 24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
25 */ 25 */
26 #include "internal.h"
27 #include "finch.h" 26 #include "finch.h"
28 27
29 #ifdef _WIN32 28 #ifdef _WIN32
30 #include <windows.h> 29 #include <windows.h>
31 #include <mmsystem.h> 30 #include <mmsystem.h>
140 { 139 {
141 PurpleConvChat *chat = NULL; 140 PurpleConvChat *chat = NULL;
142 char *nick = NULL; 141 char *nick = NULL;
143 char *name = NULL; 142 char *name = NULL;
144 gboolean ret = FALSE; 143 gboolean ret = FALSE;
144 PurpleAccount *account;
145
145 chat = purple_conversation_get_chat_data(conv); 146 chat = purple_conversation_get_chat_data(conv);
146
147 if (chat == NULL) 147 if (chat == NULL)
148 return ret; 148 return ret;
149 149
150 nick = g_strdup(purple_normalize(conv->account, chat->nick)); 150 account = purple_conversation_get_account(conv);
151 name = g_strdup(purple_normalize(conv->account, aname)); 151 nick = g_strdup(purple_normalize(account, chat->nick));
152 name = g_strdup(purple_normalize(account, aname));
152 153
153 if (g_utf8_collate(nick, name) == 0) 154 if (g_utf8_collate(nick, name) == 0)
154 ret = TRUE; 155 ret = TRUE;
155 156
156 g_free(nick); 157 g_free(nick);