Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/jabber/google.c	Wed Dec 09 03:52:00 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Fri Dec 11 00:21:45 2009 +0000
@@ -1421,7 +1421,7 @@
 	                        NULL, NULL);
 	if (chat) {
 		chat->muc = TRUE;
-		jabber_chat_invite(gc, chat->id, "", buddy->name);
+		jabber_chat_invite(gc, chat->id, "", purple_buddy_get_name(buddy));
 	}
 
 	g_free(room);

--- a/libpurple/protocols/myspace/user.c	Wed Dec 09 03:52:00 2009 +0000
+++ b/libpurple/protocols/myspace/user.c	Fri Dec 11 00:21:45 2009 +0000
@@ -54,11 +54,13 @@
 
 	user = purple_buddy_get_protocol_data(buddy);
 	if (create && !user) {
+		PurpleBlistNode *node = PURPLE_BLIST_NODE(buddy);
+
 		/* No MsimUser for this buddy; make one. */
 
 		user = g_new0(MsimUser, 1);
 		user->buddy = buddy;
-		user->id = purple_blist_node_get_int(&buddy->node, "UserID");
+		user->id = purple_blist_node_get_int(node, "UserID");
 		purple_buddy_set_protocol_data(buddy, user);
 	}