diff pidgin/gtkconv.c @ 25654:cbe97caec684

Use USE_VV instead of USE_FARSIGHT.

--- a/pidgin/gtkconv.c	Wed May 28 18:41:03 2008 +0000
+++ b/pidgin/gtkconv.c	Wed May 28 21:00:40 2008 +0000
@@ -1172,7 +1172,7 @@
 	gtk_widget_grab_focus(s->entry);
 }
 
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
 /* Forward declare this here, because I want to keep VV-related stuff together
 for now */
 static void 
@@ -2971,7 +2971,7 @@
 
 	{ "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL },
 
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
 	{ N_("/Conversation/_Voice Call..."), NULL, menu_initiate_voice_call_cb, 0,
 		"<StockItem>", PIDGIN_STOCK_TOOLBAR_CALL},
 #endif
@@ -3277,7 +3277,7 @@
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Conversation/View Log"));
 
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
 	win->menu.call =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 									N_("/Conversation/Voice Call..."));
@@ -6391,7 +6391,7 @@
 		if(conv->features & PURPLE_CONNECTION_NO_IMAGES)
 			buttons &= ~GTK_IMHTML_IMAGE;
 
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
 		/* check if account support voice calls, and if the current buddy
 			supports it */
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
@@ -7674,7 +7674,7 @@
 }
 
 
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
 
 static void
 pidgin_gtkmedia_message_cb(PidginMedia *media, const char *msg, PurpleConversation *conv)
@@ -7828,7 +7828,7 @@
 								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
+#ifdef USE_VV
 	g_signal_connect(G_OBJECT(purple_media_manager_get()), "init-media",
 			 G_CALLBACK(pidgin_conv_new_media_cb), NULL);
 #endif