comparison: libpurple/protocols/oscar/userinfo.c
libpurple/protocols/oscar/userinfo.c
- branch
- release-2.x.y
- changeset 35990
- dcbaf8e5e624
- parent 35977
- 9b7b48f446f4
- child 35991
- e6937e52930b
equal
deleted
inserted
replaced
| 35988:7b2dd0100fd6 | 35990:dcbaf8e5e624 |
|---|---|
| 335 if (userinfo != NULL) | 335 if (userinfo != NULL) |
| 336 bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, userinfo->bn)); | 336 bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, userinfo->bn)); |
| 337 | 337 |
| 338 if ((bi != NULL) && (bi->ipaddr != 0)) { | 338 if ((bi != NULL) && (bi->ipaddr != 0)) { |
| 339 tmp = g_strdup_printf("%u.%u.%u.%u", | 339 tmp = g_strdup_printf("%u.%u.%u.%u", |
| 340 0xFF & (bi->ipaddr & 0xff000000) >> 24, | 340 0xFF & ((bi->ipaddr & 0xff000000) >> 24), |
| 341 0xFF & (bi->ipaddr & 0x00ff0000) >> 16, | 341 0xFF & ((bi->ipaddr & 0x00ff0000) >> 16), |
| 342 0xFF & (bi->ipaddr & 0x0000ff00) >> 8, | 342 0xFF & ((bi->ipaddr & 0x0000ff00) >> 8), |
| 343 0xFF & (bi->ipaddr & 0x000000ff)); | 343 0xFF & (bi->ipaddr & 0x000000ff)); |
| 344 oscar_user_info_add_pair(user_info, _("IP Address"), tmp); | 344 oscar_user_info_add_pair(user_info, _("IP Address"), tmp); |
| 345 g_free(tmp); | 345 g_free(tmp); |
| 346 } | 346 } |
| 347 | 347 |
| 399 | 399 |
| 400 purple_notify_user_info_add_pair(user_info, _("UIN"), who); | 400 purple_notify_user_info_add_pair(user_info, _("UIN"), who); |
| 401 oscar_user_info_convert_and_add(account, od, user_info, _("Nick"), info->nick); | 401 oscar_user_info_convert_and_add(account, od, user_info, _("Nick"), info->nick); |
| 402 if ((bi != NULL) && (bi->ipaddr != 0)) { | 402 if ((bi != NULL) && (bi->ipaddr != 0)) { |
| 403 char *tstr = g_strdup_printf("%u.%u.%u.%u", | 403 char *tstr = g_strdup_printf("%u.%u.%u.%u", |
| 404 0xFF & (bi->ipaddr & 0xff000000) >> 24, | 404 0xFF & ((bi->ipaddr & 0xff000000) >> 24), |
| 405 0xFF & (bi->ipaddr & 0x00ff0000) >> 16, | 405 0xFF & ((bi->ipaddr & 0x00ff0000) >> 16), |
| 406 0xFF & (bi->ipaddr & 0x0000ff00) >> 8, | 406 0xFF & ((bi->ipaddr & 0x0000ff00) >> 8), |
| 407 0xFF & (bi->ipaddr & 0x000000ff)); | 407 0xFF & (bi->ipaddr & 0x000000ff)); |
| 408 purple_notify_user_info_add_pair(user_info, _("IP Address"), tstr); | 408 purple_notify_user_info_add_pair(user_info, _("IP Address"), tstr); |
| 409 g_free(tstr); | 409 g_free(tstr); |
| 410 } | 410 } |
| 411 oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first); | 411 oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first); |
