/cpw/ljfisher/ssl_client_auth: a179e64cbcd0: Merge with pidgin/main
Lucas Fisher
lucas.fisher at gmail.com
Mon Oct 8 19:04:49 EDT 2012
Changeset: a179e64cbcd04c8376cc954db607cd0501cc35e2
Author: Lucas Fisher <lucas.fisher at gmail.com>
Date: 2012-07-09 21:10 -0400
Branch: cpw.ljfisher.ssl_client_auth
URL: http://hg.pidgin.im/cpw/ljfisher/ssl_client_auth/rev/a179e64cbcd0
Description:
Merge with pidgin/main
diffstat:
.hgignore | 15 +
.hgtags | 88 +
.tx/config | 3 +-
COPYRIGHT | 3 +
ChangeLog | 62 +-
ChangeLog.API | 15 +
Makefile.am | 23 +-
Makefile.mingw | 4 +-
configure.ac | 38 +-
libpurple/Makefile.am | 4 +-
libpurple/ft.c | 3 +-
libpurple/imgstore.h | 2 +
libpurple/media.c | 3 +-
libpurple/media/backend-fs2.c | 247 +-
libpurple/mediamanager.c | 4 +
libpurple/plugins/offlinemsg.c | 8 +-
libpurple/protocols/irc/irc.c | 29 +-
libpurple/protocols/irc/irc.h | 3 +-
libpurple/protocols/irc/msgs.c | 79 +-
libpurple/protocols/jabber/buddy.c | 3 +-
libpurple/protocols/jabber/jabber.c | 30 +-
libpurple/protocols/jabber/usermood.c | 65 +-
libpurple/protocols/jabber/usermood.h | 17 +-
libpurple/protocols/msn/contact.c | 7 +-
libpurple/protocols/msn/msg.c | 51 +-
libpurple/protocols/msn/notification.c | 7 +-
libpurple/protocols/msn/oim.c | 2 +-
libpurple/protocols/msn/switchboard.c | 3 +-
libpurple/protocols/mxit/formcmds.c | 6 +-
libpurple/protocols/mxit/markup.c | 17 +-
libpurple/protocols/mxit/profile.c | 3 +-
libpurple/protocols/mxit/splashscreen.c | 3 +-
libpurple/protocols/oscar/family_auth.c | 31 +-
libpurple/protocols/oscar/family_bart.c | 6 +
libpurple/protocols/oscar/family_icbm.c | 6 +
libpurple/protocols/oscar/family_locate.c | 2 +-
libpurple/protocols/oscar/odc.c | 4 +-
libpurple/protocols/oscar/oscar.c | 42 +-
libpurple/protocols/oscar/oscar.h | 2 +
libpurple/protocols/sametime/sametime.c | 2 +-
libpurple/protocols/silc/ft.c | 2 -
libpurple/protocols/silc/ops.c | 4 +-
libpurple/protocols/yahoo/yahoo_profile.c | 3 +-
libpurple/proxy.c | 169 +-
libpurple/stun.c | 2 +
libpurple/util.c | 365 +-
libpurple/util.h | 13 +
libpurple/win32/global.mak | 2 +-
pidgin/gtkaccount.c | 69 +-
pidgin/gtkblist.c | 17 +-
pidgin/gtkblist.h | 2 -
pidgin/gtkconv.c | 173 +-
pidgin/gtkconv.h | 7 +
pidgin/gtkconvwin.h | 19 +-
pidgin/gtkdialogs.c | 41 +-
pidgin/gtklog.c | 8 +
pidgin/gtknotify.c | 4 +-
pidgin/gtkprefs.c | 44 +-
pidgin/gtkrequest.c | 7 +
pidgin/gtkstatusbox.h | 4 +-
pidgin/gtkutils.c | 4 +-
pidgin/gtkwebview.c | 493 +-
pidgin/gtkwebview.h | 78 +-
pidgin/gtkwebviewtoolbar.c | 882 +-
pidgin/plugins/xmppconsole.c | 287 +-
pidgin/themes/Contents/Resources/Variants/Default.css | 2 +
pidgin/themes/Contents/Resources/Variants/No-Timestamps.css | 8 +
pidgin/themes/Contents/Resources/main.css | 7 +-
pidgin/themes/Makefile.am | 3 +-
pidgin/themes/Template.html | 20 +-
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 | 1691 +-
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 +-
156 files changed, 14730 insertions(+), 16429 deletions(-)
diffs (truncated from 50296 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -7,15 +7,30 @@ syntax: regexp
.*/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,88 @@
+d812dd63e689cb0fd60015eef671ec83c6f3ff8a v0.54
+f49f4ab77014183973405181dd92edf65e8b4dcd v0.55
+7ff6f30d688e18b2601edb1df73035567d3e4644 v0.56
+bfd5a69f995cc4f233e0742da0a46181ce5516fc v0.57
+cc5cde268059d1b9252f389682a7ea99befc442c v0.58
+0c7331596d448fff0ca93fa691f21b497055ea2f v0.59
+c224575f8eb881e67d08d1c6094837d33d8706eb v0.60
+c224575f8eb881e67d08d1c6094837d33d8706eb ZERO_DOT_FUCKING_SIXTY
+deed98aa31812639fd7254114b00520318a165db v0.62
+8662b9123cbf6bbae57f449c944ce5a9fab08aab v0.63
+5b623486acb2d22ad281ec4ca98ea065fe8e4ba7 v0.64
+e658e3d8c606a1682de9bf984fddc92c36cc88bc v0.65
+12d3fe5e5b1bde69be1b71bc58d24cb1f27e5a57 v0.67
+27bd2a70b5a43d22ea8d18f99e6e33a7cbad988a v0.68
+64caf5a74e41b9e00feddec214feebadad365dad v0.69
+b1c86e03b94c431e8503837df024e1bc084947d0 v0.70
+2f69d33ab267080d1f087122d99ffc3dbeedc767 v0.71
+6433ba1f3d07caf648351dd6adb4d46d942ae6fd v0.72
+a05075fd93a308da129a80563fb3e8790dfddc6a v0.73
+1701b0c05fb230604f6c7f1da92a6c92df5fa60c v0.75
+1c2387d7dc8a031e2eafc0fa5907072457327683 v0.76
+f2e325d6dcbbbaaa4a8f424be7fcf85716378127 v0.77
+b95adbd031d5450ec6380fa8ebb829a3356b01fc v0.78
+931f778136d2ea51533ae240062d0f5c94677007 v0.79
+f6fad583d7dcc4d52a47b3d45e6c13d98eedf528 v0.80
+442f0fc23d7758583daf79f41a0fb79359c83940 v0.81
+c63823101be4b343b89cc2cf08a9edac3c0c35fe v0.82
+75b4ea520acd299a844ad3e6ca6bbf256b6b255a v1.5.1
+9b9d7869632670be9d8854ad8beddd479119ff5d v2.0.0beta4
+4366b2b87b5512fe68d816e82264f31c83b6ad25 v2.0.0beta5
+1be10968797300a6a4dc4612eec9bce0339f04b9 v2.0.0beta6
+1f0524cd66b3f108e63723eac64a77b1c34fb9a5 v2_0_0beta7
+4490afd5c483be08470900d6bdaf48e6a4bf1b13 v2.0.0
+c5abad45e8a7ccb777ff38f325d074314ca27dcb v2.0.1
+87854ccfae544467c988edbac854c1ae2018eed4 v2.0.2
+77c6142b3dcbab82ab7e039e3846a9049959d1a6 v2.1.0
+b20348da23da8150e224115e46f05b6516f06b6c v2.1.1
+84a0da498a94f965b9a35353201171745b7f7ac0 soc_07_finchfeat_end
+9fc4dcfbeeec6d30f679d8e7c6f16cb494893a4a v2.2.0
+e7dd28283ec3a014386b5c0c26d72abe7f319c7c v2.2.1
+420a401299c50f9d30046b2472a552378fbd682f v2.2.2
+8e8cba27fc7816cd4f4c7cf3b88766fa17044415 v2.3.0
+aa94ee871b7f592e064f2d3bcf4cd8ac323b2cb2 v2.3.1
+6ab75c14d1a29d73c08629af1b1a37dc7e7c0e7c v2.4.0
+45429d7c48f20743dd5b7257893dd460b39dd8b6 v2.4.1
+f0bf4538cf3a89fcd99e72c168f92556225ab5dc v2.4.2
+ec9776e51fb12b7f5379770f8fbafb66198f2755 v2.4.3
+299954ac2431e66e4b02fc2fcd21599e5ce79f4f v2.5.0
+123de59aee23f9bd7baa167b9bf32ea6d54cad84 v2.5.1
+9445b5d874861a760bff3c9cbdd9a5838e636e11 v2.5.2
+fbd4b005d1a82bca8afd78a2f1a833950eb5d842 v2.5.3
+82ad6019d2a23122014bfd6ab041ea029561857d v2.5.3a
+b677fdd3a6162fee14352acb9fb69077ed9af018 v2.5.4
+ec395082163ff0a5d3f47756fc91df07120290a1 v2.5.5
+7daaab423cd29201f8c3cf48912d27a2ebdbe026 soc_2009_vulture_start
+662d7dad27b9648391a2965a1f62a9bb8f95e874 v2.5.6
+550e6ec7c9fd15db9956387a5775df07322ec766 v2.5.7
+1533d33dee9a832f566d49879589c7e27323f8a0 v2.5.8
+3ef2ec3fc4d3492c5232c790047162ffee326dc1 v2.5.9
+7af7adebd500f38cc69eaad8b02a951af1eae624 v2.6.0
+996b28f252ebdbdbc3f414948aa7d84a236a9cd1 v2.6.1
+2bd78084506643b0d52a0771b8e755586af64d85 soc_2009_vulture_end
+7be7530f775fc5d6cb000303aa6fb5f920e0982d v2.6.2
+a17a77cbefc76c92ebdb54ff282a463619f9db1b v2.6.3
+03107f67cd77c5198c5bf1e1068a95c8172c32c5 v2.6.4
+09a30290163a65c61402fff98ac0dd609bc261ec v2.6.5
+41919b7e238aaa6f975741672a5eded86d12a354 v2.6.6
+383aeae59ce2be0c5bd286938ce640bbc536f2c2 v2.7.0
+a331f53dbf74f7ec3e50a12901e142ce35741171 v2.7.1
+8cf083761af48bc1e2cd438947ba12c78ec3d85c v2.7.2
+d79eaf981448fd057af7e62e8db9fcd3c597c309 v2.7.3
+2523c556d8db3af086088dd99746d21449f1e71a v2.7.4
+7bbb1a32b19aaa5784959670a26e202fab7dbef2 v2.7.5
+f432b3f58724fce08169eb1745cf01019142f7e4 v2.7.6
+9c6db2c041007b46fada6642abcae232eb69bb05 v2.7.7
+f9f06151db38f279ab34dba08abea1b19f92403e v2.7.8
+2b4adcd31accfb6d083b63f9e90a041366ea349d v2.7.9
+71262d97b3f97c11a2df49ab54d62f6660e773ed v2.7.10
+7a8d014ad83116d52aa3742cee92182836a14d84 v2.7.11
+9ecfb4eb0153f06632730f0d4cee7ae2f5c7d9a1 v2.8.0
+cefaf8feb01cdc8ce0ad9f613e9085daad1fca6a v2.9.0
+a217bdda7c4b41250e57819b45127b739b7f5828 v2.10.0
+26af8696fb84cc8d3f8f52d2a7c3e0ae79869866 v2.10.1
+fbe2ce8d288fe7e2ab4bf180a537664ef7f8e907 v2.10.2
+dab0253fe3754ffd68e070cdfbbf31cd79f9a421 v2.10.3
+1d00b9e4aa6add6dca97cca4ac614d63bd105dfd v2.10.4
+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
@@ -24,6 +24,7 @@ Thijs Alkemade
Manuel Amador
Matt Amato
Josef Andrysek
+Flavius Anton
Geoffrey Antos
Daniel Atallah
Paul Aurich
@@ -129,6 +130,7 @@ Glauber de Oliveira Costa
Adam Cowell
Palmer Cox
Jeramey Crawford
+Olivier Crete
Michael Culbertson
Steven Danna
Simon Danner
@@ -476,6 +478,7 @@ Federico Schwindt
Torrey Searle
Peter Seebach
Don Seiler
+Mihai Serban
Leonardo Serra
Matteo Settenvini
Colin Seymour
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ version 3.0.0 (??/??/????):
MSN:
* Fix file transfer with older Mac MSN clients.
* Support file transfers up to ~9 EiB.
+ * Fix buddies not going offline.
MXit:
* Remove all reference to Hidden Number.
@@ -38,12 +39,67 @@ version 3.0.0 (??/??/????):
to the core (and UIs) as incoming messages (Thijs Alkemade).
(#14529)
* Support file transfers up to ~9 EiB.
+ * Invalid user moods can no longer be sent to the server.
Plugins:
* The Voice/Video Settings plugin supports using the sndio GStreamer
- backends. (Brad Smith) (#14414)
-
-version 2.10.2 (02/22/2012):
+ backends. (Brad Smith) (#14414)
+ * The Offline Message Emulation plugin now adds a note that the message
+ was an offline message. (Flavius Anton) (#2497)
+
+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)
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -247,6 +247,21 @@ version 3.0.0 (??/??/????):
* xmlnode_set_attrib_with_namespace
* xmlnode_set_attrib_with_prefix
+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
@@ -32,35 +32,36 @@ distcheck-hook: libpurple/plugins/perl/c
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.
More information about the Commits
mailing list