Mercurial > pidgin
changeset 23399:f1602b78aa59
disapproval of revision 'f15338f57c0920b685e5164d2f53e50a6d0f64b7'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Tue, 01 Jul 2008 21:58:23 +0000 |
| parents | 074be48b20e7 |
| children | 18cc881d5a73 |
| files | libpurple/internal.h libpurple/protocols/oscar/oscar.c libpurple/protocols/silc/silc.c libpurple/protocols/silc10/silc.c libpurple/protocols/yahoo/yahoo.c |
| diffstat | 5 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/internal.h Tue Jul 01 18:06:32 2008 +0000 +++ b/libpurple/internal.h Tue Jul 01 21:58:23 2008 +0000 @@ -229,9 +229,6 @@ #define purple_strlcat(dest, src) g_strlcat(dest, src, sizeof(dest)) #define PURPLE_WEBSITE "http://pidgin.im/" -#ifndef CLIENT_WEBSITE - #define CLIENT_WEBSITE PURPLE_WEBSITE -#endif #define PURPLE_DEVEL_WEBSITE "http://developer.pidgin.im/" /* This is for the accounts code to notify the buddy icon code that
--- a/libpurple/protocols/oscar/oscar.c Tue Jul 01 18:06:32 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Jul 01 21:58:23 2008 +0000 @@ -1520,7 +1520,7 @@ break; case 0x1c: /* client too old */ - g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), CLIENT_WEBSITE); + g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), PURPLE_WEBSITE); purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, buf); break; case 0x1d: @@ -1641,7 +1641,7 @@ if (in != '\n') { char buf[256]; g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " - "this is fixed. Check %s for updates."), CLIENT_WEBSITE); + "this is fixed. Check %s for updates."), PURPLE_WEBSITE); purple_notify_warning(pos->gc, NULL, _("Unable to get a valid AIM login hash."), buf); @@ -1685,7 +1685,7 @@ if (source < 0) { buf = g_strdup_printf(_("You may be disconnected shortly. " - "Check %s for updates."), CLIENT_WEBSITE); + "Check %s for updates."), PURPLE_WEBSITE); purple_notify_warning(pos->gc, NULL, _("Unable to get a valid AIM login hash."), buf); @@ -1784,7 +1784,7 @@ g_free(pos->modname); g_free(pos); g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. " - "Check %s for updates."), CLIENT_WEBSITE); + "Check %s for updates."), PURPLE_WEBSITE); purple_notify_warning(pos->gc, NULL, _("Unable to get a valid login hash."), buf);
--- a/libpurple/protocols/silc/silc.c Tue Jul 01 18:06:32 2008 +0000 +++ b/libpurple/protocols/silc/silc.c Tue Jul 01 21:58:23 2008 +0000 @@ -674,7 +674,7 @@ /* Send QUIT */ silc_client_command_call(sg->client, sg->conn, NULL, - "QUIT", "Download " PACKAGE ": " CLIENT_WEBSITE, + "QUIT", "Download Pidgin: " PURPLE_WEBSITE, NULL); if (sg->conn) @@ -1828,7 +1828,7 @@ return PURPLE_CMD_RET_FAILED; silc_client_command_call(sg->client, sg->conn, NULL, - "QUIT", (args && args[0]) ? args[0] : "Download " PACKAGE ": " CLIENT_WEBSITE, NULL); + "QUIT", (args && args[0]) ? args[0] : "Download Pidgin: " PURPLE_WEBSITE, NULL); return PURPLE_CMD_RET_OK; }
--- a/libpurple/protocols/silc10/silc.c Tue Jul 01 18:06:32 2008 +0000 +++ b/libpurple/protocols/silc10/silc.c Tue Jul 01 21:58:23 2008 +0000 @@ -389,7 +389,7 @@ /* Send QUIT */ silc_client_command_call(sg->client, sg->conn, NULL, - "QUIT", "Download this: " CLIENT_WEBSITE, NULL); + "QUIT", "Download this: " PURPLE_WEBSITE, NULL); if (sg->conn) silc_client_close_connection(sg->client, sg->conn); @@ -1547,7 +1547,7 @@ return PURPLE_CMD_RET_FAILED; silc_client_command_call(sg->client, sg->conn, NULL, - "QUIT", (args && args[0]) ? args[0] : "Download this: " CLIENT_WEBSITE, NULL); + "QUIT", (args && args[0]) ? args[0] : "Download this: " PURPLE_WEBSITE, NULL); return PURPLE_CMD_RET_OK; }
--- a/libpurple/protocols/yahoo/yahoo.c Tue Jul 01 18:06:32 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Tue Jul 01 21:58:23 2008 +0000 @@ -1997,7 +1997,7 @@ default: buf = g_strdup_printf(_("The Yahoo server has requested the use of an unrecognized " "authentication method. You will probably not be able " - "to successfully sign on to Yahoo. Check %s for updates."), CLIENT_WEBSITE); + "to successfully sign on to Yahoo. Check %s for updates."), PURPLE_WEBSITE); purple_notify_error(gc, "", _("Failed Yahoo! Authentication"), buf); g_free(buf);