Mercurial > pidgin.yaz
comparison src/protocols/oscar/oscar.c @ 10949:1adca5a37fb8
[gaim-migrate @ 12749]
sf patch #1209197, from Evan Schoenberg
"Consistency in text of authorization request dialogs"
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 31 May 2005 23:04:33 +0000 |
| parents | f38bda97f981 |
| children | bf03a5271395 |
comparison
equal
deleted
inserted
replaced
| 10948:747ef488c600 | 10949:1adca5a37fb8 |
|---|---|
| 3830 } break; | 3830 } break; |
| 3831 | 3831 |
| 3832 case 0x06: { /* Someone requested authorization */ | 3832 case 0x06: { /* Someone requested authorization */ |
| 3833 if (i >= 6) { | 3833 if (i >= 6) { |
| 3834 struct name_data *data = g_new(struct name_data, 1); | 3834 struct name_data *data = g_new(struct name_data, 1); |
| 3835 gchar *dialog_msg = g_strdup_printf(_("The user %u wants to add you to their buddy list for the following reason:\n%s"), args->uin, msg2[5] ? msg2[5] : _("No reason given.")); | 3835 gchar *dialog_msg = g_strdup_printf( |
| 3836 _("The user %u wants to add %s to their buddy list for the following reason:\n%s"), | |
| 3837 args->uin, gaim_account_get_username(gc->account), | |
| 3838 (msg2[5] ? msg2[5] : _("No reason given."))); | |
| 3836 gaim_debug_info("oscar", | 3839 gaim_debug_info("oscar", |
| 3837 "Received an authorization request from UIN %u\n", | 3840 "Received an authorization request from UIN %u\n", |
| 3838 args->uin); | 3841 args->uin); |
| 3839 data->gc = gc; | 3842 data->gc = gc; |
| 3840 data->name = g_strdup_printf("%u", args->uin); | 3843 data->name = g_strdup_printf("%u", args->uin); |
| 6371 if (buddy && (gaim_buddy_get_alias_only(buddy))) | 6374 if (buddy && (gaim_buddy_get_alias_only(buddy))) |
| 6372 nombre = g_strdup_printf("%s (%s)", sn, gaim_buddy_get_alias_only(buddy)); | 6375 nombre = g_strdup_printf("%s (%s)", sn, gaim_buddy_get_alias_only(buddy)); |
| 6373 else | 6376 else |
| 6374 nombre = g_strdup(sn); | 6377 nombre = g_strdup(sn); |
| 6375 | 6378 |
| 6376 dialog_msg = g_strdup_printf(_("The user %s wants to add you to their buddy list for the following reason:\n%s"), nombre, msg ? msg : _("No reason given.")); | 6379 dialog_msg = g_strdup_printf( |
| 6380 _("The user %s wants to add %s to their buddy list for the following reason:\n%s"), | |
| 6381 nombre, gaim_account_get_username(gc->account), | |
| 6382 (msg ? msg : _("No reason given."))); | |
| 6383 | |
| 6377 data = g_new(struct name_data, 1); | 6384 data = g_new(struct name_data, 1); |
| 6378 data->gc = gc; | 6385 data->gc = gc; |
| 6379 data->name = g_strdup(sn); | 6386 data->name = g_strdup(sn); |
| 6380 data->nick = NULL; | 6387 data->nick = NULL; |
| 6381 | 6388 |