gobjectification: 7e1c6f45: Fix MSN compile.

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 7e1c6f45732729b1cc66781f727fcbf8ec0ef770
Ancestor: a5982c8bd0b501b73e7c0fc0685bd7228b5e76ae
Author: qulogic at pidgin.im
Date: 2008-08-11T07:07:45
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/7e1c6f45732729b1cc66781f727fcbf8ec0ef770

Modified files:
        libpurple/protocols/msn/msn.c

ChangeLog: 

Fix MSN compile.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c	4f765af1177e39e3e3c76748eb5d3cc106dc56b2
+++ libpurple/protocols/msn/msn.c	b0434cd84acc044f480b1132475809761733d983
@@ -532,6 +532,11 @@ initiate_chat_cb(PurpleBlistNode *node, 
 	swboard->conv = serv_got_joined_chat(gc, swboard->chat_id, "MSN Chat");
 	swboard->flag = MSN_SB_FLAG_IM;
 
+	/* Local alias > Display name > Username */
+	if ((alias = purple_account_get_alias(buddy->account)) == NULL)
+		if ((alias = purple_connection_get_display_name(gc)) == NULL)
+			alias = purple_account_get_username(buddy->account);
+
 	purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv),
 	                          alias, NULL, PURPLE_CBFLAGS_NONE, TRUE);
 }
@@ -591,7 +596,7 @@ msn_can_receive_file(PurpleConnection *g
 	g_free(normal);
 
 	if (ret) {
-		MsnSession *session = gc->proto_data;
+		MsnSession *session = purple_object_get_protocol_data(PURPLE_OBJECT(gc));
 		if (session) {
 			MsnUser *user = msn_userlist_find_user(session->userlist, who);
 			if (user)