pidgin: f15338f5: Use CLIENT_WEBSITE rather than PURPLE_WE...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: f15338f57c0920b685e5164d2f53e50a6d0f64b7
Ancestor: e8233b3a32b1383e10d9591fee51f5ecb99a40ce
Author: evands at pidgin.im
Date: 2008-07-01T18:06:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f15338f57c0920b685e5164d2f53e50a6d0f64b7

Modified files:
        libpurple/internal.h libpurple/protocols/oscar/oscar.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/yahoo/yahoo.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/internal.h	a360e25572941b94a9e53dcd18be2957fee42543
+++ libpurple/internal.h	fdfdd982b363f07f72e50e8d2c0c9ae312e1f7d8
@@ -229,6 +229,9 @@
 #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
============================================================
--- libpurple/protocols/oscar/oscar.c	59acd195bf72d097379b3e21fa8e72587bad7f5c
+++ libpurple/protocols/oscar/oscar.c	d9045669d77aefe46d5d53a864f7484c94a3c2e2
@@ -1520,7 +1520,7 @@ purple_parse_auth_resp(OscarData *od, Fl
 			break;
 		case 0x1c:
 			/* client too old */
-			g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), PURPLE_WEBSITE);
+			g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), CLIENT_WEBSITE);
 			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, buf);
 			break;
 		case 0x1d:
@@ -1641,7 +1641,7 @@ static void damn_you(gpointer data, gint
 	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."), PURPLE_WEBSITE);
+			"this is fixed.  Check %s for updates."), CLIENT_WEBSITE);
 		purple_notify_warning(pos->gc, NULL,
 							_("Unable to get a valid AIM login hash."),
 							buf);
@@ -1685,7 +1685,7 @@ straight_to_hell(gpointer data, gint sou
 
 	if (source < 0) {
 		buf = g_strdup_printf(_("You may be disconnected shortly.  "
-				"Check %s for updates."), PURPLE_WEBSITE);
+				"Check %s for updates."), CLIENT_WEBSITE);
 		purple_notify_warning(pos->gc, NULL,
 							_("Unable to get a valid AIM login hash."),
 							buf);
@@ -1784,7 +1784,7 @@ int purple_memrequest(OscarData *od, Fla
 		g_free(pos->modname);
 		g_free(pos);
 		g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  "
-			"Check %s for updates."), PURPLE_WEBSITE);
+			"Check %s for updates."), CLIENT_WEBSITE);
 		purple_notify_warning(pos->gc, NULL,
 							_("Unable to get a valid login hash."),
 							buf);
============================================================
--- libpurple/protocols/silc/silc.c	8d819ff4ffd518e22d6184f47c40cbbfa4c847e3
+++ libpurple/protocols/silc/silc.c	a42008a6e23dcc1c07020061175a3f5e081ba7e0
@@ -674,7 +674,7 @@ silcpurple_close(PurpleConnection *gc)
 
 	/* Send QUIT */
 	silc_client_command_call(sg->client, sg->conn, NULL,
-				 "QUIT", "Download Pidgin: " PURPLE_WEBSITE,
+				 "QUIT", "Download " PACKAGE ": " CLIENT_WEBSITE,
 				 NULL);
 
 	if (sg->conn)
@@ -1828,7 +1828,7 @@ static PurpleCmdRet silcpurple_cmd_quit(
 		return PURPLE_CMD_RET_FAILED;
 
 	silc_client_command_call(sg->client, sg->conn, NULL,
-				 "QUIT", (args && args[0]) ? args[0] : "Download Pidgin: " PURPLE_WEBSITE, NULL);
+				 "QUIT", (args && args[0]) ? args[0] : "Download " PACKAGE ": " CLIENT_WEBSITE, NULL);
 
 	return PURPLE_CMD_RET_OK;
 }
============================================================
--- libpurple/protocols/silc10/silc.c	3f712811b88ffe2ceccf322a01c2376a5044da21
+++ libpurple/protocols/silc10/silc.c	7dae5d90c47b66cb234302e7fef642a07a9d069f
@@ -389,7 +389,7 @@ silcpurple_close(PurpleConnection *gc)
 
 	/* Send QUIT */
 	silc_client_command_call(sg->client, sg->conn, NULL,
-				 "QUIT", "Download this: " PURPLE_WEBSITE, NULL);
+				 "QUIT", "Download this: " CLIENT_WEBSITE, NULL);
 
 	if (sg->conn)
 		silc_client_close_connection(sg->client, sg->conn);
@@ -1547,7 +1547,7 @@ static PurpleCmdRet silcpurple_cmd_quit(
 		return PURPLE_CMD_RET_FAILED;
 
 	silc_client_command_call(sg->client, sg->conn, NULL,
-				 "QUIT", (args && args[0]) ? args[0] : "Download this: " PURPLE_WEBSITE, NULL);
+				 "QUIT", (args && args[0]) ? args[0] : "Download this: " CLIENT_WEBSITE, NULL);
 
 	return PURPLE_CMD_RET_OK;
 }
============================================================
--- libpurple/protocols/yahoo/yahoo.c	ffd4f5f2e02710d887558574e376d2303d2e5b2e
+++ libpurple/protocols/yahoo/yahoo.c	e7f4e32fb986c3fd5f23b413862058c2b279191b
@@ -1997,7 +1997,7 @@ static void yahoo_process_auth(PurpleCon
 		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."), PURPLE_WEBSITE);
+						"to successfully sign on to Yahoo.  Check %s for updates."), CLIENT_WEBSITE);
 			purple_notify_error(gc, "", _("Failed Yahoo! Authentication"),
 					  buf);
 			g_free(buf);