pidgin/ljfisher-ssl-client-auth

merge of '2ba2c488c0ad397e75242d7de7eb4a8a0e9f3e8b'

2011-05-12, Ka-Hing Cheung
a4ba91b66fd1
Parents 2ba2c488c0adea1e6ba109cc
Children 45ee2a719409
merge of '2ba2c488c0ad397e75242d7de7eb4a8a0e9f3e8b'
and 'ea1e6ba109ccde71265826c75a286469551c6515'
5 files changed, 27 insertions(+), 2 deletions(-)
  • +6 -0
    ChangeLog
  • +16 -0
    libpurple/media/backend-fs2.c
  • +1 -1
    libpurple/protocols/oscar/libaim.c
  • +1 -1
    libpurple/protocols/oscar/libicq.c
  • +3 -0
    po/ChangeLog
    • --- a/ChangeLog Wed May 11 05:43:38 2011 +0000
    +++ b/ChangeLog Thu May 12 02:31:25 2011 +0000
    @@ -39,6 +39,10 @@
    restrict operations that could leak potentially sensitive data
    (e.g. DNS queries). (#11110, #13928)
    + AIM:
    + * Fix setting icons with dimensions greater than 64x64 pixels by scaling
    + them down to at most 64x64. (#12874, #13165)
    +
    Gadu-Gadu:
    * Allow showing your status only to buddies. (Mateusz Piękos) (#13358)
    * Updated internal libgadu to version 1.10.1. (Robert Matusewicz,
    @@ -64,6 +68,8 @@
    (#13886)
    ICQ:
    + * Fix setting icons with dimensions greater than 64x64 pixels by scaling
    + them down to at most 64x64. (#12874, #13165)
    * Fix unsetting your mood when "None" is selected. (Dustin Gathmann)
    (#11895)
    * Ignore Daylight Saving Time when performing calculations related to
    --- a/libpurple/media/backend-fs2.c Wed May 11 05:43:38 2011 +0000
    +++ b/libpurple/media/backend-fs2.c Thu May 12 02:31:25 2011 +0000
    @@ -1081,6 +1081,22 @@
    GstElement *lastElement = NULL;
    GList *sessions;
    + GError *error = NULL;
    + gchar *debug_msg = NULL;
    +
    + gst_message_parse_error(msg, &error, &debug_msg);
    + purple_debug_error("backend-fs2", "gst error %s\ndebugging: %s\n",
    + error->message, debug_msg);
    +
    + g_error_free(error);
    + g_free(debug_msg);
    +
    + /* Not entirely sure this is correct, but prevents a
    + * NULL deref crash.
    + */
    + if (!element)
    + return;
    +
    while (!GST_IS_PIPELINE(element)) {
    if (element == priv->confbin)
    break;
    --- a/libpurple/protocols/oscar/libaim.c Wed May 11 05:43:38 2011 +0000
    +++ b/libpurple/protocols/oscar/libaim.c Thu May 12 02:31:25 2011 +0000
    @@ -32,7 +32,7 @@
    OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE | OPT_PROTO_INVITE_MESSAGE,
    NULL, /* user_splits */
    NULL, /* protocol_options */
    - {"gif,jpeg,bmp,ico", 0, 0, 100, 100, 7168, PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
    + {"gif,jpeg,bmp,ico", 0, 0, 64, 64, 7168, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
    oscar_list_icon_aim, /* list_icon */
    oscar_list_emblem, /* list_emblems */
    oscar_status_text, /* status_text */
    --- a/libpurple/protocols/oscar/libicq.c Wed May 11 05:43:38 2011 +0000
    +++ b/libpurple/protocols/oscar/libicq.c Thu May 12 02:31:25 2011 +0000
    @@ -41,7 +41,7 @@
    OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE | OPT_PROTO_INVITE_MESSAGE,
    NULL, /* user_splits */
    NULL, /* protocol_options */
    - {"gif,jpeg,bmp,ico", 0, 0, 100, 100, 7168, PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
    + {"gif,jpeg,bmp,ico", 0, 0, 64, 64, 7168, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
    oscar_list_icon_icq, /* list_icon */
    oscar_list_emblem, /* list_emblems */
    oscar_status_text, /* status_text */
    --- a/po/ChangeLog Wed May 11 05:43:38 2011 +0000
    +++ b/po/ChangeLog Thu May 12 02:31:25 2011 +0000
    @@ -3,6 +3,7 @@
    version 2.8.0
    * Albanian translation updated (Besnik Bleta)
    * Bengali translation updated (Jamil Ahmed)
    + * Catalan translation updated (Josep Puigdemont)
    * Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
    Liu)
    * Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
    @@ -10,6 +11,8 @@
    * Czech translation updated (David Vachulka)
    * Dutch translation updated (Gideon van Melle)
    * English (Canadian) updated (Elliott Sales de Andrade)
    + * French translation updated (Éric Boumaour)
    + * German translation updated (Björn Voigt, Jochen Kemnade)
    * Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
    * Polish translation updated (Piotr Drąg)
    * Romanian translation updated (Mişu Moldovan)