/dev/qulogic/masterpassword: 7a07b6857540: Merge with default.
Elliott Sales de Andrade
qulogic at pidgin.im
Fri Jan 25 02:27:43 EST 2013
Changeset: 7a07b6857540f325468231f59cdc1764dace73d8
Author: Elliott Sales de Andrade <qulogic at pidgin.im>
Date: 2013-01-25 02:22 -0500
Branch: soc.2008.masterpassword
URL: http://hg.pidgin.im/dev/qulogic/masterpassword/rev/7a07b6857540
Description:
Merge with default.
diffstat:
.hgignore | 2 +
COPYRIGHT | 7 +
ChangeLog | 66 +-
ChangeLog.API | 15 +
Makefile.am | 6 +-
Makefile.mingw | 46 +-
autogen.sh | 7 +-
configure.ac | 311 +-
finch/finch.c | 11 -
finch/gntsound.c | 4 +
finch/libgnt/gnt.h | 13 -
finch/libgnt/gntcolors.c | 3 -
finch/libgnt/gntcolors.h | 2 -
finch/libgnt/gntfilesel.c | 100 -
finch/libgnt/gntmain.c | 10 -
finch/libgnt/gntprogressbar.c | 9 -
finch/libgnt/gntstyle.c | 32 +-
finch/libgnt/gntwm.c | 36 +-
finch/plugins/gnttinyurl.c | 1 +
libpurple/Makefile.am | 10 +-
libpurple/Makefile.mingw | 20 +-
libpurple/accountopt.c | 1 +
libpurple/blist.c | 18 +-
libpurple/blist.h | 28 +-
libpurple/buddyicon.c | 54 +-
libpurple/buddyicon.h | 10 +-
libpurple/certificate.c | 86 +-
libpurple/certificate.h | 45 +-
libpurple/ciphers/Makefile.am | 5 +-
libpurple/ciphers/gchecksum.c | 11 -
libpurple/ciphers/md5.c | 326 --
libpurple/ciphers/sha1.c | 281 -
libpurple/ciphers/sha256.c | 283 -
libpurple/connection.c | 2 +
libpurple/core.c | 12 +-
libpurple/dnsquery.c | 21 +-
libpurple/example/nullclient.c | 11 -
libpurple/ft.c | 4 +-
libpurple/ft.h | 2 +-
libpurple/glibcompat.h | 53 +
libpurple/http.c | 2357 ++++++++++++++++
libpurple/http.h | 590 ++++
libpurple/imgstore.c | 48 +-
libpurple/imgstore.h | 99 +-
libpurple/log.c | 17 +-
libpurple/media/backend-fs2.c | 116 +-
libpurple/mediamanager.c | 66 +-
libpurple/notify.c | 3 +
libpurple/ntlm.c | 37 +-
libpurple/obsolete.c | 776 +++++
libpurple/obsolete.h | 110 +
libpurple/plugins/autoaccept.c | 2 +-
libpurple/plugins/log_reader.c | 9 +-
libpurple/plugins/perl/common/BuddyIcon.xs | 2 +-
libpurple/plugins/perl/common/BuddyList.xs | 10 -
libpurple/plugins/perl/common/Certificate.xs | 14 +-
libpurple/plugins/perl/common/ImgStore.xs | 4 +-
libpurple/plugins/perl/common/Makefile.mingw | 2 +-
libpurple/plugins/perl/common/Pounce.xs | 3 -
libpurple/plugins/perl/common/Util.xs | 51 -
libpurple/plugins/perl/common/module.h | 1 -
libpurple/plugins/tcl/signal-test.tcl | 2 +-
libpurple/plugins/tcl/tcl.c | 34 +-
libpurple/pounce.c | 4 +-
libpurple/pounce.h | 8 -
libpurple/protocols/bonjour/bonjour_ft.c | 166 +-
libpurple/protocols/bonjour/bonjour_ft.h | 2 +
libpurple/protocols/gg/avatar.c | 2 +
libpurple/protocols/gg/gg.c | 7 +-
libpurple/protocols/gg/image.c | 3 +-
libpurple/protocols/gg/oauth/oauth-purple.c | 1 +
libpurple/protocols/gg/pubdir-prpl.c | 1 +
libpurple/protocols/gg/roster.c | 1 +
libpurple/protocols/gg/servconn.c | 1 +
libpurple/protocols/gg/status.c | 10 +-
libpurple/protocols/irc/Makefile.mingw | 7 +
libpurple/protocols/irc/irc.c | 32 +-
libpurple/protocols/irc/irc.h | 19 +
libpurple/protocols/irc/msgs.c | 413 ++
libpurple/protocols/irc/parse.c | 15 +-
libpurple/protocols/jabber/Makefile.am | 8 +-
libpurple/protocols/jabber/Makefile.mingw | 17 -
libpurple/protocols/jabber/buddy.c | 2 +-
libpurple/protocols/jabber/google/google_p2p.c | 442 +++
libpurple/protocols/jabber/google/google_p2p.h | 102 +
libpurple/protocols/jabber/google/relay.c | 1 +
libpurple/protocols/jabber/jabber.c | 1 +
libpurple/protocols/jabber/jingle/content.h | 8 -
libpurple/protocols/jabber/jingle/iceudp.c | 96 +-
libpurple/protocols/jabber/jingle/iceudp.h | 16 +-
libpurple/protocols/jabber/jingle/jingle.c | 17 +-
libpurple/protocols/jabber/jingle/jingle.h | 8 -
libpurple/protocols/jabber/jingle/rawudp.c | 50 +-
libpurple/protocols/jabber/jingle/rawudp.h | 10 -
libpurple/protocols/jabber/jingle/rtp.c | 171 +-
libpurple/protocols/jabber/jingle/rtp.h | 8 -
libpurple/protocols/jabber/jingle/session.h | 8 -
libpurple/protocols/jabber/jingle/transport.c | 30 +
libpurple/protocols/jabber/jingle/transport.h | 14 +-
libpurple/protocols/jabber/namespaces.h | 5 +
libpurple/protocols/jabber/presence.c | 27 +-
libpurple/protocols/jabber/presence.h | 1 +
libpurple/protocols/jabber/useravatar.c | 1 +
libpurple/protocols/msn/msn.c | 3 +-
libpurple/protocols/msn/notification.c | 2 +-
libpurple/protocols/msn/session.c | 1 +
libpurple/protocols/msn/slp.c | 1 +
libpurple/protocols/msn/switchboard.c | 2 +-
libpurple/protocols/msn/user.c | 10 -
libpurple/protocols/mxit/actions.c | 27 +-
libpurple/protocols/mxit/cipher.c | 4 +
libpurple/protocols/mxit/formcmds.c | 7 +-
libpurple/protocols/mxit/login.c | 1 +
libpurple/protocols/mxit/markup.c | 13 +-
libpurple/protocols/mxit/mxit.c | 2 +-
libpurple/protocols/mxit/profile.c | 40 +-
libpurple/protocols/mxit/profile.h | 14 +
libpurple/protocols/mxit/protocol.c | 59 +-
libpurple/protocols/mxit/protocol.h | 13 +-
libpurple/protocols/mxit/roster.h | 1 +
libpurple/protocols/mxit/splashscreen.c | 2 +-
libpurple/protocols/myspace/message.c | 14 +-
libpurple/protocols/myspace/user.h | 2 +
libpurple/protocols/oscar/family_feedbag.c | 21 +-
libpurple/protocols/oscar/odc.c | 2 +-
libpurple/protocols/oscar/oscar.c | 21 +-
libpurple/protocols/oscar/oscar.h | 1 +
libpurple/protocols/sametime/sametime.c | 2 +-
libpurple/protocols/silc/Makefile.mingw | 2 +-
libpurple/protocols/silc/ops.c | 2 +-
libpurple/protocols/yahoo/libymsg.c | 1 +
libpurple/protocols/yahoo/libymsg.h | 1 +
libpurple/protocols/yahoo/yahoo_aliases.c | 1 +
libpurple/protocols/yahoo/yahoo_picture.c | 1 +
libpurple/protocols/yahoo/yahoo_profile.c | 3 +-
libpurple/prpl.h | 2 +-
libpurple/smiley.c | 2 +-
libpurple/stringref.c | 4 +-
libpurple/tests/check_libpurple.c | 4 -
libpurple/tests/test_util.c | 165 +
libpurple/upnp.c | 6 +-
libpurple/util.c | 795 +----
libpurple/util.h | 79 +-
libpurple/win32/global.mak | 23 +-
pidgin.spec.in | 2 +-
pidgin/Makefile.am | 2 +
pidgin/Makefile.mingw | 4 +-
pidgin/gtk3compat.h | 10 +
pidgin/gtkaccount.c | 2 +-
pidgin/gtkblist.c | 13 +-
pidgin/gtkconv-theme.c | 46 +
pidgin/gtkconv-theme.h | 9 +
pidgin/gtkconv.c | 162 +-
pidgin/gtkconv.h | 1 +
pidgin/gtkdebug.c | 116 +-
pidgin/gtkdialogs.c | 7 +-
pidgin/gtkdocklet.c | 81 +-
pidgin/gtkdocklet.h | 7 +
pidgin/gtkeventloop.c | 4 -
pidgin/gtkimhtml.c | 5 +-
pidgin/gtkimhtmltoolbar.c | 2 +-
pidgin/gtkmain.c | 67 +-
pidgin/gtkmedia.c | 40 +-
pidgin/gtknotify.c | 28 +-
pidgin/gtknotify.h | 14 +
pidgin/gtkpounce.c | 30 +-
pidgin/gtkprefs.c | 783 +++++-
pidgin/gtksmiley.c | 35 +
pidgin/gtksound.c | 7 +-
pidgin/gtkstatusbox.c | 8 +-
pidgin/gtkutils.c | 19 +-
pidgin/gtkwebview.c | 43 +-
pidgin/gtkwebviewtoolbar.c | 6 +-
pidgin/minidialog.c | 10 +
pidgin/pidgin-3.pc.in | 2 +-
pidgin/pidgin.h | 4 -
pidgin/pidginstock.c | 24 +-
pidgin/pixmaps/Makefile.am | 1 +
pidgin/pixmaps/emotes/default/24/default.theme.in | 100 -
pidgin/pixmaps/emotes/small/16/Makefile.am | 2 +
pidgin/pixmaps/emotes/small/16/small.theme.in | 38 -
pidgin/pixmaps/protocols/48/google-talk.png | Bin
pidgin/plugins/Makefile.am | 5 -
pidgin/plugins/cap/cap.c | 6 +-
pidgin/plugins/disco/xmppdisco.c | 2 +-
pidgin/plugins/notify.c | 12 +-
pidgin/plugins/perl/common/Makefile.mingw | 2 +-
pidgin/plugins/relnot.c | 49 +-
pidgin/smileyparser.c | 2 +-
pidgin/themes/Contents/Resources/Content.html | 4 +-
pidgin/themes/Contents/Resources/Incoming/Content.html | 8 +
pidgin/themes/Contents/Resources/main.css | 14 +-
pidgin/themes/Makefile.am | 3 +
pidgin/win32/gtkdocklet-win32.c | 16 +-
pidgin/win32/gtkwin32dep.c | 24 +-
pidgin/win32/nsis/generate_gtk_zip.sh | 89 +-
pidgin/win32/nsis/pidgin-installer.nsi | 98 +-
pidgin/win32/winpidgin.c | 48 +-
share/ca-certs/Baltimore_CyberTrust_Root.pem | 21 +
share/ca-certs/Makefile.am | 4 +-
share/ca-certs/Microsoft_Internet_Authority.pem | 29 -
share/ca-certs/Microsoft_Secure_Server_Authority.pem | 35 -
share/ca-certs/Verisign_RSA_Secure_Server_CA.pem | 15 -
valgrind-suppressions | 14 +-
204 files changed, 8146 insertions(+), 3496 deletions(-)
diffs (truncated from 17483 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -7,8 +7,10 @@ syntax: regexp
.*/perl/common/[^/]+\.c$
.*/perl/common/blib.*
.*/perl/common/pm_to_blib$
+.*/perl/common/MYMETA\.(json|yml)
.*~$
.*\.a$
+.*\.asc$
.*\.bak$
.*\.bs$
.*\.def$
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -17,6 +17,7 @@ control system to see from where it came
Copyright (C) 1998-2012 by the following:
+Mark
Saleem Abdulrasool
Jakub Adam
Dave Ahlswede
@@ -74,6 +75,7 @@ Craig Boston
Éric Boumaour
Chris Boyle
Stanislav Brabec
+Bartosz Brachaczek
Quentin Brandon
Derrick J Brashear
Mauro Sérgio Ferreira Brasil
@@ -176,6 +178,7 @@ Jesse Farmer
Gavan Fantom (gavan)
Leonardo Fernandes
David Fiander
+Michael Fiedler
Ryan Flegel
Rob Flynn <gaim at robflynn.com>
Rob Foehl (rwf)
@@ -256,6 +259,7 @@ Instant Messaging Freedom, Inc.
Vitaliy Ischenko
Intel Corporation
Andrew Ivanov
+Momchil Ivanov
Scott Jackson
Hans Petter Jansson
David Jedelsky
@@ -417,6 +421,7 @@ Eric Polino <aluink at gmail.com>
Ari Pollak
Stephen Pope
Cristi Posoiu
+Alexei Potashnik
Nathan Poznick
Jory A. Pratt
David Preece
@@ -458,6 +463,7 @@ Sam S.
Thanumalayan S.
Jonathan Sailor
Elliott Sales de Andrade
+Catalin Salgau
Tomasz Sałaciński <tsalacinski at gmail.com>
Pradyumna Sampath
Arvind Samptur
@@ -510,6 +516,7 @@ Peter Speybrouck
Lex Spoon
Chris Stafford
Kevin Stange
+Ferdinand Stehle
Joshua Stein
Jakub Steiner
Richard Stellingwerff
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@ version 3.0.0 (??/??/????):
either 2 or 3 will attempt to build with specifically 2.x or 3.x
support. The default is 'auto', which will first look for 3.x
development headers and then 2.x development headers.
+ * 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)
Finch:
* Support the conversation-extended signal for extending the
@@ -57,21 +60,82 @@ version 2.10.7:
* Fix a crash at startup with large contact list. Avatar support for
buddies will be disabled till 3.0.0. (#15226, #14305)
+ General:
+ * The configure script will now exit with status 1 when specifying
+ invalid protocol plugins using the --with-static-prpls and
+ --with-dynamic-prpls arguments. (Michael Fiedler) (#15316)
+
+ libpurple:
+ * Don't link directly to libgcrypt when building with GnuTLS support.
+ (Bartosz Brachaczek) (#15329)
+ * Fix UPnP mappings on routers that return empty <URLBase/> elements
+ in their response. (Ferdinand Stehle) (#15373)
+ * Tcl plugin uses saner, race-free plugin loading.
+ * Fix the Tcl signals-test plugin for savedstatus-changed.
+ (Andrew Shadura) (#15443)
+
+ Pidgin:
+ * Make Pidgin more friendly to non-X11 GTK+, such as MacPorts' +no_x11
+ variant.
+
Gadu-Gadu:
* Fix a crash at startup with large contact list. Avatar support for
buddies will be disabled till 3.0.0. (#15226, #14305)
+ IRC:
+ * Support for SASL authentication. (Thijs Alkemade, Andy Spencer)
+ (#13270)
+ * Print topic setter information at channel join. (#13317)
+
MSN:
+ * Fix SSL certificate issue when signing into MSN for some users.
* Fix a crash when removing a user before its icon is loaded. (Mark
Barfield) (#15217)
+ MXit:
+ * Display farewell messages in a different colour to distinguish
+ them from normal messages.
+ * Add support for typing notification.
+ * Add support for the Relationship Status profile attribute.
+ * Remove all reference to Hidden Number.
+ * Ignore new invites to join a GroupChat if you're already joined, or
+ 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.
+
Yahoo!:
* Fix a double-free in profile/picture loading code. (Mihai Serban)
(#15053)
+ * Fix retrieving server-side buddy aliases. (Catalin Salgu) (#15381)
Plugins:
* The Voice/Video Settings plugin supports using the sndio GStreamer
- backends. (Brad Smith) (#14414)
+ backends. (Brad Smith) (#14414)
+ * Fix a crash in the Contact Availability Detection plugin. (Mark)
+ (#15327)
+ * Make the Message Notification plugin more friendly to non-X11 GTK+,
+ such as MacPorts' +no_x11 variant.
+
+ Windows-Specific Changes:
+ * Compile with secure flags (#15290)
+ * Installer downloads GTK+ Runtime and Debug Symbols more securely.
+ (#15277)
+ * Updates to a number of dependencies, some of which have security
+ related fixes. (#14571, #15285, #15286)
+ * ATK 1.32.0-2
+ * Cyrus SASL 2.1.25
+ * expat 2.1.0-1
+ * freetype 2.4.10-1
+ * gettext 0.18.1.1-2
+ * Glib 2.28.8-1
+ * libpng 1.4.12-1
+ * libxml2 2.9.0-1
+ * NSS 3.13.6 and NSPR 4.9.2
+ * Pango 1.29.4-1
+ * SILC 1.1.10
+ * zlib 1.2.5-2
+ * Patch libmeanwhile (sametime library) to fix crash. (Jonathan Rice)
+ (#12637)
version 2.10.6 (07/06/2012):
Pidgin:
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -3,6 +3,7 @@ Pidgin and Finch: The Pimpin' Penguin IM
version 3.0.0 (??/??/????):
libpurple:
Added:
+ * displaying-emails-clear signal (notification signal)
* pidgin_create_webview
* purple_account_is_disconnecting
* purple_account_get_ui_data
@@ -23,6 +24,8 @@ version 3.0.0 (??/??/????):
* purple_conversation_message_get_alias
* purple_conversation_message_get_conv
* purple_contact_get_contact_size
+ * purple_notify_emails_pending
+ * purple_notify_emails_present
* purple_notify_searchresult_column_get_title
* purple_notify_searchresult_column_is_visible
* purple_notify_searchresult_column_set_visible
@@ -72,12 +75,14 @@ version 3.0.0 (??/??/????):
* Various WebKit-related functions in gtkwebview.h
* xmlnode_get_default_namespace
* xmlnode_strip_prefixes
+ * PidginDockletFlag
Changed:
* 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
parameter
+ * purple_buddy_icon_unref no longer has a return value
* purple_certificate_check_signature_chain now returns a list of failing
PurpleCertificate*s as the second parameter
* purple_connection_error now takes a PurpleConnectionError
@@ -85,6 +90,8 @@ version 3.0.0 (??/??/????):
* purple_conversation_get_gc renamed to
purple_conversation_get_connection
* purple_dnsquery_a now takes a PurpleAccount as the first parameter
+ * purple_imgstore_add renamed to purple_imgstore_new
+ * purple_imgstore_add_with_id renamed to purple_imgstore_new_with_id
* purple_network_listen now takes the protocol family as the second
parameter
* purple_network_listen now takes a boolean indicating external port
@@ -114,6 +121,9 @@ version 3.0.0 (??/??/????):
* purple_xfer_set_bytes_sent now takes a goffset as the bytes_sent
parameter
* purple_xfer_set_size now takes a goffset as the size parameter
+ * PurpleCertificateVerificationStatus enumeration is now merged with
+ internal flags, thus removing PURPLE_CERTIFICATE_INVALID and
+ replacing it with more precise errors.
* PurpleConnectionUiOps.report_disconnect now passes a
PurpleConnectionError as the second parameter
* PurpleXfer.bytes_remaining is now a goffset
@@ -157,6 +167,9 @@ version 3.0.0 (??/??/????):
* PidginConversation.sg
* purple_account_add_buddies_with_invite
* purple_account_add_buddy_with_invite
+ * purple_blist_load
+ * purple_blist_new
+ * purple_set_blist
* purple_blist_update_buddy_icon
* purple_buddy_get_local_alias
* purple_buddy_icons_has_custom_icon
@@ -188,6 +201,7 @@ version 3.0.0 (??/??/????):
* purple_plugins_unregister_load_notify_cb
* purple_plugins_unregister_probe_notify_cb
* purple_plugins_unregister_unload_notify_cb
+ * purple_pounces_load
* purple_presence_add_status
* purple_presence_add_list
* purple_proxy_connect_socks5
@@ -212,6 +226,7 @@ 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.
+ * PurpleCertificateVerificationStatus.PURPLE_CERTIFICATE_INVALID
* PurpleConnectionUiOps.report_disconnect_reason
* PurplePluginProtocolInfo.add_buddy_with_invite
* PurplePluginProtocolInfo.add_buddies_with_invite
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = \
HACKING \
Makefile.mingw \
PLUGIN_HOWTO \
- README.MTN \
+ README.hg \
README.mingw \
config.h.mingw \
doxy2devhelp.xsl \
@@ -54,13 +54,13 @@ version-check:
# ... 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
-packages:
+sign-packages: dist
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
+release: commit-check version-check distcheck sign-packages
if INSTALL_I18N
PO_DIR=po
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -31,11 +31,21 @@ awk 'BEGIN {FS="."} { \
exit; \
}' VERSION)
-GTK_INSTALL_VERSION = 2.16.6.0
+GTK_INSTALL_VERSION = 2.16.6.1
+
+authenticode_sign = $(MONO_SIGNCODE) \
+ -spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
+ -a sha1 -$$ commercial \
+ -n "$(2)" -i "https://pidgin.im" \
+ -t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
+ $(1)
+
+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
More information about the Commits
mailing list