Mercurial > pidgin
changeset 23776:def0d893e737
merge of 'c121cde51cc5bd48a26b46df14b86756465ef4a4'
and 'ec0f88109090f08d9777f563253782d05cef4624'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Wed, 06 Feb 2008 19:11:25 +0000 |
parents | d5d3efbfcf30 (diff) 1fefd8340821 (current diff) |
children | f5bcb58bdf56 |
files | libpurple/protocols/jabber/libxmpp.c libpurple/prpl.h |
diffstat | 3 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sat Dec 29 20:56:28 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Wed Feb 06 19:11:25 2008 +0000 @@ -2320,10 +2320,12 @@ return TRUE; } +#ifdef USE_FARSIGHT PurpleMedia *jabber_media_initiate(PurpleConnection *gc, const char *who, PurpleMediaStreamType type) { return NULL; } +#endif void jabber_register_commands(void) {
--- a/libpurple/protocols/jabber/jabber.h Sat Dec 29 20:56:28 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.h Wed Feb 06 19:11:25 2008 +0000 @@ -55,6 +55,7 @@ #include "dnssrv.h" #include "roomlist.h" #include "sslconn.h" +#include "media.h" #include "jutil.h" #include "xmlnode.h" @@ -259,5 +260,9 @@ GList *jabber_actions(PurplePlugin *plugin, gpointer context); void jabber_register_commands(void); void jabber_init_plugin(PurplePlugin *plugin); + +#ifdef USE_FARSIGHT PurpleMedia *jabber_media_initiate(PurpleConnection *gc, const char *who, PurpleMediaStreamType type); +#endif + #endif /* _PURPLE_JABBER_H_ */