/pidgin/main: 15c1814de8c2: Merge with release-2.x.y

Andrew Victor andrew.victor at mxit.com
Tue Jul 24 05:16:36 EDT 2012


Changeset: 15c1814de8c2886fe32558c3922d749c194fa8a7
Author:	 Andrew Victor <andrew.victor at mxit.com>
Date:	 2012-07-24 11:04 +0200
Branch:	 mxit-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/15c1814de8c2

Description:

Merge with release-2.x.y

diffstat:

 .hgignore                                 |     15 +
 .hgtags                                   |      2 +
 .tx/config                                |      3 +-
 COPYRIGHT                                 |      5 +-
 ChangeLog                                 |     77 +-
 ChangeLog.API                             |     18 +
 Makefile.am                               |     23 +-
 Makefile.mingw                            |      8 +-
 README                                    |      4 +-
 README.MTN                                |      6 +-
 README.mingw                              |      2 +-
 configure.ac                              |     44 +-
 doc/pidgin.1.in                           |      4 +-
 libpurple/Makefile.am                     |      4 +-
 libpurple/media.c                         |      3 +-
 libpurple/media/backend-fs2.c             |    247 +-
 libpurple/mediamanager.c                  |      4 +
 libpurple/plugins/autoaccept.c            |      9 +-
 libpurple/protocols/irc/irc.c             |     29 +-
 libpurple/protocols/irc/irc.h             |      3 +-
 libpurple/protocols/irc/msgs.c            |     79 +-
 libpurple/protocols/msn/contact.c         |     36 +-
 libpurple/protocols/msn/contact.h         |     14 +-
 libpurple/protocols/msn/msg.c             |     48 +-
 libpurple/protocols/msn/msn.c             |    135 +-
 libpurple/protocols/msn/msn.h             |      6 +-
 libpurple/protocols/msn/msnutils.c        |     15 +
 libpurple/protocols/msn/msnutils.h        |      9 +
 libpurple/protocols/msn/nexus.c           |      3 +-
 libpurple/protocols/msn/nexus.h           |      5 +-
 libpurple/protocols/msn/notification.c    |    102 +-
 libpurple/protocols/msn/notification.h    |      6 +-
 libpurple/protocols/msn/oim.c             |      2 +-
 libpurple/protocols/msn/session.c         |      9 +-
 libpurple/protocols/msn/state.c           |     17 +-
 libpurple/protocols/msn/switchboard.c     |     14 +-
 libpurple/protocols/msn/user.c            |      8 +
 libpurple/protocols/msn/userlist.c        |      1 +
 libpurple/protocols/mxit/markup.c         |      7 +-
 libpurple/protocols/oscar/family_icq.c    |      3 +-
 libpurple/protocols/yahoo/yahoo_picture.c |      3 -
 libpurple/protocols/yahoo/yahoo_profile.c |      4 -
 libpurple/proxy.c                         |    169 +-
 libpurple/win32/global.mak                |      3 +-
 pidgin/gtkconv.c                          |     10 +-
 pidgin/gtkdialogs.c                       |     31 +-
 pidgin/gtkprefs.c                         |     25 +-
 pidgin/win32/nsis/pidgin-installer.nsi    |      9 +-
 po/ChangeLog                              |     23 +
 po/af.po                                  |     75 +-
 po/am.po                                  |     64 +-
 po/ar.po                                  |     73 +-
 po/as.po                                  |     85 +-
 po/az.po                                  |     56 +-
 po/be at latin.po                            |     75 +-
 po/bg.po                                  |     59 +-
 po/bn.po                                  |     82 +-
 po/bn_IN.po                               |     75 +-
 po/bs.po                                  |     62 +-
 po/ca.po                                  |     86 +-
 po/ca at valencia.po                         |     75 +-
 po/cs.po                                  |     75 +-
 po/da.po                                  |     75 +-
 po/de.po                                  |    585 +-
 po/dz.po                                  |     75 +-
 po/el.po                                  |     77 +-
 po/en_AU.po                               |     70 +-
 po/en_CA.po                               |     45 +-
 po/en_GB.po                               |     75 +-
 po/eo.po                                  |     51 +-
 po/es.po                                  |    337 +-
 po/et.po                                  |     76 +-
 po/eu.po                                  |     75 +-
 po/fa.po                                  |     75 +-
 po/fi.po                                  |     79 +-
 po/fr.po                                  |     75 +-
 po/ga.po                                  |     52 +-
 po/gl.po                                  |     76 +-
 po/gu.po                                  |     71 +-
 po/he.po                                  |     71 +-
 po/hi.po                                  |     71 +-
 po/hr.po                                  |     45 +-
 po/hu.po                                  |     75 +-
 po/hy.po                                  |     45 +-
 po/id.po                                  |     75 +-
 po/it.po                                  |     77 +-
 po/ja.po                                  |     76 +-
 po/ka.po                                  |     54 +-
 po/km.po                                  |     71 +-
 po/kn.po                                  |     78 +-
 po/ko.po                                  |     75 +-
 po/ku.po                                  |     51 +-
 po/lo.po                                  |     45 +-
 po/lt.po                                  |     75 +-
 po/mai.po                                 |     69 +-
 po/mhr.po                                 |     75 +-
 po/mk.po                                  |     75 +-
 po/ml.po                                  |     75 +-
 po/mn.po                                  |     48 +-
 po/mr.po                                  |     73 +-
 po/ms_MY.po                               |     45 +-
 po/my_MM.po                               |  16586 ++++++++++-----------------
 po/nb.po                                  |     75 +-
 po/ne.po                                  |     60 +-
 po/nl.po                                  |    101 +-
 po/nn.po                                  |    550 +-
 po/oc.po                                  |     50 +-
 po/or.po                                  |     71 +-
 po/pa.po                                  |     70 +-
 po/pl.po                                  |    125 +-
 po/ps.po                                  |     51 +-
 po/pt.po                                  |     75 +-
 po/pt_BR.po                               |     75 +-
 po/ro.po                                  |     75 +-
 po/ru.po                                  |    923 +-
 po/si.po                                  |     45 +-
 po/sk.po                                  |     75 +-
 po/sl.po                                  |   1031 +-
 po/sq.po                                  |     79 +-
 po/sr.po                                  |     75 +-
 po/sr at latin.po                            |     75 +-
 po/sv.po                                  |     75 +-
 po/sw.po                                  |     53 +-
 po/ta.po                                  |     75 +-
 po/te.po                                  |     73 +-
 po/th.po                                  |     51 +-
 po/tr.po                                  |     55 +-
 po/uk.po                                  |     75 +-
 po/ur.po                                  |     71 +-
 po/vi.po                                  |    923 +-
 po/xh.po                                  |     70 +-
 po/zh_CN.po                               |     56 +-
 po/zh_HK.po                               |     75 +-
 po/zh_TW.po                               |     75 +-
 134 files changed, 12581 insertions(+), 15074 deletions(-)

diffs (truncated from 45314 to 300 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -7,15 +7,30 @@
 .*/perl/common/[^/]+\.c$
 .*/perl/common/blib.*
 .*/perl/common/pm_to_blib$
+.*~$
+.*\.a$
+.*\.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
diff --git a/.hgtags b/.hgtags
new file mode 100644
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1,2 @@
+a3d157700972b48cf0a23b300261a5ab0c6e165b v2.10.5
+4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
diff --git a/.tx/config b/.tx/config
--- a/.tx/config
+++ b/.tx/config
@@ -1,8 +1,7 @@
 [main]
-host = https://www.transifex.net
+host = https://www.transifex.com
 
 [pidgin.pidgin]
 file_filter = po/<lang>.po
 source_file = po/pidgin.pot
 source_lang = en
-
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,7 +15,7 @@
 piece of code, then that code should be traced through our version
 control system to see from where it came and who has modified it.
 
-Copyright (C) 1998-2011 by the following:
+Copyright (C) 1998-2012 by the following:
 
 Saleem Abdulrasool
 Jakub Adam
@@ -39,6 +39,7 @@
 Chris Banal
 Luca Barbato
 Levi Bard
+Mark Barfield
 Ryan Barrett
 Kevin Barry
 Lukas Barth
@@ -128,6 +129,7 @@
 Adam Cowell
 Palmer Cox
 Jeramey Crawford
+Olivier Crete
 Michael Culbertson
 Steven Danna
 Simon Danner
@@ -474,6 +476,7 @@
 Torrey Searle
 Peter Seebach
 Don Seiler
+Mihai Serban
 Leonardo Serra
 Matteo Settenvini
 Colin Seymour
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,70 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.10.2 (02/22/2012):
+version 2.10.7:
+	Alien hatchery:
+	* No changes
+
+	MSN:
+	* Fix a crash when removing a user before its icon is loaded. (Mark
+	  Barfield) (#15217)
+
+	Yahoo!:
+	* Fix a double-free in profile/picture loading code. (Mihai Serban)
+	  (#15053)
+
+version 2.10.6 (07/06/2012):
+	Pidgin:
+	* Fix a bug that requires a triple-click to open a conversation
+	  window from the buddy list. (#15199)
+
+version 2.10.5 (07/05/2012):
+	libpurple:
+	* Add support for GNOME3 proxy settings. (Mihai Serban) (#15054)
+
+	Pidgin:
+	* Fix a crash that may occur when trying to ignore a user who is
+	  not in the current chat room. (#15139)
+
+	MSN:
+	* Fix building with MSVC on Windows (broken in 2.10.4). (Florian
+	  Quèze)
+
+	MXit:
+	* Fix a buffer overflow vulnerability when parsing incoming messages
+	  containing inline images.  Thanks to Ulf Härnhammar for reporting
+	  this! (CVE-2012-3374)
+
+version 2.10.4 (05/06/2012):
+	General:
+	* Support building against Farstream in addition to Farsight.
+	  (Olivier Crete) (#14936)
+
+	IRC:
+	* Disable periodic WHO timer.  IRC channel user lists will no
+	  longer automatically display away status, but libpurple will be
+	  much kinder to the network.
+	* Print unknown numerics to channel windows if we can associate
+	  them.  Thanks to Marien Zwart. (#15090)
+
+	MSN:
+	* Fix a possible crash when receiving messages with certain characters
+	  or character encodings.  Thanks to Fabian Yamaguchi for reporting
+	  this! (CVE-2012-2318)
+
+	XMPP:
+	* Fix a possible crash when receiving a series of specially crafted
+	  file transfer requests.  Thanks to José Valentín Gutiérrez for
+	  reporting this!  (CVE-2012-2214)
+
+	Windows-Specific Changes:
+	* Words added to spell check dictionaries are saved across restarts of
+	  Pidgin (#11886)
+
+version 2.10.3 (03/26/2012):
+	MSN:
+	* Fix buddies not going offline. (#14997)
+
+version 2.10.2 (03/14/2012):
 	General:
 	* Fix compilation when using binutils 2.22 and new GDK pixbuf. (#14799)
 	* Fix compilation of the MXit protocol plugin with GLib 2.31. (#14773)
@@ -8,12 +72,16 @@
 	Pidgin:
 	* Add support for the GNOME3 Network dialog. (#13882)
 	* Fix rare crash. (#14392)
+	* Add support for the GNOME3 Default Application dialog for configuring
+	  the Browser.
 
 	libpurple:
 	* Support new connection states and signals for NetworkManager 0.9+.
 	  (Dan Williams) (#13859)
 
 	AIM and ICQ:
+	* Fix a possible crash when receiving an unexpected message
+	  from the server. (Thijs Alkemade) (#14983)
 	* Allow signing on with usernames containing periods and
 	  underscores. (#13500)
 	* Allow adding buddies containing periods and underscores. (#13500)
@@ -23,10 +91,17 @@
 	MSN:
 	* Fix possible crashes caused by not validating incoming messages as
 	  UTF-8. (Thijs Alkemade) (#14884)
+	* Support new protocol version MSNP18. (#14753)
+	* Fix messages to offline contacts. (#14302)
 
 	Windows-Specific Changes:
+	* Fix the installer downloading of spell-checking dictionaries (#14612)
 	* Fix compilation of the Bonjour protocol plugin. (#14802)
 
+	Plugins:
+	* The autoaccept plugin will no longer reset the preference for unknown
+	  buddies to "Auto Reject" in certain cases. (#14964)
+
 version 2.10.1 (12/06/2011):
 	Finch:
 	* Fix compilation on OpenBSD.
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -1,5 +1,23 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.7:
+	* No changes
+
+version 2.10.6:
+	* No changes
+
+version 2.10.5:
+	* No changes
+
+version 2.10.4:
+	* No changes
+
+version 2.10.3:
+	* No changes
+
+version 2.10.2:
+	* No changes
+
 version 2.10.1:
 	* No changes
 
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,35 +34,36 @@
 
 commit-check:
 	(cd po ; intltool-update -m 2>&1 | grep -v '^mismatched quotes.*\.py$$' | sed "s|current directory|po directory|" | grep . ; if [ $$? = 0 ] ; then exit 1 ; else exit 0 ; fi)
+
+# Ensure these files are sorted and contain no duplicates:
 	LC_ALL=C sort -c -t/ -u po/POTFILES.in
 	LC_ALL=C sort -c -t/ -u po/POTFILES.skip
+
+# Ensure COPYRIGHT is 100% UTF-8
 	iconv -f utf8 -t utf8 COPYRIGHT | cmp COPYRIGHT -
 
-version-check: commit-check
-# We don't want to release development versions.
+version-check:
+# Ensure our version string does not contain "dev"
 	test x`echo $(PACKAGE_VERSION) | grep dev` = x
 
-# When doing a new minor (or major) release (X.Y.0), there must be a section in
-# ChangeLog.API.
-	echo $(PACKAGE_VERSION) | grep -v "^[0-9]\+\.[0-9]\+\.0$$" >/dev/null || head ChangeLog.API | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
-
-# For all releases, check the ChangeLogs.
-	head ChangeLog | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
-	head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
+# Ensure ChangeLogs have the correct version
+	head ChangeLog     | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null
+	head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
+	head po/ChangeLog  | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
 
 # Ensure we're working from a tag...
 	test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
 # ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+")
 	test "x`hg st -mard`" = x
 
-release: version-check distcheck packages
-
 packages:
 	gpg -ab pidgin-$(PACKAGE_VERSION).tar.gz
 	gpg -ab pidgin-$(PACKAGE_VERSION).tar.bz2
 	gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz
 	gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2
 
+release: commit-check version-check distcheck packages
+
 if INSTALL_I18N
 PO_DIR=po
 DESKTOP_FILE=pidgin.desktop
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -94,10 +94,10 @@
 endif
 	$(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) install
 	$(MAKE) -C share/sounds -f $(MINGW_MAKEFILE) install
-	mkdir -p $(PIDGIN_INSTALL_DIR)/spellcheck
+	mkdir -p $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
 	cp $(GTKSPELL_TOP)/bin/libgtkspell-0.dll $(PIDGIN_INSTALL_DIR)/spellcheck
 	cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
-	cp -R $(ENCHANT_TOP)/lib $(PIDGIN_INSTALL_DIR)/spellcheck
+	cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
 	cp $(WIN32_DEV_TOP)/pidgin-inst-deps-20100315/exchndl.dll $(PIDGIN_INSTALL_DIR)
 
 pidgin/win32/nsis/gtk-runtime-$(GTK_BUNDLE_VERSION).zip:
@@ -139,11 +139,11 @@
 	 -exec $(STRIP) --strip-unneeded {} ';'
 
 installer: generate_installer_includes
-	$(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi



More information about the Commits mailing list