Mercurial > pidgin.yaz
changeset 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 | 747ef488c600 |
| children | 4b0f64ab869c |
| files | src/protocols/jabber/presence.c src/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/jabber/presence.c Fri May 27 23:23:44 2005 +0000 +++ b/src/protocols/jabber/presence.c Tue May 31 23:04:33 2005 +0000 @@ -282,7 +282,11 @@ jb->error_msg = msg ? msg : g_strdup(_("Unknown Error in presence")); } else if(type && !strcmp(type, "subscribe")) { struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1); - char *msg = g_strdup_printf(_("The user %s wants to add you to their buddy list."), from); + char *msg; + + msg = g_strdup_printf(_("The user %s wants to add %s to his or " + "her buddy list."), + from, gaim_account_get_username(js->gc->account)); jap->gc = js->gc; jap->who = g_strdup(from);
--- a/src/protocols/oscar/oscar.c Fri May 27 23:23:44 2005 +0000 +++ b/src/protocols/oscar/oscar.c Tue May 31 23:04:33 2005 +0000 @@ -3832,7 +3832,10 @@ case 0x06: { /* Someone requested authorization */ if (i >= 6) { struct name_data *data = g_new(struct name_data, 1); - 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.")); + gchar *dialog_msg = g_strdup_printf( + _("The user %u wants to add %s to their buddy list for the following reason:\n%s"), + args->uin, gaim_account_get_username(gc->account), + (msg2[5] ? msg2[5] : _("No reason given."))); gaim_debug_info("oscar", "Received an authorization request from UIN %u\n", args->uin); @@ -6373,7 +6376,11 @@ else nombre = g_strdup(sn); - 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.")); + dialog_msg = g_strdup_printf( + _("The user %s wants to add %s to their buddy list for the following reason:\n%s"), + nombre, gaim_account_get_username(gc->account), + (msg ? msg : _("No reason given."))); + data = g_new(struct name_data, 1); data->gc = gc; data->name = g_strdup(sn);