soc.2008.vv: 96c61987: Use USE_VV instead of USE_FARSIGHT.
maiku at soc.pidgin.im
maiku at soc.pidgin.im
Thu May 29 12:28:42 EDT 2008
-----------------------------------------------------------------
Revision: 96c6198726fb7811a7762a8b11f05d257843729b
Ancestor: 25b76296d1571dd987e4660eff89c440da04cb3f
Author: maiku at soc.pidgin.im
Date: 2008-05-28T21:00:40
Branch: im.pidgin.soc.2008.vv
URL: http://d.pidgin.im/viewmtn/revision/info/96c6198726fb7811a7762a8b11f05d257843729b
Modified files:
finch/gntdebug.c finch/gntmedia.c finch/gntmedia.h
finch/gntui.c libpurple/media.c libpurple/media.h
libpurple/mediamanager.c libpurple/mediamanager.h
libpurple/protocols/jabber/google.c
libpurple/protocols/jabber/iq.c
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
libpurple/protocols/jabber/jingle.c
libpurple/protocols/jabber/jingle.h
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/jabber/presence.c libpurple/prpl.h
libpurple/server.c libpurple/server.h pidgin/gtkconv.c
pidgin/gtkdebug.c pidgin/gtkimhtmltoolbar.c
pidgin/gtkmedia.c pidgin/gtkmedia.h pidgin/gtkprefs.c
pidgin/pidginstock.c pidgin/pidginstock.h
ChangeLog:
Use USE_VV instead of USE_FARSIGHT.
-------------- next part --------------
============================================================
--- finch/gntdebug.c 6aa09ffb44a99193fa1d3a044654951ea5e64233
+++ finch/gntdebug.c 60014daafb813cb85462890b331ea7659af76124
@@ -348,11 +348,13 @@ void finch_debug_init()
#ifdef USE_GSTREAMER
REGISTER_G_LOG_HANDLER("GStreamer");
#endif
+#ifdef USE_VV
#ifdef USE_FARSIGHT
REGISTER_G_LOG_HANDLER("farsight");
REGISTER_G_LOG_HANDLER("farsight-transmitter");
REGISTER_G_LOG_HANDLER("farsight-rtp");
#endif
+#endif
g_set_print_handler(print_stderr); /* Redirect the debug messages to stderr */
if (!purple_debug_is_enabled())
============================================================
--- finch/gntmedia.c c619eb537b7965499fa79693691182caefb30114
+++ finch/gntmedia.c 662232a705ce7ae14be24de511688c23a832a853
@@ -40,7 +40,7 @@
#include "debug.h"
/* An incredibly large part of the following is from gtkmedia.c */
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#undef hangup
@@ -454,5 +454,5 @@ void finch_media_manager_uninit(void)
G_CALLBACK(finch_new_media), NULL);
}
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
============================================================
--- finch/gntmedia.h 70481c874d95d4f3dd1d97b1f75ab15c0bc9878d
+++ finch/gntmedia.h eac76d1bfdb827e50d872b602baedbac35123bd4
@@ -31,7 +31,7 @@
#include "config.h"
#endif
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#include <glib-object.h>
#include "gntbox.h"
@@ -71,7 +71,7 @@ G_END_DECLS
G_END_DECLS
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
#endif /* GNT_MEDIA_H */
============================================================
--- finch/gntui.c 8553f4d38f9263518a6511671289278a82acf29e
+++ finch/gntui.c 378563e37041e431c152b71bf0bd50e1c8bd50de
@@ -92,7 +92,7 @@ void gnt_ui_init()
finch_roomlist_init();
purple_roomlist_set_ui_ops(finch_roomlist_get_ui_ops());
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
/* Media */
finch_media_manager_init();
#endif
@@ -142,7 +142,7 @@ void gnt_ui_uninit()
finch_roomlist_uninit();
purple_roomlist_set_ui_ops(NULL);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
finch_media_manager_uninit();
#endif
============================================================
--- libpurple/media.c 38c5eecbf78b5fdc0cf4aa9d0b7285ce51b42384
+++ libpurple/media.c 078c9d0d3a2a12ad4e4a8b2cbaf9a770a5270c7f
@@ -33,8 +33,7 @@
#include "debug.h"
-#ifdef USE_FARSIGHT
-#ifdef USE_GSTPROPS
+#ifdef USE_VV
#include <gst/interfaces/propertyprobe.h>
#include <gst/farsight/fs-conference-iface.h>
@@ -916,5 +915,4 @@ purple_media_set_remote_audio_codecs(Pur
fs_stream_set_remote_codecs(purple_media_get_audio_stream(media, name), codecs, NULL);
}
+#endif /* USE_VV */
-#endif /* USE_GSTPROPS */
-#endif /* USE_FARSIGHT */
============================================================
--- libpurple/media.h 726eeb086c3a1c4cab1ce6995ed670853a28ee58
+++ libpurple/media.h 5a198dd5b14ebd199b2811cc955d9f1e06a0bcf6
@@ -26,8 +26,7 @@
#ifndef __MEDIA_H_
#define __MEDIA_H_
-#ifdef USE_FARSIGHT
-#ifdef USE_GSTPROPS
+#ifdef USE_VV
#include <gst/gst.h>
#include <gst/farsight/fs-stream.h>
@@ -129,8 +128,7 @@ G_END_DECLS
G_END_DECLS
-#endif /* USE_GSTPROPS */
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
#endif /* __MEDIA_H_ */
============================================================
--- libpurple/mediamanager.c 1b5a10068805e11435b4db260a842f58ee6868db
+++ libpurple/mediamanager.c 2abad99e2cc67a6c21a9a320baafae58b79c714c
@@ -29,7 +29,7 @@
#include "mediamanager.h"
#include "media.h"
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#include <gst/farsight/fs-conference-iface.h>
@@ -154,4 +154,4 @@ purple_media_manager_create_media(Purple
return media;
}
+#endif /* USE_VV */
-#endif /* USE_FARSIGHT */
============================================================
--- libpurple/mediamanager.h d63d0a75c4ff9a695b3ec02224494597f4633fe2
+++ libpurple/mediamanager.h 67c5a26d0fe058b95cc6ebdc401c96a21ed535ff
@@ -26,7 +26,7 @@
#ifndef __MEDIA_MANAGER_H_
#define __MEDIA_MANAGER_H_
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#include <gst/farsight/fs-session.h>
#include <glib.h>
@@ -68,7 +68,7 @@ G_END_DECLS
G_END_DECLS
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
#endif /* __MEDIA_MANAGER_H_ */
============================================================
--- libpurple/protocols/jabber/google.c a6adae335613d3ad6c5c3308b23911c988674f49
+++ libpurple/protocols/jabber/google.c 4ca67713c6066ec6708666551a602523cacc5a13
@@ -30,7 +30,7 @@
#include "presence.h"
#include "iq.h"
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#include <gst/farsight/fs-conference-iface.h>
typedef struct {
@@ -324,12 +324,12 @@ google_session_parse_iq(JabberStream *js
google_session_handle_candidates(js, session, packet, sess);
}
}
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
void
jabber_google_session_parse(JabberStream *js, xmlnode *packet)
{
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
GoogleSession *session;
GoogleSessionId id;
@@ -377,7 +377,7 @@ jabber_google_session_parse(JabberStream
google_session_parse_iq(js, session, packet);
#else
/* TODO: send proper error response */
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
}
static void
============================================================
--- libpurple/protocols/jabber/iq.c 4059e5a51fa4935d0724d12c526a52d3e71592b7
+++ libpurple/protocols/jabber/iq.c 593baf9ac643b022c8730a8b12e9b4b836fe29dc
@@ -358,7 +358,7 @@ void jabber_iq_parse(JabberStream *js, x
return;
}
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
/* handle session initiate XEP 0167 */
if (type && !strcmp(type, "set")) {
/* is this a Jingle package? */
============================================================
--- libpurple/protocols/jabber/jabber.c dbbf7a06bbd51af83960d66e751974663635f14d
+++ libpurple/protocols/jabber/jabber.c 0f21ca51f19357c1cce8a7f3ecf8a107b7504c5c
@@ -58,7 +58,7 @@
#include "adhoccommands.h"
#include "jingle.h"
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#include <gst/farsight/fs-conference-iface.h>
#endif
@@ -634,7 +634,7 @@ jabber_login(PurpleAccount *account)
js->keepalive_timeout = -1;
js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user->domain);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
js->sessions = NULL;
#endif
@@ -1248,7 +1248,7 @@ void jabber_close(PurpleConnection *gc)
{
JabberStream *js = gc->proto_data;
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
/* Close all of the open media sessions on this stream */
GList *values = g_hash_table_get_values(js->sessions);
GList *iter = values;
@@ -1883,13 +1883,13 @@ void jabber_convo_closed(PurpleConnectio
JabberID *jid;
JabberBuddy *jb;
JabberBuddyResource *jbr;
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
JingleSession *session;
#endif
if(!(jid = jabber_id_new(who)))
return;
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
session = jabber_jingle_session_find_by_jid(js, who);
if (session) {
@@ -2374,7 +2374,7 @@ gboolean jabber_offline_message(const Pu
return TRUE;
}
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
static void
jabber_session_send_accept(JingleSession *session)
============================================================
--- libpurple/protocols/jabber/jabber.h d8e1ae73dcb89fbf988c58ac4d6d456ceaa2be68
+++ libpurple/protocols/jabber/jabber.h 29e84f9799d5342e1efa3ed2fe7695e9409eea45
@@ -204,7 +204,7 @@ struct _JabberStream
/* A purple timeout tag for the keepalive */
int keepalive_timeout;
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
/* keep a hash table of JingleSessions */
GHashTable *sessions;
#endif
@@ -275,7 +275,7 @@ void jabber_init_plugin(PurplePlugin *pl
void jabber_register_commands(void);
void jabber_init_plugin(PurplePlugin *plugin);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
PurpleMedia *jabber_initiate_media(PurpleConnection *gc, const char *who, PurpleMediaStreamType type);
gboolean jabber_can_do_media(PurpleConnection *gc, const char *who, PurpleMediaStreamType type);
============================================================
--- libpurple/protocols/jabber/jingle.c b5b4a425f6b1587a72b739edae8c2316e9a0cf43
+++ libpurple/protocols/jabber/jingle.c 6bca5215d244b580fdc278600498dfdaacb1bc8f
@@ -26,7 +26,7 @@
#include <string.h>
#include <glib.h>
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#include <gst/farsight/fs-candidate.h>
@@ -481,4 +481,4 @@ jabber_jingle_session_create_content_acc
return jingle;
}
+#endif /* USE_VV */
-#endif /* USE_FARSIGHT */
============================================================
--- libpurple/protocols/jabber/jingle.h 5d618604c68b4a7ec2853f7770f3abfe31ef7f3e
+++ libpurple/protocols/jabber/jingle.h ba76ec08a4692526284147c9f0063e1786343bcf
@@ -24,7 +24,7 @@
#include <glib.h>
#include <glib-object.h>
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
G_BEGIN_DECLS
@@ -87,6 +87,6 @@ G_END_DECLS
G_END_DECLS
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
#endif /* JINGLE_H */
============================================================
--- libpurple/protocols/jabber/libxmpp.c 148573da65a9e09f2de9a4a0def6d95f7326b571
+++ libpurple/protocols/jabber/libxmpp.c abe1fba79317dc5149d2a27fd9c441955e68febc
@@ -116,7 +116,7 @@ static PurplePluginProtocolInfo prpl_inf
jabber_send_attention, /* send_attention */
jabber_attention_types, /* attention_types */
sizeof(PurplePluginProtocolInfo), /* struct_size */
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
jabber_initiate_media, /* initiate_media */
jabber_can_do_media /* can_do_media */
#else
@@ -281,7 +281,7 @@ init_plugin(PurplePlugin *plugin)
jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled);
jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
jabber_add_feature("voice-v1", "http://www.xmpp.org/extensions/xep-0167.html#ns", NULL);
#endif
}
============================================================
--- libpurple/protocols/jabber/presence.c fd38d088bf20f8612e090439a8ad3fd58e7488fb
+++ libpurple/protocols/jabber/presence.c 500c54790aad24654dc257f64d93879cd80920f5
@@ -265,7 +265,7 @@ xmlnode *jabber_presence_create_js(Jabbe
xmlnode_set_namespace(c, "http://jabber.org/protocol/caps");
xmlnode_set_attrib(c, "node", CAPS0115_NODE);
xmlnode_set_attrib(c, "ver", VERSION);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
/* Make sure this is 'voice-v1', or you won't be able to talk to Google Talk */
xmlnode_set_attrib(c, "ext", "voice-v1");
#endif
============================================================
--- libpurple/prpl.h 58f91651af5680998e0bf906095f973c8293d149
+++ libpurple/prpl.h dcc7cad659cf01881a7e0a1679b67ea6f01d34ab
@@ -402,7 +402,7 @@ struct _PurplePluginProtocolInfo
/* Make sure you do not try to dereference anything past struct_size! */
int struct_size;
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
/* Initiate media with the given buddy */
PurpleMedia *(*initiate_media)(PurpleConnection *conn, const char *who, PurpleMediaStreamType type);
============================================================
--- libpurple/server.c 377c3fc2682092eba30556582b7ac5b4dcbe06cb
+++ libpurple/server.c 26a2d0734177ed0c710c36220a9333ea2f9eaa7d
@@ -37,7 +37,7 @@
#include "server.h"
#include "status.h"
#include "util.h"
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#include "media.h"
#endif
@@ -1044,7 +1044,7 @@ void serv_send_file(PurpleConnection *gc
}
}
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
PurpleMedia *serv_initiate_media(PurpleConnection *gc, const char *who,
PurpleMediaStreamType type)
{
@@ -1097,4 +1097,4 @@ serv_can_do_media(void *gc, void *who, v
purple_debug_info("serv", "Blank serv_can_do_media called\n");
return NULL;
}
+#endif /* USE_VV */
-#endif /* USE_FARSIGHT */
============================================================
--- libpurple/server.h c317bb0acf066116d94d5a03b4fc4a6e252f7262
+++ libpurple/server.h ea8a78336ad709746cc104b20496c07fb6d0f49d
@@ -172,7 +172,7 @@ void serv_send_file(PurpleConnection *gc
PurpleMessageFlags flags, const char *message, time_t mtime);
void serv_send_file(PurpleConnection *gc, const char *who, const char *file);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
PurpleMedia *serv_initiate_media(PurpleConnection *gc, const char *who,
PurpleMediaStreamType type);
gboolean serv_can_do_media(PurpleConnection *gc, const char *who,
============================================================
--- pidgin/gtkconv.c cf564aa782cf053932ecade2b09d8716570e585d
+++ pidgin/gtkconv.c 9c9354d45151634795ab8713ba5ef72af24039f5
@@ -1172,7 +1172,7 @@ menu_find_cb(gpointer data, guint action
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 @@ static GtkItemFactoryEntry menu_items[]
{ "/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 @@ setup_menubar(PidginWindow *win)
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 @@ gray_stuff_out(PidginConversation *gtkco
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 @@ gboolean pidgin_conv_attach_to_conversat
}
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
static void
pidgin_gtkmedia_message_cb(PidginMedia *media, const char *msg, PurpleConversation *conv)
@@ -7828,7 +7828,7 @@ 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
+#ifdef USE_VV
g_signal_connect(G_OBJECT(purple_media_manager_get()), "init-media",
G_CALLBACK(pidgin_conv_new_media_cb), NULL);
#endif
============================================================
--- pidgin/gtkdebug.c c0348ad7e6a138c197be13ac950307a24fd9bde1
+++ pidgin/gtkdebug.c ab111a8278ad4b15fa60b9645635198c4ca426e8
@@ -985,11 +985,13 @@ pidgin_debug_init(void)
#ifdef USE_GSTREAMER
REGISTER_G_LOG_HANDLER("GStreamer");
#endif
+#ifdef USE_VV
#ifdef USE_FARSIGHT
REGISTER_G_LOG_HANDLER("farsight");
REGISTER_G_LOG_HANDLER("farsight-transmitter");
REGISTER_G_LOG_HANDLER("farsight-rtp");
#endif
+#endif
#ifdef _WIN32
if (!purple_debug_is_enabled())
============================================================
--- pidgin/gtkimhtmltoolbar.c dde0d5fc06547f24b8a3380a90520c60ba411111
+++ pidgin/gtkimhtmltoolbar.c 8f4aca59dba15466b5cb68e8da813d0a6e6a1970
@@ -790,7 +790,7 @@ insert_smiley_cb(GtkWidget *smiley, GtkI
gtk_widget_grab_focus(toolbar->imhtml);
}
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
static void
init_voice_call_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar)
{
@@ -826,7 +826,7 @@ static void update_buttons_cb(GtkIMHtml
gtk_widget_set_sensitive(GTK_WIDGET(toolbar->image), buttons & GTK_IMHTML_IMAGE);
gtk_widget_set_sensitive(GTK_WIDGET(toolbar->link), buttons & GTK_IMHTML_LINK);
gtk_widget_set_sensitive(GTK_WIDGET(toolbar->smiley), buttons & GTK_IMHTML_SMILEY);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
gtk_widget_set_sensitive(GTK_WIDGET(toolbar->call), buttons & GTK_IMHTML_CALL);
#endif
}
@@ -1117,7 +1117,7 @@ static void gtk_imhtmltoolbar_create_old
{PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")},
{PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, insert_image_cb, &toolbar->image, _("Insert IM Image")},
{PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")},
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
{"", NULL, NULL, NULL},
{PIDGIN_STOCK_TOOLBAR_CALL, init_voice_call_cb, &toolbar->call, _("Call")},
#endif
@@ -1187,9 +1187,9 @@ static void gtk_imhtmltoolbar_init (GtkI
GtkWidget *font_button;
GtkWidget *smiley_button;
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
GtkWidget *call_button;
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
GtkWidget *font_menu;
GtkWidget *insert_menu;
@@ -1332,7 +1332,7 @@ static void gtk_imhtmltoolbar_init (GtkI
g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley);
gtk_widget_show_all(smiley_button);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
/* Sep */
sep = gtk_vseparator_new();
gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
@@ -1352,7 +1352,7 @@ static void gtk_imhtmltoolbar_init (GtkI
g_signal_connect_swapped(G_OBJECT(call_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->call);
gtk_widget_show_all(call_button);
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0);
g_object_set_data(G_OBJECT(hbox), "lean-view", box);
============================================================
--- pidgin/gtkmedia.c 1fb3568b8a5823b35dd25eb49f00bd46d4eeddfa
+++ pidgin/gtkmedia.c 3fa04f11d5468e8a4c5bcf5b8f000a55ece89145
@@ -30,7 +30,7 @@
#include "gtkmedia.h"
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
typedef enum
{
@@ -412,4 +412,4 @@ pidgin_media_set_state(PidginMedia *gtkm
}
}
+#endif /* USE_VV */
-#endif /* USE_FARSIGHT */
============================================================
--- pidgin/gtkmedia.h 98008273e4638ee6d218c317f6cbc5f07e277112
+++ pidgin/gtkmedia.h 45bc503a761d8b9ef0825d81361cba538637fbd8
@@ -26,7 +26,7 @@
#ifndef __GTKMEDIA_H_
#define __GTKMEDIA_H_
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#include <gtk/gtk.h>
#include <glib-object.h>
@@ -63,7 +63,7 @@ G_END_DECLS
G_END_DECLS
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
#endif /* __GTKMEDIA_H_ */
============================================================
--- pidgin/gtkprefs.c ea152909da6533b1c0794c7a494fbcb6ee6f113c
+++ pidgin/gtkprefs.c ad5594a116bf9ef9839d0391a46b8f26dae117b7
@@ -1910,7 +1910,7 @@ sound_page(void)
return ret;
}
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
/* get a GList of pairs name / device */
static GList *
@@ -2133,7 +2133,7 @@ media_page()
return ret;
}
-#endif
+#endif /* USE_VV */
static void
set_idle_away(PurpleSavedStatus *status)
@@ -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++);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
prefs_notebook_add_page(_("Media"), media_page(), notebook_page++);
#endif
prefs_notebook_add_page(_("Network"), network_page(), notebook_page++);
@@ -2388,14 +2388,14 @@ pidgin_prefs_init(void)
purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/smileys/theme",
smiley_theme_pref_cb, NULL);
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
purple_prefs_add_none("/purple/media");
purple_prefs_add_none("/purple/media/video");
purple_prefs_add_string("/purple/media/video/plugin", "gconfvideosrc");
purple_prefs_add_string("/purple/media/video/device", "");
purple_prefs_add_none("/purple/media/audio");
purple_prefs_add_string("/purple/media/audio/device", "");
-#endif /* USE_FARSIGHT */
+#endif /* USE_VV */
pidgin_prefs_update_old();
}
============================================================
--- pidgin/pidginstock.c 463dbde8771d215a9e4565702290b448e4f3a4ed
+++ pidgin/pidginstock.c 5adc2d205d6a4fce46d6f7a4c0c27f1fd696e8fa
@@ -169,7 +169,7 @@ static struct SizedStockIcon {
{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_TOOLBAR_SEND_FILE, "toolbar", "send-file.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
{ PIDGIN_STOCK_TOOLBAR_CALL, "toolbar", "call.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
#endif
============================================================
--- pidgin/pidginstock.h 079c5d0f0ae0319e51280f52436ee1f05df404b2
+++ pidgin/pidginstock.h 1a1208b11aedbfa4b73cd66606dec4d7c5db8b04
@@ -129,7 +129,7 @@
#define PIDGIN_STOCK_TOOLBAR_UNBLOCK "pidgin-unblock"
#define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar"
#define PIDGIN_STOCK_TOOLBAR_SEND_FILE "pidgin-send-file"
-#ifdef USE_FARSIGHT
+#ifdef USE_VV
#define PIDGIN_STOCK_TOOLBAR_CALL "pidgin-call"
#endif
More information about the Commits
mailing list