# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1242596960 0
# Node ID 47d963966c9aea942d80a5c221296826e7f5fb09
# Parent  0bce1b58e1fe1a942dd317bf567051f650981d0c# Parent  34e4e2ca7db9ffc78d76038fd073d156c3a77c1d
propagate from branch 'im.pidgin.cpw.sulabh.yahoo_16' (head 86a698e26bedb5017a143cb8cfeefd9c5bda7beb)
            to branch 'im.pidgin.pidgin' (head dcd01209d8af5268ac18d8f55577aadc4b1c1179)


Whoops

diff -r 34e4e2ca7db9 -r 47d963966c9a Doxyfile.in
diff -r 34e4e2ca7db9 -r 47d963966c9a finch/gntdebug.c
diff -r 34e4e2ca7db9 -r 47d963966c9a finch/gntft.c
diff -r 34e4e2ca7db9 -r 47d963966c9a finch/gntpounce.c
diff -r 34e4e2ca7db9 -r 47d963966c9a finch/gntstatus.c
diff -r 34e4e2ca7db9 -r 47d963966c9a finch/libgnt/wms/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a finch/libgnt/wms/s.c
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/example/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/internal.h
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/plugins/perl/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/plugins/ssl/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/plugins/tcl/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/bonjour/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/gg/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/irc/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Sun May 17 21:45:21 2009 +0000
+++ b/libpurple/protocols/jabber/message.c	Sun May 17 21:49:20 2009 +0000
@@ -1175,7 +1175,6 @@
 	jm->chat_state = JM_STATE_ACTIVE;
 	jm->to = g_strdup(who);
 	jm->id = jabber_get_next_id(jm->js);
-	jm->chat_state = JM_STATE_ACTIVE;
 
 	if(jbr) {
 		if(jbr->thread_id)
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/msn/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/msnp9/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/myspace/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/novell/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/oscar/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/qq/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/sametime/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/silc/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/simple/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a libpurple/protocols/zephyr/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a pidgin/gtkconn.c
diff -r 34e4e2ca7db9 -r 47d963966c9a pidgin/plugins/cap/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a pidgin/plugins/gestures/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a pidgin/plugins/gevolution/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a pidgin/plugins/musicmessaging/Makefile.am
diff -r 34e4e2ca7db9 -r 47d963966c9a pidgin/plugins/ticker/Makefile.am