Mercurial > pidgin
diff src/protocols/msn/msn.c @ 3427:8fa61405af2b
[gaim-migrate @ 3453]
Who never commits anything *now*, Etan?
I changed most of the error message text around. If you think any of it
should be different, just let me know, or send a patch.
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Sun, 25 Aug 2002 10:51:24 +0000 |
parents | fb1a0caadb9f |
children | 12d55ce4710b |
line wrap: on
line diff
--- a/src/protocols/msn/msn.c Sun Aug 25 06:08:15 2002 +0000 +++ b/src/protocols/msn/msn.c Sun Aug 25 10:51:24 2002 +0000 @@ -348,7 +348,7 @@ } if (show) - do_error_dialog(msg, _("MSN Error")); + do_error_dialog(msg, NULL, GAIM_ERROR); return msg; } @@ -555,7 +555,7 @@ ms->msguser = g_strdup(user); ms->msglen = length; } else if (!g_strncasecmp(buf, "NAK", 3)) { - do_error_dialog(_("A message may not have been received."), _("MSN Error")); + do_error_dialog(_("An MSN message may not have been received."), NULL, GAIM_ERROR); } else if (!g_strncasecmp(buf, "NLN", 3)) { } else if (!g_strncasecmp(buf, "OUT", 3)) { if (ms->chat) @@ -812,7 +812,9 @@ close(source); if (g_slist_find(connections, gc)) { msn_kill_switch(ms); - do_error_dialog(_("MSN Error"), _("Gaim was unable to send a message")); + do_error_dialog(_("Gaim was unable to send an MSN message"), + _("Gaim encountered an error communicating with the " + "MSN switchboard server. Please try again later."), GAIM_ERROR); } return; } @@ -2113,7 +2115,7 @@ alias = str_to_utf8(url_encode(entry)); if (strlen(alias) >= BUDDY_ALIAS_MAXLEN) { - do_error_dialog(_("Friendly name too long."), _("MSN Error")); + do_error_dialog(_("New MSN friendly name too long."), NULL, GAIM_ERROR); return; } @@ -2282,7 +2284,11 @@ char *dupl; if (!strchr(who, '@')) { - do_error_dialog(_("Invalid name"), _("MSN Error")); + g_snprintf(buf, sizeof(buf), + _("An MSN screenname must be in the form \"user@server.com\". " + "Perhaps you meant %s@hotmail.com. No changes were made to your " + "allow list."), who); + do_error_dialog(_("Invalid MSN screenname"), buf, GAIM_ERROR); gc->permit = g_slist_remove(gc->permit, who); g_free(who); return; @@ -2335,7 +2341,11 @@ char *dupl; if (!strchr(who, '@')) { - do_error_dialog(_("Invalid name"), _("MSN Error")); + g_snprintf(buf, sizeof(buf), + _("An MSN screenname must be in the form \"user@server.com\". " + "Perhaps you meant %s@hotmail.com. No changes were made to your " + "block list."), who); + do_error_dialog(_("Invalid MSN screenname"), buf, GAIM_ERROR); gc->deny = g_slist_remove(gc->deny, who); g_free(who); return;