# HG changeset patch
# User andrew.victor@mxit.com
# Date 1317466935 0
# Node ID 1d09b907718179db147a6c37a7cf05f1cf80a313
# Parent  1714dc991a71229ae9d5a7592432799d1efa675d
Use purple_conv_chat_get_nick() rather than accessing chat->nick directly.

diff -r 1714dc991a71 -r 1d09b9077181 finch/gntsound.c
--- a/finch/gntsound.c	Thu Sep 29 05:03:40 2011 +0000
+++ b/finch/gntsound.c	Sat Oct 01 11:02:15 2011 +0000
@@ -150,7 +150,7 @@
 		return ret;
 
 	account = purple_conversation_get_account(conv);
-	nick = g_strdup(purple_normalize(account, chat->nick));
+	nick = g_strdup(purple_normalize(account, purple_conv_chat_get_nick(chat)));
 	name = g_strdup(purple_normalize(account, aname));
 
 	if (g_utf8_collate(nick, name) == 0)
@@ -268,7 +268,7 @@
 	if (chat_nick_matches_name(conv, sender))
 		return;
 
-	if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, chat->nick))
+	if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, purple_conv_chat_get_nick(chat)))
 		play_conv_event(conv, PURPLE_SOUND_CHAT_NICK);
 	else
 		play_conv_event(conv, event);
diff -r 1714dc991a71 -r 1d09b9077181 finch/plugins/gntgf.c
--- a/finch/plugins/gntgf.c	Thu Sep 29 05:03:40 2011 +0000
+++ b/finch/plugins/gntgf.c	Sat Oct 01 11:02:15 2011 +0000
@@ -256,7 +256,7 @@
 	if (flags & PURPLE_MESSAGE_WHISPER)
 		return;
 
-	nick = PURPLE_CONV_CHAT(conv)->nick;
+	nick = purple_conv_chat_get_nick(PURPLE_CONV_CHAT(conv));
 
 	if (g_utf8_collate(sender, nick) == 0)
 		return;
diff -r 1714dc991a71 -r 1d09b9077181 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu Sep 29 05:03:40 2011 +0000
+++ b/pidgin/gtkconv.c	Sat Oct 01 11:02:15 2011 +0000
@@ -1657,7 +1657,7 @@
 	if (menu)
 		gtk_widget_destroy(menu);
 
-	if (!strcmp(chat->nick, purple_normalize(conv->account, who)))
+	if (!strcmp(purple_conv_chat_get_nick(chat), purple_normalize(conv->account, who)))
 		is_me = TRUE;
 
 	menu = gtk_menu_new();
@@ -4070,7 +4070,7 @@
 
 	stock = get_chat_buddy_status_icon(chat, name, flags);
 
-	if (!strcmp(chat->nick, purple_normalize(conv->account, old_name != NULL ? old_name : name)))
+	if (!strcmp(purple_conv_chat_get_nick(chat), purple_normalize(conv->account, old_name != NULL ? old_name : name)))
 		is_me = TRUE;
 
 	is_buddy = cb->buddy;
@@ -4474,7 +4474,7 @@
 			char *alias_key = NULL;
 			PurpleBuddy *buddy2;
 
-			if (strcmp(chat->nick, purple_normalize(conv->account, name))) {
+			if (strcmp(purple_conv_chat_get_nick(chat), purple_normalize(conv->account, name))) {
 				/* This user is not me, so look into updating the alias. */
 
 				if ((buddy2 = purple_find_buddy(conv->account, name)) != NULL) {
diff -r 1714dc991a71 -r 1d09b9077181 pidgin/gtksound.c
--- a/pidgin/gtksound.c	Thu Sep 29 05:03:40 2011 +0000
+++ b/pidgin/gtksound.c	Sat Oct 01 11:02:15 2011 +0000
@@ -96,7 +96,7 @@
 	if (chat==NULL)
 		return ret;
 
-	nick = g_strdup(purple_normalize(conv->account, chat->nick));
+	nick = g_strdup(purple_normalize(conv->account, purple_conv_chat_get_nick(chat)));
 	name = g_strdup(purple_normalize(conv->account, aname));
 
 	if (g_utf8_collate(nick, name) == 0)
@@ -212,7 +212,7 @@
 	if (chat_nick_matches_name(conv, sender))
 		return;
 
-	if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, chat->nick))
+	if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, purple_conv_chat_get_nick(chat)))
 		/* This isn't quite right; if you have the PURPLE_SOUND_CHAT_NICK event disabled
 		 * and the PURPLE_SOUND_CHAT_SAY event enabled, you won't get a sound at all */
 		play_conv_event(conv, PURPLE_SOUND_CHAT_NICK);