Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 23400:074be48b20e7
Use CLIENT_WEBSITE rather than PURPLE_WEBSITE in libpurple. If the build
process doesn't #define CLIENT_WEBSITE, internal.h will define it as
PURPLE_WEBSITE. No change for Pidgin or Finch, but this will let other clients
such as Adium present their own site in error messages as needed.
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Tue, 01 Jul 2008 18:06:32 +0000 |
parents | 540a26a1a88d |
children | f1602b78aa59 |
comparison
equal
deleted
inserted
replaced
23399:e1bddd9c5c88 | 23400:074be48b20e7 |
---|---|
1518 /* screen name connecting too frequently */ | 1518 /* screen name connecting too frequently */ |
1519 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.")); | 1519 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.")); |
1520 break; | 1520 break; |
1521 case 0x1c: | 1521 case 0x1c: |
1522 /* client too old */ | 1522 /* client too old */ |
1523 g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), PURPLE_WEBSITE); | 1523 g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), CLIENT_WEBSITE); |
1524 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, buf); | 1524 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, buf); |
1525 break; | 1525 break; |
1526 case 0x1d: | 1526 case 0x1d: |
1527 /* IP address connecting too frequently */ | 1527 /* IP address connecting too frequently */ |
1528 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.")); | 1528 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.")); |
1639 in = '\0'; | 1639 in = '\0'; |
1640 } | 1640 } |
1641 if (in != '\n') { | 1641 if (in != '\n') { |
1642 char buf[256]; | 1642 char buf[256]; |
1643 g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " | 1643 g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " |
1644 "this is fixed. Check %s for updates."), PURPLE_WEBSITE); | 1644 "this is fixed. Check %s for updates."), CLIENT_WEBSITE); |
1645 purple_notify_warning(pos->gc, NULL, | 1645 purple_notify_warning(pos->gc, NULL, |
1646 _("Unable to get a valid AIM login hash."), | 1646 _("Unable to get a valid AIM login hash."), |
1647 buf); | 1647 buf); |
1648 purple_input_remove(pos->inpa); | 1648 purple_input_remove(pos->inpa); |
1649 close(pos->fd); | 1649 close(pos->fd); |
1683 | 1683 |
1684 pos->fd = source; | 1684 pos->fd = source; |
1685 | 1685 |
1686 if (source < 0) { | 1686 if (source < 0) { |
1687 buf = g_strdup_printf(_("You may be disconnected shortly. " | 1687 buf = g_strdup_printf(_("You may be disconnected shortly. " |
1688 "Check %s for updates."), PURPLE_WEBSITE); | 1688 "Check %s for updates."), CLIENT_WEBSITE); |
1689 purple_notify_warning(pos->gc, NULL, | 1689 purple_notify_warning(pos->gc, NULL, |
1690 _("Unable to get a valid AIM login hash."), | 1690 _("Unable to get a valid AIM login hash."), |
1691 buf); | 1691 buf); |
1692 g_free(buf); | 1692 g_free(buf); |
1693 g_free(pos->modname); | 1693 g_free(pos->modname); |
1782 { | 1782 { |
1783 char buf[256]; | 1783 char buf[256]; |
1784 g_free(pos->modname); | 1784 g_free(pos->modname); |
1785 g_free(pos); | 1785 g_free(pos); |
1786 g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. " | 1786 g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. " |
1787 "Check %s for updates."), PURPLE_WEBSITE); | 1787 "Check %s for updates."), CLIENT_WEBSITE); |
1788 purple_notify_warning(pos->gc, NULL, | 1788 purple_notify_warning(pos->gc, NULL, |
1789 _("Unable to get a valid login hash."), | 1789 _("Unable to get a valid login hash."), |
1790 buf); | 1790 buf); |
1791 } | 1791 } |
1792 | 1792 |