# HG changeset patch # User andrew.victor@mxit.com # Date 1314656063 0 # Node ID 1d8d8649f01542b8d3d8c8bfda03507d49c450dc # Parent 750ab90748a5f13cb60d3e33c8613aa333ed01be Update nullprpl for various API changes. diff -r 750ab90748a5 -r 1d8d8649f015 libpurple/protocols/null/nullprpl.c --- a/libpurple/protocols/null/nullprpl.c Mon Aug 29 22:08:01 2011 +0000 +++ b/libpurple/protocols/null/nullprpl.c Mon Aug 29 22:14:23 2011 +0000 @@ -260,7 +260,7 @@ char *msg = nullprpl_status_text(buddy); /* TODO: Check whether it's correct to call add_pair_html, or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair(info, purple_status_get_name(status), + purple_notify_user_info_add_pair_html(info, purple_status_get_name(status), msg); g_free(msg); @@ -269,7 +269,7 @@ if (user_info) /* TODO: Check whether it's correct to call add_pair_html, or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair(info, _("User info"), user_info); + purple_notify_user_info_add_pair_html(info, _("User info"), user_info); } } else { @@ -516,7 +516,7 @@ body = _("No user info."); /* TODO: Check whether it's correct to call add_pair_html, or if we should be using add_pair_plaintext */ - purple_notify_user_info_add_pair(info, "Info", body); + purple_notify_user_info_add_pair_html(info, "Info", body); /* show a buddy's user info in a nice dialog box */ purple_notify_userinfo(gc, /* connection the buddy info came through */ @@ -1019,14 +1019,17 @@ } static void nullprpl_roomlist_cancel(PurpleRoomlist *list) { + PurpleAccount *account = purple_roomlist_get_account(list); purple_debug_info("nullprpl", "%s asked to cancel room list request\n", - list->account->username); + purple_account_get_username(account)); } static void nullprpl_roomlist_expand_category(PurpleRoomlist *list, PurpleRoomlistRoom *category) { + PurpleAccount *account = purple_roomlist_get_account(list); purple_debug_info("nullprpl", "%s asked to expand room list category %s\n", - list->account->username, category->name); + purple_account_get_username(account), + purple_roomlist_room_get_name(category)); } /* nullprpl doesn't support file transfer...yet... */