# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1178407167 0
# Node ID 2be397cd726a332bf787bf83676c24d5ab0c1f29
# Parent  d0e74d0be43fe13ba24d4919482f4ab66705cfac# Parent  0dcd915899aedbc533c70991514ed2c52a6f0727
merge of '43641085a7c20c6fca287f571d7662bf3c916f21'
     and '75611b054205d4ba63f10e5daaba999f3be4e363'

diff -r d0e74d0be43f -r 2be397cd726a ChangeLog
--- a/ChangeLog	Sat May 05 16:48:06 2007 +0000
+++ b/ChangeLog	Sat May 05 23:19:27 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 d0e74d0be43f -r 2be397cd726a finch/libgnt/wms/Makefile.am
--- a/finch/libgnt/wms/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/finch/libgnt/wms/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -15,7 +15,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/finch \
 	-I$(top_srcdir)/finch/libgnt \
diff -r d0e74d0be43f -r 2be397cd726a libpurple/internal.h
--- a/libpurple/internal.h	Sat May 05 16:48:06 2007 +0000
+++ b/libpurple/internal.h	Sat May 05 23:19:27 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 d0e74d0be43f -r 2be397cd726a libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/libpurple/plugins/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -127,7 +127,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
diff -r d0e74d0be43f -r 2be397cd726a libpurple/plugins/mono/loader/Makefile.am
--- a/libpurple/plugins/mono/loader/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/libpurple/plugins/mono/loader/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -17,7 +17,6 @@
 mono_la_LIBADD = $(MONO_LIBS)
 
 AM_CPPFLAGS = \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
diff -r d0e74d0be43f -r 2be397cd726a libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -152,7 +152,6 @@
 	fi
 
 AM_CPPFLAGS = \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
diff -r d0e74d0be43f -r 2be397cd726a libpurple/plugins/tcl/Makefile.am
--- a/libpurple/plugins/tcl/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/libpurple/plugins/tcl/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -12,7 +12,6 @@
 EXTRA_DIST = signal-test.tcl Makefile.mingw
 
 AM_CPPFLAGS = \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
diff -r d0e74d0be43f -r 2be397cd726a libpurple/protocols/qq/Makefile.am
--- a/libpurple/protocols/qq/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -94,7 +94,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
-	-DVERSION=\"$(VERSION)\" \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS)
diff -r d0e74d0be43f -r 2be397cd726a pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/gtkdocklet.c	Sat May 05 23:19:27 2007 +0000
@@ -486,8 +486,8 @@
 
 	pidgin_separator(submenu);
 
-	new_menu_item_with_status_icon(submenu, _("New..."), PURPLE_STATUS_AVAILABLE, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL);
-	new_menu_item_with_status_icon(submenu, _("Saved..."), PURPLE_STATUS_AVAILABLE, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL);
+	pidgin_new_item_from_stock(submenu, _("New..."), NULL, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL);
+	pidgin_new_item_from_stock(submenu, _("Saved..."), NULL, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL);
 
 	return menuitem;
 }
diff -r d0e74d0be43f -r 2be397cd726a pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/gtkmain.c	Sat May 05 23:19:27 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
diff -r d0e74d0be43f -r 2be397cd726a pidgin/gtksound.c
--- a/pidgin/gtksound.c	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/gtksound.c	Sat May 05 23:19:27 2007 +0000
@@ -430,7 +430,7 @@
 			return;
 		}
 
-		esc_filename = g_strdup_printf("'%s'", filename);
+		esc_filename = g_shell_quote(filename);
 
 		if(strstr(sound_cmd, "%s"))
 			command = purple_strreplace(sound_cmd, "%s", esc_filename);
diff -r d0e74d0be43f -r 2be397cd726a pidgin/plugins/Makefile.am
--- a/pidgin/plugins/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -107,7 +107,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/pidgin \
diff -r d0e74d0be43f -r 2be397cd726a pidgin/plugins/cap/Makefile.am
--- a/pidgin/plugins/cap/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/plugins/cap/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -19,7 +19,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
diff -r d0e74d0be43f -r 2be397cd726a pidgin/plugins/gestures/Makefile.am
--- a/pidgin/plugins/gestures/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/plugins/gestures/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -19,7 +19,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
diff -r d0e74d0be43f -r 2be397cd726a pidgin/plugins/gevolution/Makefile.am
--- a/pidgin/plugins/gevolution/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/plugins/gevolution/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -21,7 +21,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
diff -r d0e74d0be43f -r 2be397cd726a pidgin/plugins/musicmessaging/Makefile.am
--- a/pidgin/plugins/musicmessaging/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/plugins/musicmessaging/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -36,7 +36,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/pidgin \
diff -r d0e74d0be43f -r 2be397cd726a pidgin/plugins/perl/Makefile.am
--- a/pidgin/plugins/perl/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/plugins/perl/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -95,7 +95,6 @@
 	@rm -f Makefile
 
 AM_CPPFLAGS = \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
diff -r d0e74d0be43f -r 2be397cd726a pidgin/plugins/ticker/Makefile.am
--- a/pidgin/plugins/ticker/Makefile.am	Sat May 05 16:48:06 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.am	Sat May 05 23:19:27 2007 +0000
@@ -20,7 +20,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \