Mercurial > pidgin
changeset 29925:ebe57b897807
merge of '02af4cf0f33f9ec7d46a52cba0e6c4349f0d6e19'
and '787e2678ecb0b07e64cbe6ae055962cd65acaeba'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Thu, 13 May 2010 05:03:30 +0000 |
| parents | 4b3bad9ca939 (diff) c3015cf1dfc0 (current diff) |
| children | 3d8840b96727 |
| files | |
| diffstat | 7 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 13 03:21:36 2010 +0000 +++ b/ChangeLog Thu May 13 05:03:30 2010 +0000 @@ -1,6 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.7.0 (??/??/????): +version 2.7.1 (??/??/????): + +version 2.7.0 (05/12/2010): General: * Changed GTK+ minimum version requirement to 2.10.0. * Changed GLib minimum version requirement to 2.12.0.
--- a/ChangeLog.API Thu May 13 03:21:36 2010 +0000 +++ b/ChangeLog.API Thu May 13 05:03:30 2010 +0000 @@ -1,6 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.7.0 (??/??/????): +version 2.7.1 (??/??/????): + +version 2.7.0 (05/12/2010): libpurple: Added: * Account signals (see account-signals.dox); useful for D-Bus
--- a/ChangeLog.win32 Thu May 13 03:21:36 2010 +0000 +++ b/ChangeLog.win32 Thu May 13 05:03:30 2010 +0000 @@ -1,4 +1,6 @@ -version 2.7.0 (??/??/????): +version 2.7.1 (??/??/????): + +version 2.7.0 (05/12/2010): * Updated GTK+ to 2.16.6 * Private GTK+ Runtime now used (GTK+ Installer no longer supported) * Minimum required GTK+ version increased to 2.14.7
--- a/NEWS Thu May 13 03:21:36 2010 +0000 +++ b/NEWS Thu May 13 05:03:30 2010 +0000 @@ -2,7 +2,7 @@ Our development blog is available at: http://planet.pidgin.im -2.7.0 (05/11/2010): +2.7.0 (05/12/2010): John: We FINALLY got the ICQ X-Status stuff merged in! And a few other patches that have been sitting on Trac forever. Couple that with some new features and we have an excellent release for all of you!
--- a/configure.ac Thu May 13 03:21:36 2010 +0000 +++ b/configure.ac Thu May 13 05:03:30 2010 +0000 @@ -46,7 +46,7 @@ m4_define([purple_lt_current], [7]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [7]) -m4_define([purple_micro_version], [0]) +m4_define([purple_micro_version], [1]) m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) @@ -55,7 +55,7 @@ m4_define([gnt_lt_current], [7]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [7]) -m4_define([gnt_micro_version], [0]) +m4_define([gnt_micro_version], [1]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version])
--- a/libpurple/protocols/msn/slp.c Thu May 13 03:21:36 2010 +0000 +++ b/libpurple/protocols/msn/slp.c Thu May 13 05:03:30 2010 +0000 @@ -938,6 +938,8 @@ conv = swboard->conv; body = msn_message_get_bin_data(msg, &body_len); + if (!body || !body_len) + return; body_str = g_strndup(body, body_len); /* MSN Messenger 7 may send more than one MSNObject in a single message...
--- a/po/ChangeLog Thu May 13 03:21:36 2010 +0000 +++ b/po/ChangeLog Thu May 13 05:03:30 2010 +0000 @@ -1,5 +1,7 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.7.1 + version 2.7.0 * Afrikaans translation updated (Friedel Wolff) * Albanian translation updated (Besnik Bleta)