# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1198950347 0
# Node ID d5d3efbfcf3034c4f81e1a11eb2e932ddf613e94
# Parent  b20e24fcae470cc05bfee6b82c2b2a6a0712798d
Fix some compilation problems when USE_FARSIGHT isn't defined.

diff -r b20e24fcae47 -r d5d3efbfcf30 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sat Dec 29 06:41:04 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Dec 29 17:45:47 2007 +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 b20e24fcae47 -r d5d3efbfcf30 libpurple/protocols/jabber/jabber.h
--- a/libpurple/protocols/jabber/jabber.h	Sat Dec 29 06:41:04 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Sat Dec 29 17:45:47 2007 +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 b20e24fcae47 -r d5d3efbfcf30 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Sat Dec 29 06:41:04 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sat Dec 29 17:45:47 2007 +0000
@@ -115,7 +115,11 @@
 	jabber_unregister_account,		/* unregister_user */
 	jabber_send_attention,			/* send_attention */
 	jabber_attention_types,			/* attention_types */
+#ifdef USE_FARSIGHT
 	jabber_media_initiate           /* initiate_media */
+#else
+	NULL							/* initiate_media */
+#endif
 };
 
 static gboolean load_plugin(PurplePlugin *plugin)
diff -r b20e24fcae47 -r d5d3efbfcf30 libpurple/prpl.h
--- a/libpurple/prpl.h	Sat Dec 29 06:41:04 2007 +0000
+++ b/libpurple/prpl.h	Sat Dec 29 17:45:47 2007 +0000
@@ -404,7 +404,7 @@
 #ifdef USE_FARSIGHT
 	PurpleMedia  *(*initiate_media)(PurpleConnection *conn, const char *who, PurpleMediaStreamType type);
 #else
-	void (*initiate_media)(void)
+	void (*initiate_media)(void);
 #endif
 	/* Make sure you do not try to dereference anything past struct_size! */
 	int struct_size;