comparison: libpurple/protocols/oscar/userinfo.c
libpurple/protocols/oscar/userinfo.c
- changeset 36002
- 31a8779e91d4
- parent 35989
- 2b5a26ddbb69
- parent 35991
- e6937e52930b
- child 36003
- 7939026380e1
equal
deleted
inserted
replaced
| 35989:2b5a26ddbb69 | 36002:31a8779e91d4 |
|---|---|
| 367 PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); | 367 PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); |
| 368 gchar *buf = g_strdup_printf(_("User information not available: %s"), oscar_get_msgerr_reason(error_reason)); | 368 gchar *buf = g_strdup_printf(_("User information not available: %s"), oscar_get_msgerr_reason(error_reason)); |
| 369 purple_notify_user_info_add_pair_plaintext(user_info, NULL, buf); | 369 purple_notify_user_info_add_pair_plaintext(user_info, NULL, buf); |
| 370 purple_notify_userinfo(od->gc, buddy, user_info, NULL, NULL); | 370 purple_notify_userinfo(od->gc, buddy, user_info, NULL, NULL); |
| 371 purple_notify_user_info_destroy(user_info); | 371 purple_notify_user_info_destroy(user_info); |
| 372 purple_conversation_present_error(buddy, purple_connection_get_account(od->gc), buf); | 372 if (!purple_conv_present_error(buddy, purple_connection_get_account(od->gc), buf)) |
| 373 purple_notify_error(od->gc, NULL, buf, NULL); | |
| 373 g_free(buf); | 374 g_free(buf); |
| 374 } | 375 } |
| 375 | 376 |
| 376 void | 377 void |
| 377 oscar_user_info_display_icq(OscarData *od, struct aim_icq_info *info) | 378 oscar_user_info_display_icq(OscarData *od, struct aim_icq_info *info) |
| 401 char tstr[40]; | 402 char tstr[40]; |
| 402 sprintf(tstr, "%u.%u.%u.%u", | 403 sprintf(tstr, "%u.%u.%u.%u", |
| 403 0xFF & ((bi->ipaddr & 0xff000000) >> 24), | 404 0xFF & ((bi->ipaddr & 0xff000000) >> 24), |
| 404 0xFF & ((bi->ipaddr & 0x00ff0000) >> 16), | 405 0xFF & ((bi->ipaddr & 0x00ff0000) >> 16), |
| 405 0xFF & ((bi->ipaddr & 0x0000ff00) >> 8), | 406 0xFF & ((bi->ipaddr & 0x0000ff00) >> 8), |
| 406 0xFF & ((bi->ipaddr & 0x000000ff))); | 407 0xFF & (bi->ipaddr & 0x000000ff)); |
| 407 purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tstr); | 408 purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tstr); |
| 408 } | 409 } |
| 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, _("First Name"), info->first); |
| 410 oscar_user_info_convert_and_add(account, od, user_info, _("Last Name"), info->last); | 411 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:"); | 412 oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Email Address"), info->email, "mailto:"); |
