Mercurial > pidgin.yaz
changeset 10091:4e376556566e
[gaim-migrate @ 11107]
Bleh
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 13 Oct 2004 12:26:10 +0000 |
| parents | 5ad2e205f3ab |
| children | 1843023b8189 |
| files | src/protocols/jabber/chat.c src/protocols/silc/ops.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/jabber/chat.c Tue Oct 12 21:46:23 2004 +0000 +++ b/src/protocols/jabber/chat.c Wed Oct 13 12:26:10 2004 +0000 @@ -666,8 +666,8 @@ if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result")) { char *err = jabber_parse_error(js,packet); - gaim_notify_error(js->gc, _("Roomlist Error"), - _("Error retreiving roomlist"), err); + gaim_notify_error(js->gc, _("Error"), + _("Error retreiving room list"), err); gaim_roomlist_set_in_progress(js->roomlist, FALSE); gaim_roomlist_unref(js->roomlist); js->roomlist = NULL; @@ -677,8 +677,8 @@ if(!(query = xmlnode_get_child(packet, "query"))) { char *err = jabber_parse_error(js, packet); - gaim_notify_error(js->gc, _("Roomlist Error"), - _("Error retreiving roomlist"), err); + gaim_notify_error(js->gc, _("Error"), + _("Error retreiving room list"), err); gaim_roomlist_set_in_progress(js->roomlist, FALSE); gaim_roomlist_unref(js->roomlist); js->roomlist = NULL;
--- a/src/protocols/silc/ops.c Tue Oct 12 21:46:23 2004 +0000 +++ b/src/protocols/silc/ops.c Wed Oct 13 12:26:10 2004 +0000 @@ -1240,7 +1240,7 @@ break; if (!success) { - gaim_notify_error(gc, _("Roomlist"), _("Cannot get room list"), + gaim_notify_error(gc, _("Error"), _("Error retrieving room list"), silc_get_status_message(status)); gaim_roomlist_set_in_progress(sg->roomlist, FALSE); gaim_roomlist_unref(sg->roomlist);