comparison: libpurple/protocols/oscar/userinfo.c
libpurple/protocols/oscar/userinfo.c
- changeset 34457
- a9d3726c3a8f
- parent 33811
- 5ab172aeeff2
- child 35001
- 85144a4a7942
equal
deleted
inserted
replaced
| 34456:d69aa7d3530c | 34457:a9d3726c3a8f |
|---|---|
| 333 if (userinfo != NULL) | 333 if (userinfo != NULL) |
| 334 bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, userinfo->bn)); | 334 bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, userinfo->bn)); |
| 335 | 335 |
| 336 if ((bi != NULL) && (bi->ipaddr != 0)) { | 336 if ((bi != NULL) && (bi->ipaddr != 0)) { |
| 337 char tmp2[40]; | 337 char tmp2[40]; |
| 338 sprintf(tmp2, "%hhu.%hhu.%hhu.%hhu", | 338 sprintf(tmp2, "%u.%u.%u.%u", |
| 339 (bi->ipaddr & 0xff000000) >> 24, | 339 0xFF & ((bi->ipaddr & 0xff000000) >> 24), |
| 340 (bi->ipaddr & 0x00ff0000) >> 16, | 340 0xFF & ((bi->ipaddr & 0x00ff0000) >> 16), |
| 341 (bi->ipaddr & 0x0000ff00) >> 8, | 341 0xFF & ((bi->ipaddr & 0x0000ff00) >> 8), |
| 342 (bi->ipaddr & 0x000000ff)); | 342 0xFF & (bi->ipaddr & 0x000000ff)); |
| 343 purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tmp2); | 343 purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tmp2); |
| 344 } | 344 } |
| 345 | 345 |
| 346 if ((userinfo != NULL) && (userinfo->warnlevel != 0)) { | 346 if ((userinfo != NULL) && (userinfo->warnlevel != 0)) { |
| 347 char tmp2[12]; | 347 char tmp2[12]; |
| 397 | 397 |
| 398 purple_notify_user_info_add_pair_plaintext(user_info, _("UIN"), who); | 398 purple_notify_user_info_add_pair_plaintext(user_info, _("UIN"), who); |
| 399 oscar_user_info_convert_and_add(account, od, user_info, _("Nick"), info->nick); | 399 oscar_user_info_convert_and_add(account, od, user_info, _("Nick"), info->nick); |
| 400 if ((bi != NULL) && (bi->ipaddr != 0)) { | 400 if ((bi != NULL) && (bi->ipaddr != 0)) { |
| 401 char tstr[40]; | 401 char tstr[40]; |
| 402 sprintf(tstr, "%hhu.%hhu.%hhu.%hhu", | 402 sprintf(tstr, "%u.%u.%u.%u", |
| 403 (bi->ipaddr & 0xff000000) >> 24, | 403 0xFF & ((bi->ipaddr & 0xff000000) >> 24), |
| 404 (bi->ipaddr & 0x00ff0000) >> 16, | 404 0xFF & ((bi->ipaddr & 0x00ff0000) >> 16), |
| 405 (bi->ipaddr & 0x0000ff00) >> 8, | 405 0xFF & ((bi->ipaddr & 0x0000ff00) >> 8), |
| 406 (bi->ipaddr & 0x000000ff)); | 406 0xFF & ((bi->ipaddr & 0x000000ff))); |
| 407 purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tstr); | 407 purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tstr); |
| 408 } | 408 } |
| 409 oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first); | 409 oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first); |
| 410 oscar_user_info_convert_and_add(account, od, user_info, _("Last Name"), info->last); | 410 oscar_user_info_convert_and_add(account, od, user_info, _("Last Name"), info->last); |
| 411 oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Email Address"), info->email, "mailto:"); | 411 oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Email Address"), info->email, "mailto:"); |
