# HG changeset patch
# User Casey Harkins <charkins@pidgin.im>
# Date 1178404246 0
# Node ID fdc345732a3dd29253e400ee6a06f6669bda5eb6
# Parent  0aa5e1e5c937e1f04bfc71376ab4e4658c442064# Parent  240690ebd868e5df21077568caa605608ce6732e
merge of 'c10371b38b40e6f540b80461f2ca6c931b0665aa'
     and 'e1ea870d04aac126230cd2dad76d813069d437d3'

diff -r 0aa5e1e5c937 -r fdc345732a3d ChangeLog
--- a/ChangeLog	Sat May 05 22:29:58 2007 +0000
+++ b/ChangeLog	Sat May 05 22:30:46 2007 +0000
@@ -4,6 +4,13 @@
 	* Buddy list update speedups when buddy icons are not being
 	  displayed.  (Scott Wolchok)
 
+	Finch:
+	* Userlist in chat windows, which can be turned on or off using
+	  "/users" command.
+	* Menus in the conversation windows.
+	* Improved tab completion support.
+	* Ctrl+c prompts with a dialog before exiting.
+
 version 2.0.0 (5/3/2007):
 	* The project has new names - libpurple for the core, Pidgin for the
 	  GTK+ UI and Finch for the ncurses based console UI (AOL LLC)
diff -r 0aa5e1e5c937 -r fdc345732a3d libpurple/internal.h
--- a/libpurple/internal.h	Sat May 05 22:29:58 2007 +0000
+++ b/libpurple/internal.h	Sat May 05 22:30:46 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. */
diff -r 0aa5e1e5c937 -r fdc345732a3d pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Sat May 05 22:29:58 2007 +0000
+++ b/pidgin/gtkmain.c	Sat May 05 22:30:46 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