im.pidgin.pidgin.vv: c121cde51cc5bd48a26b46df14b86756465ef4a4

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: c121cde51cc5bd48a26b46df14b86756465ef4a4
Ancestor: 06f8efa36821d6e1aa652f94a41f23a052ded1cf
Author: evands at pidgin.im
Date: 2007-12-29T17:45:47
Branch: im.pidgin.pidgin.vv

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c libpurple/prpl.h

ChangeLog: 

Fix some compilation problems when USE_FARSIGHT isn't defined.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	3c04ac5e22ea213ef7835a2f5116c2241a8dc45b
+++ libpurple/protocols/jabber/jabber.c	f2fd68a09efbb4b86ee6a106eaf588b274f0b36b
@@ -2320,10 +2320,12 @@ gboolean jabber_offline_message(const Pu
 	return TRUE;
 }
 
+#ifdef USE_FARSIGHT
 PurpleMedia *jabber_media_initiate(PurpleConnection *gc, const char *who, PurpleMediaStreamType type)
 {
 	return NULL;
 }
+#endif
 
 void jabber_register_commands(void)
 {
============================================================
--- libpurple/protocols/jabber/jabber.h	44bf88cb93da3d888816f6e2084ecf12859f3ff6
+++ libpurple/protocols/jabber/jabber.h	45096aae95bbb70178e4b3ae4c48e1727ce61f3d
@@ -55,6 +55,7 @@ typedef struct _JabberStream JabberStrea
 #include "dnssrv.h"
 #include "roomlist.h"
 #include "sslconn.h"
+#include "media.h"
 
 #include "jutil.h"
 #include "xmlnode.h"
@@ -259,5 +260,9 @@ void jabber_init_plugin(PurplePlugin *pl
 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_ */
============================================================
--- libpurple/protocols/jabber/libxmpp.c	c53a70ce0645520c4cdcc279494d43e37efbd236
+++ libpurple/protocols/jabber/libxmpp.c	a175401a794c8b33b8ed7f0b093878834cdb2fb7
@@ -115,7 +115,11 @@ static PurplePluginProtocolInfo prpl_inf
 	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)
============================================================
--- libpurple/prpl.h	cd272d0c45da9db23905013b24d18e27ad324b82
+++ libpurple/prpl.h	c8ab723e5c181fb08de78b39a85558d5e0579356
@@ -404,7 +404,7 @@ struct _PurplePluginProtocolInfo
 #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;