changeset 16912:968941822155

merge of 'bcc638c7caff684bb6ee1563ef0c5862931d8287' and 'c1b4b10171113a2ad73fa63dae56afbc79055fdf'
author Luke Schierer <lschiere@pidgin.im>
date Sat, 05 May 2007 22:04:26 +0000
parents ba47cfaa013b (current diff) a00cf76108c6 (diff)
children 240690ebd868
files
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/internal.h	Sat May 05 21:20:05 2007 +0000
+++ b/libpurple/internal.h	Sat May 05 22:04:26 2007 +0000
@@ -183,6 +183,7 @@
 #define purple_strlcat(dest, src) g_strlcat(dest, src, sizeof(dest))
 
 #define PURPLE_WEBSITE "http://pidgin.im/"
+#define PURPLE_DEVEL_WEBSITE "http://developer.pidgin.im/"
 
 /* This is for the accounts code to notify the buddy icon code that
  * it's done loading.  We may want to replace this with a signal. */
--- a/pidgin/gtkmain.c	Sat May 05 21:20:05 2007 +0000
+++ b/pidgin/gtkmain.c	Sat May 05 22:04:26 2007 +0000
@@ -500,16 +500,16 @@
 			"no fault of your own.\n\n"
 			"If you can reproduce the crash, please notify the Pidgin\n"
 			"developers by reporting a bug at\n"
-			"%sbug.php\n\n"
+			"%snewticket/\n\n"
 			"Please make sure to specify what you were doing at the time\n"
 			"and post the backtrace from the core file.  If you do not know\n"
 			"how to get the backtrace, please read the instructions at\n"
-			"%sgdb.php\n\n"
+			"%swiki/GetABacktrace\n\n"
 			"If you need further assistance, please IM either SeanEgn or \n"
 			"LSchiere (via AIM).  Contact information for Sean and Luke \n"
 			"on other protocols is at\n"
-			"%scontactinfo.php\n"),
-			PIDGIN_NAME, PURPLE_WEBSITE, PURPLE_WEBSITE, PURPLE_WEBSITE
+			"%swiki/DeveloperPages\n"),
+			PIDGIN_NAME, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE
 		);
 
 		/* we have to convert the message (UTF-8 to console