pidgin/ljfisher-ssl-client-auth

Merge updates from the 2.9.0 branch into trunk

2011-06-22, Mark Doliner
70bb95096b14
Parents 96183796df0c
Children 2eef2f27855f
Merge updates from the 2.9.0 branch into trunk
4 files changed, 42 insertions(+), 9 deletions(-)
  • +17 -7
    ChangeLog
  • +17 -0
    ChangeLog.API
  • +2 -2
    configure.ac
  • +6 -0
    po/ChangeLog
    • --- a/ChangeLog Wed Jun 22 07:07:28 2011 +0000
    +++ b/ChangeLog Wed Jun 22 07:31:02 2011 +0000
    @@ -1,24 +1,34 @@
    Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
    -version 2.8.1 (MM/DD/YYYY):
    +version 2.9.1 (MM/DD/YYYY):
    + Gadu-Gadu:
    + * Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
    + (#5242)
    +
    +version 2.9.0 (06/23/2011):
    Pidgin:
    + * Fix a potential remote denial-of-service bug related to displaying
    + buddy icons.
    + * Significantly improved performance of larger IRC channels (regression
    + introduced in 2.8.0).
    * Fix Conversation->Add on AIM and MSN.
    - * Entries in the chat user list are sorted properly again.
    + * Entries in the chat user list are sorted properly again. This was
    + inadvertenly broken in 2.8.0.
    Finch:
    - * Fixed logging in to ICQ.
    + * Fix logging in to ICQ.
    libpurple:
    * media: Actually use the specified TCP port from the TURN configuration to
    create a TCP relay candidate.
    + AIM and ICQ:
    + * Fix crashes on some non-mainstream OSes when attempting to
    + printf("%s", NULL). (Clemens Huebner) (#14297)
    +
    Plugins:
    * The Evolution Integration plugin compiles again.
    - Gadu-Gadu:
    - * Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
    - (#5242)
    -
    version 2.8.0 (06/07/2011):
    General:
    * Implement simple silence suppression for voice calls, preventing
    --- a/ChangeLog.API Wed Jun 22 07:07:28 2011 +0000
    +++ b/ChangeLog.API Wed Jun 22 07:31:02 2011 +0000
    @@ -1,5 +1,22 @@
    Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
    +version 2.9.0:
    + libpurple:
    + Added:
    + * Hash table to PurpleConvChat struct, used to make
    + purple_conv_chat_cb_find O(1).
    + * ui_data pointer to PurpleConvChatBuddy struct.
    + * deleting-chat-buddy signal (conversation signals)
    + * pidgin_pixbuf_from_data
    + * pidgin_pixbuf_anim_from_data
    + * pidgin_pixbuf_new_from_file
    + * pidgin_pixbuf_new_from_file_at_size
    + * pidgin_pixbuf_new_from_file_at_scale
    +
    + Deprecated:
    + * purple_conv_chat_set_users
    + * PurpleConvChat in_room list
    +
    version 2.8.0 (06/07/2011):
    libpurple:
    Added:
    --- a/configure.ac Wed Jun 22 07:07:28 2011 +0000
    +++ b/configure.ac Wed Jun 22 07:31:02 2011 +0000
    @@ -43,9 +43,9 @@
    #
    # Make sure to update finch/libgnt/configure.ac with libgnt version changes.
    #
    -m4_define([purple_lt_current], [8])
    +m4_define([purple_lt_current], [9])
    m4_define([purple_major_version], [2])
    -m4_define([purple_minor_version], [8])
    +m4_define([purple_minor_version], [9])
    m4_define([purple_micro_version], [1])
    m4_define([purple_version_suffix], [devel])
    m4_define([purple_version],
    --- a/po/ChangeLog Wed Jun 22 07:07:28 2011 +0000
    +++ b/po/ChangeLog Wed Jun 22 07:31:02 2011 +0000
    @@ -1,5 +1,11 @@
    Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
    +version 2.9.1
    + * German translation updated (Björn Voigt, Jochen Kemnade)
    +
    +version 2.9.0
    + * No changes
    +
    version 2.8.0
    * Albanian translation updated (Besnik Bleta)
    * Bengali translation updated (Jamil Ahmed)