# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1232932579 0
# Node ID b7d40ccd9997e2383df3ebab044e433846c76fc3
# Parent  ea325948453ce8436fabe3ba05223dcc722353a2# Parent  b3015da48886e9fa628db3eeaeaa866502af698b
propagate from branch 'im.pidgin.pidgin' (head da4fface7b23fb7415d6ce2a72770ce5fbe006a0)
            to branch 'im.pidgin.pidgin.next.minor' (head 3e5ff89e571b71aeb7665812bd6aff22015a16a4)

diff -r ea325948453c -r b7d40ccd9997 AUTHORS
--- a/AUTHORS	Mon Jan 26 01:13:25 2009 +0000
+++ b/AUTHORS	Mon Jan 26 01:16:19 2009 +0000
@@ -36,7 +36,6 @@
 Crazy Patch Writers:
 -------------------
 Paul Aurich
-Felipe 'shx' Contreras
 Marcus 'malu' Lundblad
 Dennis 'EvilDennisR' Ristuccia
 Peter 'Fmoo' Ruibal
@@ -57,6 +56,7 @@
 
 Retired Crazy Patch Writers:
 ---------------------------
+Felipe 'shx' Contreras
 Decklin Foster
 Peter 'Bleeter' Lawler
 Robert 'Robot101' McQueen
diff -r ea325948453c -r b7d40ccd9997 COPYRIGHT
--- a/COPYRIGHT	Mon Jan 26 01:13:25 2009 +0000
+++ b/COPYRIGHT	Mon Jan 26 01:16:19 2009 +0000
@@ -480,6 +480,7 @@
 Dan Winship
 Michal Witkowski
 Scott Wolchok
+Rogier Wolff
 The Written Word, Inc.
 Kevin Wu Won
 Pui Lam Wong
diff -r ea325948453c -r b7d40ccd9997 doc/finch.1.in
--- a/doc/finch.1.in	Mon Jan 26 01:13:25 2009 +0000
+++ b/doc/finch.1.in	Mon Jan 26 01:16:19 2009 +0000
@@ -543,23 +543,26 @@
 \fIhttp://developer.pidgin.im/query?status=new&status=assigned&status=reopened&component=finch+%28gnt%2Fncurses%29&order=priority\fR
 
 Before sending a bug report, please verify that you have the latest
-version of \fBfinch\fR and \fBlibpurple\fR.  Many bugs (major and minor) are
+version of \fBfinch\fR and libpurple.  Many bugs (major and minor) are
 fixed at each release, and if yours is out of date, the problem may already have
 been solved.
 
-
 .SH PATCHES
 If you fix a bug in \fBfinch\fR (or otherwise enhance it), please submit a
-patch (using \fImtn diff > my.diff\fR against the latest version from the
-Monotone repository) at
-.br
-\fIhttp://developer.pidgin.im/newticket\fR
+patch (using \fBmtn diff > my.diff\fR against the latest version from the
+Monotone repository) at \fIhttp://developer.pidgin.im/simpleticket\fR
 
-You are also encouraged to drop by at \fB#pidgin\fR on \fIirc.freenode.net\fR to
-discuss development.
+You are also encouraged to drop by at \fB#pidgin\fR on \fIirc.freenode.net\fR
+to discuss development.
 
 .SH SEE ALSO
 \fIhttp://pidgin.im/\fR
+.br
+\fIhttp://developer.pidgin.im/\fR
+.br
+\fBpurple-remote\fR(1)
+.br
+\fBpidgin\fR(1)
 
 .SH LICENSE
 This program is free software; you can redistribute it and/or modify
diff -r ea325948453c -r b7d40ccd9997 doc/pidgin.1.in
--- a/doc/pidgin.1.in	Mon Jan 26 01:13:25 2009 +0000
+++ b/doc/pidgin.1.in	Mon Jan 26 01:16:19 2009 +0000
@@ -34,6 +34,9 @@
 many common features found in other clients, as well as many unique features.
 Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
 Yahoo.
+.PP
+Pidgin can be extended by plugins written in multiple programming languages and
+controlled through DBus or \fBpurple-remote\fR.
 
 .SH OPTIONS
 The following options are provided by Pidgin using the standard GNU
@@ -556,20 +559,28 @@
 .SH BUGS
 The bug tracker can be reached by visiting \fIhttp://developer.pidgin.im/query\fR
 
-.SH PATCHES
-If you fix a bug in Pidgin (or otherwise enhance it), please submit a
-patch (using \fImtn diff > my.diff\fR against the latest version from the
-Monotone repository) at \fIhttp://developer.pidgin.im/simpleticket\fR
-
 Before sending a bug report, please verify that you have the latest
 version of Pidgin.  Many bugs (major and minor) are fixed
 at each release, and if yours is out of date, the problem may already
 have been solved.
 
+.SH PATCHES
+If you fix a bug in Pidgin (or otherwise enhance it), please submit a
+patch (using \fBmtn diff > my.diff\fR against the latest version from the
+Monotone repository) at \fIhttp://developer.pidgin.im/simpleticket\fR
+
+You are also encouraged to drop by at \fB#pidgin\fR on \fIirc.freenode.net\fR
+to discuss development.
+
+
 .SH SEE ALSO
 \fIhttp://pidgin.im/\fR
 .br
 \fIhttp://developer.pidgin.im/\fR
+.br
+\fBpurple-remote\fR(1)
+.br
+\fBfinch\fR(1)
 
 .SH LICENSE
 This program is free software; you can redistribute it and/or modify
@@ -643,8 +654,6 @@
 .br
   Paul Aurich
 .br
-  Felipe 'shx' Contreras
-.br
   Marcus 'malu' Lundblad
 .br
   Dennis 'EvilDennisR' Ristuccia
@@ -687,6 +696,8 @@
 
 Our retired crazy patch writers include:
 .br
+  Felipe 'shx' Contreras
+.br
   Decklin Foster
 .br
   Peter 'Bleeter' Lawler
diff -r ea325948453c -r b7d40ccd9997 libpurple/protocols/msn/slpcall.c
--- a/libpurple/protocols/msn/slpcall.c	Mon Jan 26 01:13:25 2009 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Mon Jan 26 01:16:19 2009 +0000
@@ -239,6 +239,10 @@
 			msn_slpcall_session_init(slpcall);
 	}
 #endif
+	else if (slpmsg->flags == 0x2)
+	{
+		/* Acknowledgement of previous message. Don't do anything currently. */
+	}
 	else
 		purple_debug_warning("msn", "Unprocessed SLP message with flags 0x%08lx\n",
 		                     slpmsg->flags);
diff -r ea325948453c -r b7d40ccd9997 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Mon Jan 26 01:13:25 2009 +0000
+++ b/pidgin/gtkmain.c	Mon Jan 26 01:16:19 2009 +0000
@@ -788,8 +788,8 @@
 		dbus_connection_send_with_reply_and_block(conn, message, -1, NULL);
 		dbus_message_unref(message);
 #endif
-		purple_debug_info("main", "exiting because another libpurple client is already running\n");
 		purple_core_quit();
+		g_printerr(_("Exiting because another libpurple client is already running.\n"));
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
 #endif