Mercurial > pidgin
changeset 23810:10f5a529d2a6
merge of '38838bc806900103298d383237d2ae7cd60bbd82'
and '96c6198726fb7811a7762a8b11f05d257843729b'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 28 May 2008 21:13:36 +0000 |
| parents | 7d2e5f57dbca (current diff) cbe97caec684 (diff) |
| children | d048100a43ab |
| files | configure.ac finch/libgnt/pygnt/Files.txt finch/libgnt/pygnt/Makefile.am finch/libgnt/pygnt/Makefile.make finch/libgnt/pygnt/README.txt finch/libgnt/pygnt/common.c finch/libgnt/pygnt/common.h finch/libgnt/pygnt/dbus-gnt finch/libgnt/pygnt/example/rss/gnthtml.py finch/libgnt/pygnt/example/rss/gntrss-ui.py finch/libgnt/pygnt/example/rss/gntrss.py finch/libgnt/pygnt/file.py finch/libgnt/pygnt/gendef.sh finch/libgnt/pygnt/gnt.override finch/libgnt/pygnt/gntbox.override finch/libgnt/pygnt/gntfilesel.override finch/libgnt/pygnt/gntmodule.c finch/libgnt/pygnt/gnttree.override finch/libgnt/pygnt/gntwidget.override finch/libgnt/pygnt/test.py libpurple/protocols/jabber/iq.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/libxmpp.c libpurple/protocols/jabber/presence.c libpurple/protocols/zephyr/zephyr.h libpurple/prpl.h libpurple/server.c libpurple/server.h pidgin/gtkconv.c pidgin/gtkimhtmltoolbar.c pidgin/gtkprefs.c |
| diffstat | 28 files changed, 83 insertions(+), 70 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue May 27 16:30:26 2008 +0000 +++ b/configure.ac Wed May 28 21:13:36 2008 +0000 @@ -731,8 +731,8 @@ dnl ####################################################################### dnl # Check for Farsight dnl ####################################################################### -AC_ARG_ENABLE(vv, - [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], +AC_ARG_ENABLE(farsight, + [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], enable_farsight="$enableval", enable_farsight="yes") if test "x$enable_farsight" != "xno"; then PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 gstreamer-0.10 gstreamer-plugins-base-0.10 libxml-2.0], [ @@ -765,6 +765,19 @@ ]) fi +dnl ####################################################################### +dnl # Check for Voice and Video support +dnl ####################################################################### +AC_ARG_ENABLE(vv, + [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], + enable_vv="$enableval", enable_vv="yes") +if test "x$enable_vv" != "xno"; then + if test "x$enable_farsight" != "xno" -a "x$enable_gstprops" != "xno"; then + AC_DEFINE(USE_VV, 1, [Use voice and video]) + else + enable_vv="no" + fi +fi dnl ####################################################################### dnl # Check for Meanwhile headers (for Sametime) @@ -2444,7 +2457,7 @@ echo Protocols to link statically.. : $STATIC_PRPLS echo echo Build with GStreamer support.. : $enable_gst -echo Build with voice and video.... : $enable_farsight +echo Build with voice and video.... : $enable_vv echo Build with D-Bus support...... : $enable_dbus if test "x$enable_dbus" = "xyes" ; then eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
--- a/finch/gntdebug.c Tue May 27 16:30:26 2008 +0000 +++ b/finch/gntdebug.c Wed May 28 21:13:36 2008 +0000 @@ -348,11 +348,13 @@ #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())
--- a/finch/gntmedia.c Tue May 27 16:30:26 2008 +0000 +++ b/finch/gntmedia.c Wed May 28 21:13:36 2008 +0000 @@ -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 @@ G_CALLBACK(finch_new_media), NULL); } -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */
--- a/finch/gntmedia.h Tue May 27 16:30:26 2008 +0000 +++ b/finch/gntmedia.h Wed May 28 21:13:36 2008 +0000 @@ -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 -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */ #endif /* GNT_MEDIA_H */
--- a/finch/gntui.c Tue May 27 16:30:26 2008 +0000 +++ b/finch/gntui.c Wed May 28 21:13:36 2008 +0000 @@ -92,7 +92,7 @@ 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 @@ finch_roomlist_uninit(); purple_roomlist_set_ui_ops(NULL); -#ifdef USE_FARSIGHT +#ifdef USE_VV finch_media_manager_uninit(); #endif
--- a/libpurple/media.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/media.c Wed May 28 21:13:36 2008 +0000 @@ -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 @@ fs_stream_set_remote_codecs(purple_media_get_audio_stream(media, name), codecs, NULL); } -#endif /* USE_GSTPROPS */ -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */
--- a/libpurple/media.h Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/media.h Wed May 28 21:13:36 2008 +0000 @@ -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 -#endif /* USE_GSTPROPS */ -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */ #endif /* __MEDIA_H_ */
--- a/libpurple/mediamanager.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/mediamanager.c Wed May 28 21:13:36 2008 +0000 @@ -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 @@ return media; } -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */
--- a/libpurple/mediamanager.h Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/mediamanager.h Wed May 28 21:13:36 2008 +0000 @@ -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 -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */ #endif /* __MEDIA_MANAGER_H_ */
--- a/libpurple/protocols/jabber/google.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/protocols/jabber/google.c Wed May 28 21:13:36 2008 +0000 @@ -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_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 @@ google_session_parse_iq(js, session, packet); #else /* TODO: send proper error response */ -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */ } static void
--- a/libpurple/protocols/jabber/iq.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/protocols/jabber/iq.c Wed May 28 21:13:36 2008 +0000 @@ -358,7 +358,7 @@ return; } -#ifdef USE_FARSIGHT +#ifdef USE_VV /* handle session initiate XEP 0167 */ if (type && !strcmp(type, "set")) { /* is this a Jingle package? */
--- a/libpurple/protocols/jabber/jabber.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Wed May 28 21:13:36 2008 +0000 @@ -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 @@ 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 @@ { 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; @@ -1884,13 +1884,13 @@ 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) { @@ -2375,7 +2375,7 @@ return TRUE; } -#ifdef USE_FARSIGHT +#ifdef USE_VV static void jabber_session_send_accept(JingleSession *session)
--- a/libpurple/protocols/jabber/jabber.h Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.h Wed May 28 21:13:36 2008 +0000 @@ -204,7 +204,7 @@ /* 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_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);
--- a/libpurple/protocols/jabber/jingle.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/protocols/jabber/jingle.c Wed May 28 21:13:36 2008 +0000 @@ -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 @@ return jingle; } -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */
--- a/libpurple/protocols/jabber/jingle.h Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/protocols/jabber/jingle.h Wed May 28 21:13:36 2008 +0000 @@ -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 -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */ #endif /* JINGLE_H */
--- a/libpurple/protocols/jabber/libxmpp.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Wed May 28 21:13:36 2008 +0000 @@ -117,7 +117,7 @@ jabber_attention_types, /* attention_types */ sizeof(PurplePluginProtocolInfo), /* struct_size */ NULL, /* get_account_text_table */ -#ifdef USE_FARSIGHT +#ifdef USE_VV jabber_initiate_media, /* initiate_media */ jabber_can_do_media /* can_do_media */ #else @@ -274,7 +274,7 @@ 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 }
--- a/libpurple/protocols/jabber/presence.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/protocols/jabber/presence.c Wed May 28 21:13:36 2008 +0000 @@ -265,7 +265,7 @@ 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
--- a/libpurple/prpl.h Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/prpl.h Wed May 28 21:13:36 2008 +0000 @@ -438,7 +438,7 @@ */ GHashTable *(*get_account_text_table)(PurpleAccount *account); -#ifdef USE_FARSIGHT +#ifdef USE_VV /** Initiate media with the given buddy */ PurpleMedia *(*initiate_media)(PurpleConnection *conn, const char *who, PurpleMediaStreamType type);
--- a/libpurple/server.c Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/server.c Wed May 28 21:13:36 2008 +0000 @@ -37,7 +37,7 @@ #include "server.h" #include "status.h" #include "util.h" -#ifdef USE_FARSIGHT +#ifdef USE_VV #include "media.h" #endif @@ -1056,7 +1056,7 @@ } } -#ifdef USE_FARSIGHT +#ifdef USE_VV PurpleMedia *serv_initiate_media(PurpleConnection *gc, const char *who, PurpleMediaStreamType type) { @@ -1109,4 +1109,4 @@ purple_debug_info("serv", "Blank serv_can_do_media called\n"); return NULL; } -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */
--- a/libpurple/server.h Tue May 27 16:30:26 2008 +0000 +++ b/libpurple/server.h Wed May 28 21:13:36 2008 +0000 @@ -183,7 +183,7 @@ 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,
--- a/pidgin/gtkconv.c Tue May 27 16:30:26 2008 +0000 +++ b/pidgin/gtkconv.c Wed May 28 21:13:36 2008 +0000 @@ -1196,7 +1196,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 @@ -3063,7 +3063,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 @@ -3377,7 +3377,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...")); @@ -6342,7 +6342,7 @@ else buttons &= ~GTK_IMHTML_CUSTOM_SMILEY; -#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) { @@ -7632,7 +7632,7 @@ } -#ifdef USE_FARSIGHT +#ifdef USE_VV static void pidgin_gtkmedia_message_cb(PidginMedia *media, const char *msg, PurpleConversation *conv) @@ -7790,7 +7790,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
--- a/pidgin/gtkdebug.c Tue May 27 16:30:26 2008 +0000 +++ b/pidgin/gtkdebug.c Wed May 28 21:13:36 2008 +0000 @@ -985,11 +985,13 @@ #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())
--- a/pidgin/gtkimhtmltoolbar.c Tue May 27 16:30:26 2008 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Wed May 28 21:13:36 2008 +0000 @@ -907,7 +907,7 @@ gtk_widget_grab_focus(toolbar->imhtml); } -#ifdef USE_FARSIGHT +#ifdef USE_VV static void init_voice_call_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar) { @@ -943,7 +943,7 @@ 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 } @@ -1234,7 +1234,7 @@ {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 @@ -1304,9 +1304,9 @@ 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; @@ -1449,7 +1449,7 @@ 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); @@ -1469,7 +1469,7 @@ 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);
--- a/pidgin/gtkmedia.c Tue May 27 16:30:26 2008 +0000 +++ b/pidgin/gtkmedia.c Wed May 28 21:13:36 2008 +0000 @@ -30,7 +30,7 @@ #include "gtkmedia.h" -#ifdef USE_FARSIGHT +#ifdef USE_VV typedef enum { @@ -412,4 +412,4 @@ } } -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */
--- a/pidgin/gtkmedia.h Tue May 27 16:30:26 2008 +0000 +++ b/pidgin/gtkmedia.h Wed May 28 21:13:36 2008 +0000 @@ -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 -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */ #endif /* __GTKMEDIA_H_ */
--- a/pidgin/gtkprefs.c Tue May 27 16:30:26 2008 +0000 +++ b/pidgin/gtkprefs.c Wed May 28 21:13:36 2008 +0000 @@ -2017,7 +2017,7 @@ return ret; } -#ifdef USE_FARSIGHT +#ifdef USE_VV /* get a GList of pairs name / device */ static GList * @@ -2240,7 +2240,7 @@ return ret; } -#endif +#endif /* USE_VV */ static void set_idle_away(PurpleSavedStatus *status) @@ -2367,7 +2367,7 @@ 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++); @@ -2495,14 +2495,14 @@ 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(); }
--- a/pidgin/pidginstock.c Tue May 27 16:30:26 2008 +0000 +++ b/pidgin/pidginstock.c Wed May 28 21:13:36 2008 +0000 @@ -169,7 +169,7 @@ { 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
--- a/pidgin/pidginstock.h Tue May 27 16:30:26 2008 +0000 +++ b/pidgin/pidginstock.h Wed May 28 21:13:36 2008 +0000 @@ -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