Merge branch 'master' into 'master'

Master

update to 2.10.12 and use gstreamer 1.x and farstream-0.2

See merge request !1

pidgin/.hgignore

@@ -0,0 +1,119 @@
+syntax: regexp
+(.*/)?TAGS$
+(.*/)?\.svn
+.*/?.*\.pc$
+.*/?Makefile(\.in)?$
+.*/?Makefile\.am\.mingw$
+.*/perl/common/[^/]+\.c$
+.*/perl/common/blib.*
+.*/perl/common/pm_to_blib$
+.*/perl/common/MYMETA\.(json|yml)
+.*~$
+.*\.a$
+.*\.asc$
+.*\.bak$
+.*\.bs$
+.*\.def$
+\.deps
+.*\.dll$
+.*\.exe$
+.*\.g?mo$
+.*\.la$
+\.libs
+.*\.lo$
+.*\.loT$
+.*\.o$
+.*\.orig$
+.*\.pyc$
+.*\.pyo$
+.*\.rej$
+.*\.so$
+Doxyfile(\.mingw)?$
+VERSION$
+aclocal.m4
+autogen.args
+autom4te.*\.cache
+compile
+config.cache
+config.guess
+config.h$
+config.h.in
+config.log
+config.status
+config.sub
+configure$
+depcomp
+doc/finch.1$
+doc/html
+doc/pidgin.1$
+finch/finch$
+finch/libgnt/gntmarshal.c
+finch/libgnt/gntmarshal.h
+install-sh
+intltool-.*
+libpurple/dbus-bindings.c
+libpurple/dbus-signals.c
+libpurple/dbus-types.c
+libpurple/dbus-types.h
+libpurple/example/nullclient
+libpurple/data/gconf/purple.schemas$
+libpurple/marshallers.[ch]
+libpurple/plugins/dbus-example-bindings.c
+libpurple/plugins/perl/common/Makefile.PL$
+libpurple/plugins/perl/common/Makefile.old
+libpurple/plugins/perl/common/const-c.inc
+libpurple/plugins/perl/common/const-xs.inc
+libpurple/plugins/perl/common/lib
+libpurple/purple-client-bindings.c
+libpurple/purple-client-bindings.h
+libpurple/purple-client-example
+libpurple/purple.h$
+libpurple/tests/check_libpurple
+libpurple/tests/libpurple..
+libpurple/version.h$
+libpurple/win32/libpurplerc.rc$
+libtool
+local.mak
+ltmain.sh
+missing
+mkinstalldirs
+package_revision.h
+package_revision_raw.txt
+pidgin-*.*.*-dbgsym$
+pidgin-*.*.*-dbgsym.zip$
+pidgin-*.*.*-win32-bin.zip$
+pidgin-*.*.*-win32bin$
+pidgin-.*.tar.bz2
+pidgin-.*.tar.gz
+pidgin-[0-9a-z.-]+/
+pidgin.apspec$
+pidgin.spec$
+pidgin/pidgin$
+pidgin/data/pidgin.appdata.xml$
+pidgin/data/pidgin.desktop$
+pidgin/data/pidgin.desktop.in$
+pidgin/pixmaps/emotes/default/24/theme
+pidgin/pixmaps/emotes/none/theme
+pidgin/pixmaps/emotes/small/16/theme
+pidgin/plugins/musicmessaging/music-messaging-bindings.c
+pidgin/plugins/perl/common/Makefile.PL$
+pidgin/plugins/perl/common/Makefile.old
+pidgin/win32/nsis/gtk-runtime-*.*.*.*.zip
+pidgin/win32/nsis/gtk_runtime_stage$
+pidgin/win32/nsis/langmacros.nsh
+pidgin/win32/nsis/nsis_translations.desktop
+pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
+pidgin/win32/nsis/pidgin-spellcheck.nsh
+pidgin/win32/nsis/pidgin-translations.nsh$
+pidgin/win32/nsis/translations
+pidgin/win32/pidgin_dll_rc.rc$
+pidgin/win32/pidgin_exe_rc.rc$
+po/Makefile.in.in
+po/POTFILES$
+po/missing
+po/notexist
+po/pidgin.pot
+po/stamp-it
+stamp-h1
+test-driver
+win32-install-dir(\.release)?

pidgin/.hgtags

@@ -0,0 +1,7 @@
+a3d157700972b48cf0a23b300261a5ab0c6e165b v2.10.5
+4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
+ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
+5010e6877abce3bfc2a4912e6b38fed7d6d3df19 v2.10.8
+9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9
+b7fedd2a570b760f252cf8a65a584137ab0af2cb v2.10.10
+e38a9aa5b1f8d25c58a0a7da05b386f265cba6e3 v2.10.11

pidgin/.tx/config

@@ -0,0 +1,7 @@
+[main]
+host = https://www.transifex.com
+
+[pidgin.pidgin_pot-for-2_x_y]
+file_filter = po/<lang>.po
+source_file = po/pidgin.pot
+source_lang = en

pidgin/COPYRIGHT

@@ -480,6 +480,7 @@ Carsten Schaar
 Toby Schaffer
 Jonathan Schleifer <js-pidgin@webkeks.org>
 Luke Schierer
+Sebastian Schmidt <yath@yath.de>
 Ralph Schmieder
 David Schmitt
 Heiko Schmitt
@@ -504,6 +505,7 @@ Michael Shkutkov
 Shreevatsa R
 Dylan Simon <dylan@dylex.net>
 Ettore Simone
+Renato Silva
 John Silvestri
 Mukund Sivaraman
 Craig Slusher

pidgin/ChangeLog

@@ -1,5 +1,26 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.12 (12/31/15):
+	General:
+	* purple-url-handler now works with Python 3.x (Daniël van Eeden)
+	* Fixed an issue where transient startup statuses could be deleted
+	  (Jakub Adam) (#16762)
+
+	Pidgin:
+	* The shout smile now matches the default theme (Steve Vaught)
+
+	Windows-Specific Changes:
+	* Updates to dependencies:
+		* Cyrus SASL 2.1.26
+		* libxml2 2.9.2
+		* NSS 3.17.3 and NSPR 4.10.7
+		* Perl 5.20.1
+		* SILC 1.1.12
+	* Remove support for Tcl plugins
+
+	Gadu-Gadu:
+	* Updated internal libgadu to version 1.12.1.
+
 version 2.10.11 (11/23/14):
 	General:
 	* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS

pidgin/ChangeLog.API

@@ -1,5 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.12:
+	* No changes
+
 version 2.10.11:
 	* No changes