# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1198910464 0
# Node ID b20e24fcae470cc05bfee6b82c2b2a6a0712798d
# Parent  60f5abc6cf0cbef890379cc0e4be57b756eb1930
Fixed some problems which came up while propagating

diff -r 60f5abc6cf0c -r b20e24fcae47 libpurple/protocols/bonjour/Makefile.am
--- a/libpurple/protocols/bonjour/Makefile.am	Sat Dec 29 06:34:59 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.am	Sat Dec 29 06:41:04 2007 +0000
@@ -55,8 +55,5 @@
 if MDNS_AVAHI
   AM_CPPFLAGS += $(AVAHI_CFLAGS)
 else
-if MDNS_HOWL
-    AM_CPPFLAGS += $(HOWL_CFLAGS)
-endif
 endif
 
diff -r 60f5abc6cf0c -r b20e24fcae47 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Sat Dec 29 06:34:59 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sat Dec 29 06:41:04 2007 +0000
@@ -115,13 +115,7 @@
 	jabber_unregister_account,		/* unregister_user */
 	jabber_send_attention,			/* send_attention */
 	jabber_attention_types,			/* attention_types */
-
-	/* padding */
-	NULL
-	NULL,
-	NULL,
-	jabber_media_initiate,          /* initiate_media */
-	sizeof(PurplePluginProtocolInfo)
+	jabber_media_initiate           /* initiate_media */
 };
 
 static gboolean load_plugin(PurplePlugin *plugin)