disapproval of revision 'bfc64c9325295fa4e6e52b2470c22c6533b28638'

5 files changed, 9 insertions, 12 deletions

diff --git a/libpurple/internal.h b/libpurple/internal.h
index aebada1114..ab7c9a9952 100644
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -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
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 90e7d7431a..2f239030ca 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -1411,7 +1411,7 @@ purple_parse_auth_resp(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 			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:
@@ -1532,7 +1532,7 @@ static void damn_you(gpointer data, gint source, PurpleInputCondition c)
 	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);
@@ -1576,7 +1576,7 @@ straight_to_hell(gpointer data, gint source, const gchar *error_message)
 
 	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);
@@ -1675,7 +1675,7 @@ int purple_memrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 		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);
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
index 0ff3612f89..51ad6bddb5 100644
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -674,7 +674,7 @@ silcpurple_close(PurpleConnection *gc)
 
 	/* 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 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversation *conv,
 		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;
 }
diff --git a/libpurple/protocols/silc10/silc.c b/libpurple/protocols/silc10/silc.c
index 5b46c9b7d8..04a8c68361 100644
--- a/libpurple/protocols/silc10/silc.c
+++ b/libpurple/protocols/silc10/silc.c
@@ -389,7 +389,7 @@ silcpurple_close(PurpleConnection *gc)
 
 	/* 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 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversation *conv,
 		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;
 }
diff --git a/libpurple/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/yahoo.c
index d9f6d43a26..bee9f8c20d 100644
--- a/libpurple/protocols/yahoo/yahoo.c
+++ b/libpurple/protocols/yahoo/yahoo.c
@@ -1997,7 +1997,7 @@ static void yahoo_process_auth(PurpleConnection *gc, struct yahoo_packet *pkt)
 		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);