# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1265480343 0
# Node ID 3f84b7069366d79cb1a53a20668f1ea39505f74a
# Parent  57ae03fdb86fd6377921deaa125d0c2d73b08e07# Parent  419415a431e1ab49da5cafaec5f74adf3092c13a
propagate from branch 'im.pidgin.pidgin' (head d4d86f679550b678b19fb6ca8b2eeac194d66a45)
            to branch 'im.pidgin.pidgin.next.minor' (head fa2afb799773bed4de2047c0cf73354e22865648)

diff -r 419415a431e1 -r 3f84b7069366 libpurple/media.c
diff -r 419415a431e1 -r 3f84b7069366 libpurple/protocols/msn/state.c
diff -r 419415a431e1 -r 3f84b7069366 pidgin/gtkblist-theme-loader.c
--- a/pidgin/gtkblist-theme-loader.c	Sat Feb 06 06:40:49 2010 +0000
+++ b/pidgin/gtkblist-theme-loader.c	Sat Feb 06 18:19:03 2010 +0000
@@ -99,6 +99,7 @@
 		{NULL, NULL}
 	};
 
+	bgcolor = expanded_bgcolor = collapsed_bgcolor = contact_color = NULL;
 	expanded          = NULL;
 	collapsed         = NULL;
 	contact           = NULL;