Mercurial > pidgin
changeset 31604:2f66104dab0c
merge of '28fe114c65c7f5fa3fdc6a89311c370b76a1c371'
and 'cc913e6ec579f0d81db827c23a13146779b9ca3c'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Thu, 12 May 2011 02:31:25 +0000 |
| parents | 40d60f1c896e (current diff) 0b73619ad581 (diff) |
| children | d034d1acfe03 |
| files | |
| diffstat | 5 files changed, 27 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)