# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1211688104 0
# Node ID 4b9b265a8100426b5bf052e446ff9d72a67ba7b5
# Parent  6bf2dfb350c056e7e542eaedd022a83024f7161f
Fix compiling with the --disable-vv switch.

diff -r 6bf2dfb350c0 -r 4b9b265a8100 configure.ac
--- a/configure.ac	Sat May 24 20:02:01 2008 +0000
+++ b/configure.ac	Sun May 25 04:01:44 2008 +0000
@@ -724,7 +724,7 @@
 dnl #######################################################################
 dnl # Check for Farsight
 dnl #######################################################################
-AC_ARG_ENABLE(farsight2,
+AC_ARG_ENABLE(vv,
 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
 	enable_farsight="$enableval", enable_farsight="yes")
 if test "x$enable_farsight" != "xno"; then
diff -r 6bf2dfb350c0 -r 4b9b265a8100 finch/gntmedia.c
--- a/finch/gntmedia.c	Sat May 24 20:02:01 2008 +0000
+++ b/finch/gntmedia.c	Sun May 25 04:01:44 2008 +0000
@@ -388,8 +388,6 @@
 				NULL));
 }
 
-#endif  /* USE_FARSIGHT */
-
 static void
 gntmedia_message_cb(FinchMedia *gntmedia, const char *msg, PurpleConversation *conv)
 {
@@ -456,3 +454,5 @@
 			G_CALLBACK(finch_new_media), NULL);
 }
 
+#endif  /* USE_FARSIGHT */
+
diff -r 6bf2dfb350c0 -r 4b9b265a8100 finch/gntui.c
--- a/finch/gntui.c	Sat May 24 20:02:01 2008 +0000
+++ b/finch/gntui.c	Sun May 25 04:01:44 2008 +0000
@@ -92,8 +92,10 @@
 	finch_roomlist_init();
 	purple_roomlist_set_ui_ops(finch_roomlist_get_ui_ops());
 
+#ifdef USE_FARSIGHT
 	/* Media */
 	finch_media_manager_init();
+#endif
 
 	gnt_register_action(_("Accounts"), finch_accounts_show_all);
 	gnt_register_action(_("Buddy List"), finch_blist_show);
@@ -140,7 +142,9 @@
 	finch_roomlist_uninit();
 	purple_roomlist_set_ui_ops(NULL);
 
+#ifdef USE_FARSIGHT
 	finch_media_manager_uninit();
+#endif
 
 	gnt_quit();
 #endif
diff -r 6bf2dfb350c0 -r 4b9b265a8100 libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Sat May 24 20:02:01 2008 +0000
+++ b/libpurple/protocols/jabber/google.c	Sun May 25 04:01:44 2008 +0000
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <gst/farsight/fs-conference-iface.h>
-
 #include "internal.h"
 #include "debug.h"
 #include "mediamanager.h"
@@ -32,6 +30,9 @@
 #include "presence.h"
 #include "iq.h"
 
+#ifdef USE_FARSIGHT
+#include <gst/farsight/fs-conference-iface.h>
+
 typedef struct {
 	char *id;
 	char *initiator;
@@ -323,10 +324,12 @@
 		google_session_handle_candidates(js, session, packet, sess);
 	}
 }
+#endif /* USE_FARSIGHT */
 
 void
 jabber_google_session_parse(JabberStream *js, xmlnode *packet)
 {
+#ifdef USE_FARSIGHT
 	GoogleSession *session;
 	GoogleSessionId id;
 
@@ -372,6 +375,9 @@
 	g_hash_table_insert(sessions, &(session->id), session);
 
 	google_session_parse_iq(js, session, packet);
+#else
+	/* TODO: send proper error response */
+#endif /* USE_FARSIGHT */
 }
 
 static void
diff -r 6bf2dfb350c0 -r 4b9b265a8100 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sat May 24 20:02:01 2008 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sun May 25 04:01:44 2008 +0000
@@ -58,7 +58,9 @@
 #include "adhoccommands.h"
 #include "jingle.h"
 
+#ifdef USE_FARSIGHT
 #include <gst/farsight/fs-conference-iface.h>
+#endif
 
 #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5)
 
diff -r 6bf2dfb350c0 -r 4b9b265a8100 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Sat May 24 20:02:01 2008 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sun May 25 04:01:44 2008 +0000
@@ -116,8 +116,13 @@
 	jabber_send_attention,			/* send_attention */
 	jabber_attention_types,			/* attention_types */
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
+#ifdef USE_FARSIGHT
 	jabber_initiate_media,          /* initiate_media */
 	jabber_can_do_media             /* can_do_media */
+#else
+	NULL,					/* initiate_media */
+	NULL					/* can_do_media */
+#endif
 };
 
 static gboolean load_plugin(PurplePlugin *plugin)
diff -r 6bf2dfb350c0 -r 4b9b265a8100 libpurple/server.c
--- a/libpurple/server.c	Sat May 24 20:02:01 2008 +0000
+++ b/libpurple/server.c	Sun May 25 04:01:44 2008 +0000
@@ -1083,5 +1083,18 @@
 		return FALSE;
 	}
 }
-    
-#endif
+#else
+void *
+serv_initiate_media(void *gc, void *who, void *type)
+{
+	purple_debug_info("serv", "Blank serv_initiate_media called\n");
+	return NULL;
+}
+
+void *
+serv_can_do_media(void *gc, void *who, void *type)
+{
+	purple_debug_info("serv", "Blank serv_can_do_media called\n");
+	return NULL;
+}
+#endif /* USE_FARSIGHT */
diff -r 6bf2dfb350c0 -r 4b9b265a8100 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat May 24 20:02:01 2008 +0000
+++ b/pidgin/gtkconv.c	Sun May 25 04:01:44 2008 +0000
@@ -7827,9 +7827,10 @@
 								show_protocol_icons_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
                                 hide_new_pref_cb, NULL);
-
+#ifdef USE_FARSIGHT
 	g_signal_connect(G_OBJECT(purple_media_manager_get()), "init-media",
 			 G_CALLBACK(pidgin_conv_new_media_cb), NULL);
+#endif
 
 
 	/**********************************************************************
diff -r 6bf2dfb350c0 -r 4b9b265a8100 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Sat May 24 20:02:01 2008 +0000
+++ b/pidgin/gtkprefs.c	Sun May 25 04:01:44 2008 +0000
@@ -2260,7 +2260,7 @@
 	prefs_notebook_add_page(_("Smiley Themes"), theme_page(), notebook_page++);
 	prefs_notebook_add_page(_("Sounds"), sound_page(), notebook_page++);
 
-#if USE_FARSIGHT
+#ifdef USE_FARSIGHT
 	prefs_notebook_add_page(_("Media"), media_page(), notebook_page++);
 #endif	
 	prefs_notebook_add_page(_("Network"), network_page(), notebook_page++);