Mercurial > pidgin
changeset 23770:b20e24fcae47
Fixed some problems which came up while propagating
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Sat, 29 Dec 2007 06:41:04 +0000 |
| parents | 60f5abc6cf0c |
| children | d5d3efbfcf30 750d700098c1 |
| files | libpurple/protocols/bonjour/Makefile.am libpurple/protocols/jabber/libxmpp.c |
| diffstat | 2 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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)