Mercurial > pidgin
changeset 24312:70864c55e233
merge of '7bdc0d34e54e09101ba68ba39703a8fd5081e8eb'
and 'f90bd2f7c04cab9a0e5f233cde616d836b5bcc71'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 28 Oct 2008 02:57:25 +0000 |
| parents | 2a4f96dc074e (diff) 36cf0a8d0ae2 (current diff) |
| children | 4490b3002b89 |
| files | |
| diffstat | 3 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Mon Oct 27 01:47:30 2008 +0000 +++ b/Makefile.am Tue Oct 28 02:57:25 2008 +0000 @@ -34,6 +34,13 @@ # We don't want to release development versions. test x`echo $(PACKAGE_VERSION) | grep dev` = x +# Make sure there is a NEWS entry for this version + head NEWS | grep "^$(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" > /dev/null + +# Ensure NEWS has no spaces at the start of a line. +# Using spaces instead of tabs there is a common mistake. + test x`grep "^ " NEWS` = x + # When doing a new minor (or major) release (X.Y.0), there must be a section in # ChangeLog.API. echo $(PACKAGE_VERSION) | grep -v "^[0-9]\+\.[0-9]\+\.0$$" >/dev/null || head ChangeLog.API | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
--- a/NEWS Mon Oct 27 01:47:30 2008 +0000 +++ b/NEWS Tue Oct 28 02:57:25 2008 +0000 @@ -1,12 +1,5 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -For up-to-date news, information, and sports, visit: http://planet.pidgin.im - - -=============================================================================== -= OLD NEWS = -=============================================================================== - 2.5.2 (10/19/2008): Ethan: After a bit of a struggle with our services, which put this release off for an unfortunate length of time, we're
--- a/libpurple/server.c Mon Oct 27 01:47:30 2008 +0000 +++ b/libpurple/server.c Tue Oct 28 02:57:25 2008 +0000 @@ -261,14 +261,18 @@ conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account); if(conv != NULL && alias != NULL && strcmp(alias, who)) { + char *escaped = g_markup_escape_text(who, -1); + char *escaped2 = g_markup_escape_text(alias, -1); char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), - who, alias); + escaped, escaped2); purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, time(NULL)); g_free(tmp); + g_free(escaped2); + g_free(escaped); } } }