Mercurial > pidgin.yaz
comparison libpurple/protocols/null/nullprpl.c @ 32443:1d8d8649f015
Update nullprpl for various API changes.
| author | andrew.victor@mxit.com |
|---|---|
| date | Mon, 29 Aug 2011 22:14:23 +0000 |
| parents | e8d4755ef84b |
| children | cd1d9e04c587 |
comparison
equal
deleted
inserted
replaced
| 32442:750ab90748a5 | 32443:1d8d8649f015 |
|---|---|
| 258 PurplePresence *presence = purple_buddy_get_presence(buddy); | 258 PurplePresence *presence = purple_buddy_get_presence(buddy); |
| 259 PurpleStatus *status = purple_presence_get_active_status(presence); | 259 PurpleStatus *status = purple_presence_get_active_status(presence); |
| 260 char *msg = nullprpl_status_text(buddy); | 260 char *msg = nullprpl_status_text(buddy); |
| 261 /* TODO: Check whether it's correct to call add_pair_html, | 261 /* TODO: Check whether it's correct to call add_pair_html, |
| 262 or if we should be using add_pair_plaintext */ | 262 or if we should be using add_pair_plaintext */ |
| 263 purple_notify_user_info_add_pair(info, purple_status_get_name(status), | 263 purple_notify_user_info_add_pair_html(info, purple_status_get_name(status), |
| 264 msg); | 264 msg); |
| 265 g_free(msg); | 265 g_free(msg); |
| 266 | 266 |
| 267 if (full) { | 267 if (full) { |
| 268 const char *user_info = purple_account_get_user_info(gc->account); | 268 const char *user_info = purple_account_get_user_info(gc->account); |
| 269 if (user_info) | 269 if (user_info) |
| 270 /* TODO: Check whether it's correct to call add_pair_html, | 270 /* TODO: Check whether it's correct to call add_pair_html, |
| 271 or if we should be using add_pair_plaintext */ | 271 or if we should be using add_pair_plaintext */ |
| 272 purple_notify_user_info_add_pair(info, _("User info"), user_info); | 272 purple_notify_user_info_add_pair_html(info, _("User info"), user_info); |
| 273 } | 273 } |
| 274 | 274 |
| 275 } else { | 275 } else { |
| 276 /* they're not logged in */ | 276 /* they're not logged in */ |
| 277 purple_notify_user_info_add_pair_plaintext(info, _("User info"), _("not logged in")); | 277 purple_notify_user_info_add_pair_plaintext(info, _("User info"), _("not logged in")); |
| 514 body = purple_account_get_user_info(acct); | 514 body = purple_account_get_user_info(acct); |
| 515 else | 515 else |
| 516 body = _("No user info."); | 516 body = _("No user info."); |
| 517 /* TODO: Check whether it's correct to call add_pair_html, | 517 /* TODO: Check whether it's correct to call add_pair_html, |
| 518 or if we should be using add_pair_plaintext */ | 518 or if we should be using add_pair_plaintext */ |
| 519 purple_notify_user_info_add_pair(info, "Info", body); | 519 purple_notify_user_info_add_pair_html(info, "Info", body); |
| 520 | 520 |
| 521 /* show a buddy's user info in a nice dialog box */ | 521 /* show a buddy's user info in a nice dialog box */ |
| 522 purple_notify_userinfo(gc, /* connection the buddy info came through */ | 522 purple_notify_userinfo(gc, /* connection the buddy info came through */ |
| 523 username, /* buddy's username */ | 523 username, /* buddy's username */ |
| 524 info, /* body */ | 524 info, /* body */ |
| 1017 purple_timeout_add(1 /* ms */, nullprpl_finish_get_roomlist, roomlist); | 1017 purple_timeout_add(1 /* ms */, nullprpl_finish_get_roomlist, roomlist); |
| 1018 return roomlist; | 1018 return roomlist; |
| 1019 } | 1019 } |
| 1020 | 1020 |
| 1021 static void nullprpl_roomlist_cancel(PurpleRoomlist *list) { | 1021 static void nullprpl_roomlist_cancel(PurpleRoomlist *list) { |
| 1022 PurpleAccount *account = purple_roomlist_get_account(list); | |
| 1022 purple_debug_info("nullprpl", "%s asked to cancel room list request\n", | 1023 purple_debug_info("nullprpl", "%s asked to cancel room list request\n", |
| 1023 list->account->username); | 1024 purple_account_get_username(account)); |
| 1024 } | 1025 } |
| 1025 | 1026 |
| 1026 static void nullprpl_roomlist_expand_category(PurpleRoomlist *list, | 1027 static void nullprpl_roomlist_expand_category(PurpleRoomlist *list, |
| 1027 PurpleRoomlistRoom *category) { | 1028 PurpleRoomlistRoom *category) { |
| 1029 PurpleAccount *account = purple_roomlist_get_account(list); | |
| 1028 purple_debug_info("nullprpl", "%s asked to expand room list category %s\n", | 1030 purple_debug_info("nullprpl", "%s asked to expand room list category %s\n", |
| 1029 list->account->username, category->name); | 1031 purple_account_get_username(account), |
| 1032 purple_roomlist_room_get_name(category)); | |
| 1030 } | 1033 } |
| 1031 | 1034 |
| 1032 /* nullprpl doesn't support file transfer...yet... */ | 1035 /* nullprpl doesn't support file transfer...yet... */ |
| 1033 static gboolean nullprpl_can_receive_file(PurpleConnection *gc, | 1036 static gboolean nullprpl_can_receive_file(PurpleConnection *gc, |
| 1034 const char *who) { | 1037 const char *who) { |