Fixed some problems which came up while propagating vv

Sat, 29 Dec 2007 06:41:04 +0000

author
Evan Schoenberg <evands@pidgin.im>
date
Sat, 29 Dec 2007 06:41:04 +0000
branch
vv
changeset 22070
19fdeda36e38
parent 22069
841d24b3a2bc
child 22071
4c47e360e467
child 22075
085f38d188de

Fixed some problems which came up while propagating

libpurple/protocols/bonjour/Makefile.am file | annotate | diff | comparison | revisions
libpurple/protocols/jabber/libxmpp.c file | annotate | diff | comparison | revisions
--- 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
 
--- 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)

mercurial