Mercurial > pidgin.yaz
changeset 28404:15833e4f2e09
merge of '0696d14c26cfe65de7a3f68a2b9d14b283f88e1f'
and '256d39c0fd5169819199dd5a2586b6b2b144280c'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 22 Aug 2009 05:38:56 +0000 |
| parents | b9e28b2a119b (diff) b341ae89f5ce (current diff) |
| children | 2c85f44113b4 |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sat Aug 22 05:38:23 2009 +0000 +++ b/configure.ac Sat Aug 22 05:38:56 2009 +0000 @@ -810,6 +810,7 @@ fi fi fi +AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") AC_ARG_ENABLE(idn, [AC_HELP_STRING([--disable-idn], [compile without IDN support])],
--- a/libpurple/protocols/jabber/jingle/rtp.c Sat Aug 22 05:38:23 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/rtp.c Sat Aug 22 05:38:56 2009 +0000 @@ -611,8 +611,11 @@ is_creator = !jingle_session_is_initiator(session); g_free(creator); - purple_media_add_stream(media, name, remote_jid, - type, is_creator, transmitter, num_params, params); + if(!purple_media_add_stream(media, name, remote_jid, + type, is_creator, transmitter, num_params, params)) { + purple_media_end(media, NULL, NULL); + return FALSE; + } g_free(name); g_free(media_type);
--- a/pidgin/plugins/Makefile.am Sat Aug 22 05:38:23 2009 +0000 +++ b/pidgin/plugins/Makefile.am Sat Aug 22 05:38:56 2009 +0000 @@ -67,9 +67,12 @@ themeedit.la \ timestamp.la \ timestamp_format.la \ - vvconfig.la \ xmppconsole.la +if USE_VV +plugin_LTLIBRARIES += vvconfig.la +endif + noinst_LTLIBRARIES = \ contact_priority.la \ gtk_signals_test.la @@ -109,7 +112,7 @@ themeedit_la_LIBADD = $(GTK_LIBS) timestamp_la_LIBADD = $(GTK_LIBS) timestamp_format_la_LIBADD = $(GTK_LIBS) -vvconfig_la_LIBADD = $(GTK_LIBS) +vvconfig_la_LIBADD = $(GTK_LIBS) $(GSTREAMER_LIBS) xmppconsole_la_LIBADD = $(GTK_LIBS) endif # PLUGINS