# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1202325085 0
# Node ID def0d893e7377dba05778be8198ffee698966834
# Parent  d5d3efbfcf3034c4f81e1a11eb2e932ddf613e94# Parent  1fefd8340821534a19d43bff776e131383fc18e3
merge of 'c121cde51cc5bd48a26b46df14b86756465ef4a4'
     and 'ec0f88109090f08d9777f563253782d05cef4624'

diff -r 1fefd8340821 -r def0d893e737 libpurple/protocols/jabber/jabber.c
--- 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)
 {
diff -r 1fefd8340821 -r def0d893e737 libpurple/protocols/jabber/jabber.h
--- 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_ */
diff -r 1fefd8340821 -r def0d893e737 libpurple/protocols/jabber/libxmpp.c
diff -r 1fefd8340821 -r def0d893e737 libpurple/prpl.h
--- a/libpurple/prpl.h	Sat Dec 29 20:56:28 2007 +0000
+++ b/libpurple/prpl.h	Wed Feb 06 19:11:25 2008 +0000
@@ -558,3 +558,4 @@
 #endif
 
 #endif /* _PRPL_H_ */
+