/cpw/tomkiewicz/masterpassword: 85b5efb9a873: Merge with default
Tomasz Wasilczyk
tomkiewicz at cpw.pidgin.im
Mon Mar 18 07:51:36 EDT 2013
Changeset: 85b5efb9a873574b1fc80311148b7b2635e83efa
Author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date: 2013-03-18 12:50 +0100
Branch: soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/85b5efb9a873
Description:
Merge with default
diffstat:
.hgtags | 1 +
COPYRIGHT | 3 +-
ChangeLog | 36 +-
ChangeLog.API | 12 +-
Makefile.mingw | 7 +-
configure.ac | 16 +-
doc/account-signals.dox | 31 +-
finch/gntaccount.c | 4 +-
finch/gntconv.c | 2 +-
finch/gntlog.c | 2 +-
finch/gntpounce.c | 6 +-
finch/libgnt/gntwm.c | 6 +-
libpurple/account.c | 69 +-
libpurple/account.h | 5 +-
libpurple/buddyicon.c | 4 +-
libpurple/certificate.c | 4 +-
libpurple/dnsquery.c | 4 +-
libpurple/example/nullclient.c | 10 +-
libpurple/log.c | 2 +-
libpurple/media/backend-fs2.c | 98 +-
libpurple/plugin.c | 9 +-
libpurple/plugins/signals-test.c | 20 +-
libpurple/plugins/ssl/Makefile.mingw | 1 -
libpurple/plugins/ssl/ssl-nss.c | 12 +-
libpurple/plugins/tcl/tcl.c | 4 +-
libpurple/pounce.c | 2 +-
libpurple/protocols/bonjour/jabber.c | 23 +-
libpurple/protocols/gg/image.c | 8 +
libpurple/protocols/gg/lib/common.c | 3 +-
libpurple/protocols/gg/lib/dcc.c | 1 +
libpurple/protocols/gg/lib/dcc7.c | 5 +-
libpurple/protocols/gg/lib/libgadu.c | 2 +-
libpurple/protocols/gg/utils.c | 2 +-
libpurple/protocols/irc/msgs.c | 24 +-
libpurple/protocols/irc/parse.c | 12 +-
libpurple/protocols/jabber/auth_cyrus.c | 40 +-
libpurple/protocols/jabber/auth_digest_md5.c | 4 +-
libpurple/protocols/jabber/auth_scram.c | 10 +-
libpurple/protocols/jabber/bosh.c | 6 +-
libpurple/protocols/jabber/google/google_roster.c | 26 +-
libpurple/protocols/jabber/google/google_session.c | 13 +-
libpurple/protocols/jabber/ibb.c | 4 -
libpurple/protocols/jabber/jabber.c | 59 +-
libpurple/protocols/jabber/jingle/rtp.c | 3 +-
libpurple/protocols/jabber/message.c | 8 +-
libpurple/protocols/jabber/oob.c | 10 +-
libpurple/protocols/jabber/presence.c | 4 +-
libpurple/protocols/jabber/si.c | 11 +-
libpurple/protocols/jabber/useravatar.c | 8 +-
libpurple/protocols/jabber/usermood.c | 4 +-
libpurple/protocols/msn/directconn.c | 14 +-
libpurple/protocols/msn/msn.c | 2 +-
libpurple/protocols/msn/soap.c | 3 +-
libpurple/protocols/msn/userlist.c | 4 +-
libpurple/protocols/mxit/cipher.c | 16 +-
libpurple/protocols/mxit/formcmds.c | 16 +-
libpurple/protocols/mxit/http.c | 12 +-
libpurple/protocols/mxit/login.c | 14 +-
libpurple/protocols/mxit/markup.c | 7 +-
libpurple/protocols/mxit/multimx.c | 5 +-
libpurple/protocols/mxit/mxit.c | 9 +-
libpurple/protocols/mxit/mxit.h | 2 +-
libpurple/protocols/mxit/protocol.c | 30 +-
libpurple/protocols/mxit/protocol.h | 3 +-
libpurple/protocols/mxit/roster.c | 12 +-
libpurple/protocols/mxit/splashscreen.c | 8 +-
libpurple/protocols/myspace/myspace.c | 6 +-
libpurple/protocols/novell/nmrtf.c | 1 -
libpurple/protocols/novell/novell.c | 5 -
libpurple/protocols/oscar/authorization.c | 19 +-
libpurple/protocols/oscar/family_icbm.c | 2 +-
libpurple/protocols/oscar/libaim.c | 2 +-
libpurple/protocols/oscar/libicq.c | 2 +-
libpurple/protocols/oscar/odc.c | 8 +-
libpurple/protocols/oscar/oscar.c | 14 +-
libpurple/protocols/oscar/userinfo.c | 5 -
libpurple/protocols/sametime/sametime.c | 13 +-
libpurple/protocols/silc/buddy.c | 18 +-
libpurple/protocols/silc/chat.c | 4 +-
libpurple/protocols/silc/ops.c | 14 +-
libpurple/protocols/silc/silc.c | 7 +-
libpurple/protocols/silc/silcpurple.h | 2 +-
libpurple/protocols/silc/util.c | 9 +-
libpurple/protocols/silc/wb.c | 2 +-
libpurple/protocols/simple/simple.c | 6 +-
libpurple/protocols/yahoo/libyahoo.c | 2 +-
libpurple/protocols/yahoo/libyahoojp.c | 2 +-
libpurple/protocols/yahoo/libymsg.c | 39 +-
libpurple/protocols/yahoo/libymsg.h | 2 +-
libpurple/protocols/yahoo/yahoo_doodle.c | 6 +-
libpurple/protocols/yahoo/yahoo_filexfer.c | 1 +
libpurple/protocols/yahoo/yahoo_profile.c | 2 +-
libpurple/protocols/zephyr/zephyr.c | 35 +-
libpurple/prpl.h | 14 +-
libpurple/smiley.c | 35 +-
libpurple/theme-loader.c | 1 +
libpurple/upnp.c | 16 +-
libpurple/util.c | 43 +-
libpurple/util.h | 17 +-
libpurple/win32/global.mak | 2 +-
pidgin/gtk3compat.h | 82 -
pidgin/gtkaccount.c | 322 +-
pidgin/gtkblist.c | 44 +-
pidgin/gtkcellrendererexpander.c | 1 -
pidgin/gtkconv.c | 64 +-
pidgin/gtkconv.h | 5 +-
pidgin/gtkdebug.c | 9 -
pidgin/gtkdialogs.c | 18 +-
pidgin/gtkdnd-hints.c | 1 -
pidgin/gtkdocklet.c | 41 +-
pidgin/gtkimhtml.c | 21 +-
pidgin/gtkimhtmltoolbar.c | 7 -
pidgin/gtkimhtmltoolbar.h | 4 -
pidgin/gtklog.c | 2 +-
pidgin/gtkmain.c | 5 +-
pidgin/gtkmedia.c | 26 -
pidgin/gtkmenutray.c | 38 +-
pidgin/gtknotify.c | 7 +-
pidgin/gtkpluginpref.c | 4 -
pidgin/gtkpounce.c | 8 +-
pidgin/gtkprefs.c | 6 +-
pidgin/gtkrequest.c | 15 +-
pidgin/gtksourceundomanager.c | 17 +-
pidgin/gtkstatusbox.c | 2 -
pidgin/gtkutils.c | 8 +-
pidgin/gtkutils.h | 2 +-
pidgin/minidialog.c | 10 -
pidgin/minidialog.h | 5 -
pidgin/pidgin.h | 17 -
pidgin/pidgintooltip.c | 7 -
pidgin/plugins/cap/cap.c | 2 +-
pidgin/plugins/convcolors.c | 10 -
pidgin/plugins/gevolution/add_buddy_dialog.c | 4 +-
pidgin/plugins/gevolution/gevolution.c | 2 +-
pidgin/plugins/notify.c | 4 -
pidgin/plugins/pidginrc.c | 8 -
pidgin/plugins/spellchk.c | 4 +
pidgin/plugins/themeedit.c | 14 -
pidgin/plugins/timestamp_format.c | 11 +-
pidgin/plugins/xmppconsole.c | 12 -
pidgin/themes/Contents/Resources/Status.html | 6 +-
pidgin/win32/nsis/generate_gtk_zip.sh | 2 +-
pidgin/win32/nsis/pidgin-installer.nsi | 12 +-
po/ChangeLog | 26 +-
po/POTFILES.skip | 63 +
po/de.po | 1213 +-
po/el.po | 5079 +++------
po/et.po | 5059 +++------
po/ga.po | 9517 +++++++++---------
po/he.po | 886 +-
po/hr.po | 10 +-
po/lt.po | 4389 ++-----
po/my_MM.po | 88 +-
po/nl.po | 557 +-
po/nn.po | 87 +-
po/pa.po | 795 +-
po/pl.po | 552 +-
po/pt.po | 9945 ++++++-------------
po/pt_BR.po | 1807 +--
159 files changed, 16883 insertions(+), 25252 deletions(-)
diffs (truncated from 78106 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -86,3 +86,4 @@ dab0253fe3754ffd68e070cdfbbf31cd79f9a421
1d00b9e4aa6add6dca97cca4ac614d63bd105dfd v2.10.4
a3d157700972b48cf0a23b300261a5ab0c6e165b v2.10.5
4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
+ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,7 +15,7 @@ If concerns are raised as to the copyrig
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-2012 by the following:
+Copyright (C) 1998-2013 by the following:
Mark
Saleem Abdulrasool
@@ -543,6 +543,7 @@ Arun A. Tharuvai
Cestonaro Thilo
Will Thompson
Douglas Thrift (douglaswth)
+Niels Thykier
Mark Tiefenbruck
Andrew Tinney
Jeffery To
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ version 3.0.0 (??/??/????):
* Add email notification in the docklet area. (Alexei) (#3571)
* Add a pref to select the type messages in conversation that triggers
the docklet notification. (Momchil) (#12598)
+ * Complete support for receiving a limited amount of history when
+ joining a room. (Kha) (#15458)
Finch:
* Support the conversation-extended signal for extending the
@@ -55,10 +57,9 @@ version 3.0.0 (??/??/????):
* The Offline Message Emulation plugin now adds a note that the message
was an offline message. (Flavius Anton) (#2497)
-version 2.10.7:
- Gadu-Gadu:
- * Fix a crash at startup with large contact list. Avatar support for
- buddies will be disabled till 3.0.0. (#15226, #14305)
+version 2.10.7 (02/13/2013):
+ Alien hatchery:
+ * No changes
General:
* The configure script will now exit with status 1 when specifying
@@ -66,6 +67,8 @@ version 2.10.7:
--with-dynamic-prpls arguments. (Michael Fiedler) (#15316)
libpurple:
+ * Fix a crash when receiving UPnP responses with abnormally long values.
+ (CVE-2013-0274)
* Don't link directly to libgcrypt when building with GnuTLS support.
(Bartosz Brachaczek) (#15329)
* Fix UPnP mappings on routers that return empty <URLBase/> elements
@@ -80,10 +83,10 @@ version 2.10.7:
Gadu-Gadu:
* Fix a crash at startup with large contact list. Avatar support for
- buddies will be disabled till 3.0.0. (#15226, #14305)
+ buddies will be disabled until 3.0.0. (#15226, #14305)
IRC:
- * Support for SASL authentication. (Thijs Alkemade, Andy Spencer)
+ * Support for SASL authentication. (Thijs Alkemade, Andy Spencer)
(#13270)
* Print topic setter information at channel join. (#13317)
@@ -93,6 +96,11 @@ version 2.10.7:
Barfield) (#15217)
MXit:
+ * Fix two bugs where a remote MXit user could possibly specify a local
+ file path to be written to. (CVE-2013-0271)
+ * Fix a bug where the MXit server or a man-in-the-middle could
+ potentially send specially crafted data that could overflow a buffer
+ and lead to a crash or remote code execution. (CVE-2013-0272)
* Display farewell messages in a different colour to distinguish
them from normal messages.
* Add support for typing notification.
@@ -102,6 +110,13 @@ version 2.10.7:
still have a pending invite.
* The buddy's name was not centered vertically in the buddy-list if they
did not have a status-message or mood set.
+ * Fix decoding of font-size changes in the markup of received messages.
+ * Increase the maximum file size that can be transferred to 1 MB.
+ * When setting an avatar image, no longer downscale it to 96x96.
+
+ Sametime:
+ * Fix a crash in Sametime when a malicious server sends us an abnormally
+ long user ID. (CVE-2013-0273)
Yahoo!:
* Fix a double-free in profile/picture loading code. (Mihai Serban)
@@ -117,11 +132,14 @@ version 2.10.7:
such as MacPorts' +no_x11 variant.
Windows-Specific Changes:
- * Compile with secure flags (#15290)
+ * Compile with secure flags (Jurre van Bergen) (#15290)
* Installer downloads GTK+ Runtime and Debug Symbols more securely.
- (#15277)
+ Thanks goes to Jacob Appelbaum of the Tor Project for identifying
+ this issue and suggesting solutions. (#15277)
* Updates to a number of dependencies, some of which have security
- related fixes. (#14571, #15285, #15286)
+ related fixes. Thanks again to Jacob Appelbaum and Jurre van Bergen
+ for identifying the vulnerable libraries and to Dieter Verfaillie
+ for helping getting the libraries updated. (#14571, #15285, #15286)
* ATK 1.32.0-2
* Cyrus SASL 2.1.25
* expat 2.1.0-1
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -78,6 +78,7 @@ version 3.0.0 (??/??/????):
* PidginDockletFlag
Changed:
+ * account-authorization-requested signal merged with account-authorization-requested-with-message signal
* purple_account_add_buddy now takes an invite message as the last
parameter
* purple_account_add_buddies now takes an invite message as the last
@@ -106,6 +107,8 @@ version 3.0.0 (??/??/????):
a GList
* purple_notify_user_info_prepend_pair renamed to
purple_notify_user_info_prepend_pair_html
+ * pidgin_setup_screenname_autocomplete now takes a filter function and
+ its data as final two arguments
* purple_srv_resolve now takes a PurpleAccount as the first parameter
* purple_str_size_to_units now takes a goffset as the size parameter
* purple_txt_resolve now takes a PurpleAccount as the first parameter
@@ -148,6 +151,7 @@ version 3.0.0 (??/??/????):
* _PurplePrivacyType
* _PurpleSoundEventID
* _XMLNodeType
+ * account-authorization-requested-with-message signal
* GtkIMHtml.clipboard_html_string
* GtkIMHtml.clipboard_text_string
* GtkIMHtmlFontDetail
@@ -161,8 +165,9 @@ version 3.0.0 (??/??/????):
* pidgin_check_if_dir
* PIDGIN_DIALOG
* pidgin_dialogs_alias_contact
+ * pidgin_mini_dialog_links_supported
* pidgin_set_custom_buddy_icon
- * pidgin_setup_screenname_autocomplete
+ * pidgin_setup_screenname_autocomplete_with_filter
* PidginBuddyList.connection_errors
* PidginConversation.sg
* purple_account_add_buddies_with_invite
@@ -226,6 +231,8 @@ version 3.0.0 (??/??/????):
* purple_util_fetch_url_request, instead.
* purple_util_fetch_url_request_len_with_account. Use
purple_util_fetch_url_request, instead.
+ * purple_util_get_image_checksum. Use
+ g_compute_checksum_for_data(G_CHECKSUM_SHA1, ...), instead.
* PurpleCertificateVerificationStatus.PURPLE_CERTIFICATE_INVALID
* PurpleConnectionUiOps.report_disconnect_reason
* PurplePluginProtocolInfo.add_buddy_with_invite
@@ -262,6 +269,9 @@ version 3.0.0 (??/??/????):
* xmlnode_set_attrib_with_namespace
* xmlnode_set_attrib_with_prefix
+version 2.10.7:
+ * No changes
+
version 2.10.6:
* No changes
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -38,14 +38,14 @@ authenticode_sign = $(MONO_SIGNCODE) \
-a sha1 -$$ commercial \
-n "$(2)" -i "https://pidgin.im" \
-t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
- $(1)
+ $(1) && rm -f $(1).bak
gpg_sign = $(GPG_SIGN) -ab $(1) && $(GPG_SIGN) --verify $(1).asc
STRIPPED_RELEASE_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-win32bin
DEBUG_SYMBOLS_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-dbgsym
-PIDGIN_INST_DEP_DIR="$(WIN32_DEV_TOP)/pidgin-inst-deps-20120910"
+PIDGIN_INST_DEP_DIR="$(WIN32_DEV_TOP)/pidgin-inst-deps-20130214"
# Any *.dll or *.exe files included in win32-install-dir that we don't compile
# should be included in this list so they don't get stripped
@@ -68,7 +68,6 @@ EXTERNAL_DLLS = \
libssp-0.dll \
libxml2-2.dll \
nss3.dll \
- nssckbi.dll \
nssutil3.dll \
saslANONYMOUS.dll \
saslCRAMMD5.dll \
@@ -110,7 +109,7 @@ endif
cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
cp $(PIDGIN_INST_DEP_DIR)/exchndl.dll $(PIDGIN_INSTALL_DIR)
- cp $(GCC_SSP_TOP)/bin/libssp-0.dll $(PIDGIN_INSTALL_DIR)
+ cp $(GCC_SSP_TOP)/libssp-0.dll $(PIDGIN_INSTALL_DIR)
gtk_runtime_zip:
pidgin/win32/nsis/generate_gtk_zip.sh "`pwd`" "$(GPG_SIGN)"
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ m4_define([purple_display_version], purp
m4_define([gnt_lt_current], [8])
m4_define([gnt_major_version], [2])
m4_define([gnt_minor_version], [8])
-m4_define([gnt_micro_version], [9])
+m4_define([gnt_micro_version], [10])
m4_define([gnt_version_suffix], [devel])
m4_define([gnt_version],
[gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -380,7 +380,7 @@ AC_ARG_ENABLE(consoleui, [AS_HELP_STRING
[enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no])
dnl #######################################################################
-dnl # Check for GTK+ 2.10 and other things used by the GTK UI
+dnl # Check for GTK+ 2.18 and other things used by the GTK UI
dnl #######################################################################
AC_ARG_ENABLE(screensaver,
[AS_HELP_STRING([--disable-screensaver],
@@ -440,20 +440,20 @@ Pidgin. If you want to build only Finch
running configure.
])])
elif test "x$with_gtk" = "x2"; then
- PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.18.0], , [
AC_MSG_RESULT(no)
AC_MSG_ERROR([
-You must have GTK+ 2.10.0 or newer development headers installed to compile
+You must have GTK+ 2.18.0 or newer development headers installed to compile
Pidgin. If you want to build only Finch then specify --disable-gtkui when
running configure.
])])
elif test "x$with_gtk" = "xauto"; then
PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0], [with_gtk=3], [
AC_MSG_RESULT(no)
- PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], [with_gtk=2], [
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.18.0], [with_gtk=2], [
AC_MSG_RESULT(no)
AC_MSG_ERROR([
-You must have GTK+ 2.10.0 or newer development headers installed to compile
+You must have GTK+ 2.18.0 or newer development headers installed to compile
Pidgin. If you want to build only Finch then specify --disable-gtkui when
running configure.
])])])
@@ -2586,12 +2586,12 @@ fi
AC_SUBST(PLUGINS_DEFINE)
dnl #######################################################################
-dnl # Check for Cyrus-SASL (for Jabber)
+dnl # Check for Cyrus-SASL (for xmpp/irc)
dnl #######################################################################
dnl AC_CHECK_SIZEOF(short)
AC_CHECK_FUNCS(snprintf connect)
AC_SUBST(SASL_LIBS)
-AC_ARG_ENABLE(cyrus-sasl, AS_HELP_STRING([--enable-cyrus-sasl], [enable Cyrus SASL support for jabberd]), enable_cyrus_sasl=$enableval, enable_cyrus_sasl=no)
+AC_ARG_ENABLE(cyrus-sasl, AS_HELP_STRING([--enable-cyrus-sasl], [enable Cyrus SASL support for xmpp/irc]), enable_cyrus_sasl=$enableval, enable_cyrus_sasl=no)
if test "x$enable_cyrus_sasl" = "xyes" ; then
AC_CHECK_LIB(sasl2, sasl_client_init, [
AM_CONDITIONAL(USE_CYRUS_SASL, true)
diff --git a/doc/account-signals.dox b/doc/account-signals.dox
--- a/doc/account-signals.dox
+++ b/doc/account-signals.dox
@@ -14,7 +14,6 @@
@signal account-actions-changed
@signal account-alias-changed
@signal account-authorization-requested
- @signal account-authorization-requested-with-message
@signal account-authorization-denied
@signal account-authorization-granted
@signal account-error-changed
@@ -145,51 +144,41 @@ void (*account_alias_changed)(PurpleAcco
@signaldef account-authorization-requested
@signalproto
-int (*account_authorization_requested)(PurpleAccount *account, const char *user);
+int (*account_authorization_requested)(PurpleAccount *account, const char *user, const char *message, char **response);
@endsignalproto
@signaldesc
Emitted when a user requests authorization.
- @param account The account.
- @param user The name of the user requesting authorization.
- @return Less than zero to deny the request without prompting, greater
- than zero if the request should be granted. If zero is returned,
More information about the Commits
mailing list