soc.2008.vv: 7e0a41d4: Fix compiling with the --disable-vv swit...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 7e0a41d4f9759d489cd9c87e558de2a0f8258cdc
Ancestor: 58161a4a25b5b47a20546fd336a05d5db59f4f82
Author: maiku at soc.pidgin.im
Date: 2008-05-25T04:01:44
Branch: im.pidgin.soc.2008.vv
URL: http://d.pidgin.im/viewmtn/revision/info/7e0a41d4f9759d489cd9c87e558de2a0f8258cdc

Modified files:
        configure.ac finch/gntmedia.c finch/gntui.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c libpurple/server.c
        pidgin/gtkconv.c pidgin/gtkprefs.c

ChangeLog: 

Fix compiling with the --disable-vv switch.

-------------- next part --------------
============================================================
--- configure.ac	d106aed8151b1329fe6bac22603e85be78350306
+++ configure.ac	bac361f9b8a14b953e5d36894fa45043a1d35027
@@ -724,7 +724,7 @@ dnl ####################################
 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
============================================================
--- finch/gntmedia.c	4f92f2e4c444cf07f213de86c099d524c1aafdd2
+++ finch/gntmedia.c	c619eb537b7965499fa79693691182caefb30114
@@ -388,8 +388,6 @@ finch_media_new(PurpleMedia *media, GstE
 				NULL));
 }
 
-#endif  /* USE_FARSIGHT */
-
 static void
 gntmedia_message_cb(FinchMedia *gntmedia, const char *msg, PurpleConversation *conv)
 {
@@ -456,3 +454,5 @@ void finch_media_manager_uninit(void)
 			G_CALLBACK(finch_new_media), NULL);
 }
 
+#endif  /* USE_FARSIGHT */
+
============================================================
--- finch/gntui.c	8edaf0a4ba5410181fd490108962d4ab7584a5cb
+++ finch/gntui.c	8553f4d38f9263518a6511671289278a82acf29e
@@ -92,8 +92,10 @@ void gnt_ui_init()
 	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 @@ void gnt_ui_uninit()
 	finch_roomlist_uninit();
 	purple_roomlist_set_ui_ops(NULL);
 
+#ifdef USE_FARSIGHT
 	finch_media_manager_uninit();
+#endif
 
 	gnt_quit();
 #endif
============================================================
--- libpurple/protocols/jabber/google.c	73468b6784b2a3952c16bd157bdf23624d42fc32
+++ libpurple/protocols/jabber/google.c	a6adae335613d3ad6c5c3308b23911c988674f49
@@ -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_parse_iq(JabberStream *js
 		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 @@ jabber_google_session_parse(JabberStream
 	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
============================================================
--- libpurple/protocols/jabber/jabber.c	4ded5e041e185ef14223eb15984a217aa7214608
+++ libpurple/protocols/jabber/jabber.c	3380601ebb97179653aed573f823dfc7ea6fc7c5
@@ -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)
 
============================================================
--- libpurple/protocols/jabber/libxmpp.c	03f90f26ac4e17839f2b498be28b4da4fb94a6b0
+++ libpurple/protocols/jabber/libxmpp.c	148573da65a9e09f2de9a4a0def6d95f7326b571
@@ -116,8 +116,13 @@ static PurplePluginProtocolInfo prpl_inf
 	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)
============================================================
--- libpurple/server.c	1b797d3d0c4419476b782ab83f8ad4e3f548ec11
+++ libpurple/server.c	377c3fc2682092eba30556582b7ac5b4dcbe06cb
@@ -1083,5 +1083,18 @@ serv_can_do_media(PurpleConnection *gc, 
 		return FALSE;
 	}
 }
+#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 */
-    
-#endif
============================================================
--- pidgin/gtkconv.c	3262797a57630a224acb542e5f83da01bf988676
+++ pidgin/gtkconv.c	0462cbd9a12e345e7a15cfca2208f897cdcc96d4
@@ -7827,9 +7827,10 @@ pidgin_conversations_init(void)
 								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
 
 
 	/**********************************************************************
============================================================
--- pidgin/gtkprefs.c	51341bbb6a3f933e2a5b05a8b79bdee1579fa13d
+++ pidgin/gtkprefs.c	ea152909da6533b1c0794c7a494fbcb6ee6f113c
@@ -2260,7 +2260,7 @@ static void prefs_notebook_init(void) {
 	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++);