im.pidgin.pidgin.vv: 06f8efa36821d6e1aa652f94a41f23a052ded1cf

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 06f8efa36821d6e1aa652f94a41f23a052ded1cf
Ancestor: bd0faa29b7416c302a4cb47e30b38108245dcaa0
Author: evands at pidgin.im
Date: 2007-12-29T06:41:04
Branch: im.pidgin.pidgin.vv

Modified files:
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/jabber/libxmpp.c

ChangeLog: 

Fixed some problems which came up while propagating

-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/Makefile.am	b6641ef57526c788e4d1167b31d37289723bda36
+++ libpurple/protocols/bonjour/Makefile.am	f216340ec301aa704851cd51c5393bc448d1006e
@@ -55,8 +55,5 @@ else
 if MDNS_AVAHI
   AM_CPPFLAGS += $(AVAHI_CFLAGS)
 else
-if MDNS_HOWL
-    AM_CPPFLAGS += $(HOWL_CFLAGS)
 endif
-endif
 
============================================================
--- libpurple/protocols/jabber/libxmpp.c	dee312e82579fbe7bb3ea8ecafd5e76b957345cd
+++ libpurple/protocols/jabber/libxmpp.c	c53a70ce0645520c4cdcc279494d43e37efbd236
@@ -115,13 +115,7 @@ static PurplePluginProtocolInfo prpl_inf
 	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)