pidgin: 9a12b2d6: Update nullprpl for various API changes.

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 9a12b2d64fb3d39ea55be4824c30725240ac4969
Parent:   112b6b396236acf13610cd6d5f3a3cfc769d897a
Author:   andrew.victor at mxit.com
Date:     08/29/11 18:14:23
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9a12b2d64fb3d39ea55be4824c30725240ac4969

Changelog: 

Update nullprpl for various API changes.


Changes against parent 112b6b396236acf13610cd6d5f3a3cfc769d897a

  patched  libpurple/protocols/null/nullprpl.c

-------------- next part --------------
============================================================
--- libpurple/protocols/null/nullprpl.c	05be395e5c95930d2d8baa349ffbb5e724b054b9
+++ libpurple/protocols/null/nullprpl.c	478cc82cb7c387d165edfb4b1c658645b55d2d8f
@@ -260,7 +260,7 @@ static void nullprpl_tooltip_text(Purple
     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 @@ static void nullprpl_tooltip_text(Purple
       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 @@ static void nullprpl_get_info(PurpleConn
     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(Pur
 }
 
 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... */