changeset 23068:c59f8dcd5a65

merge of '7de4400bc908601979951f3463a2ba92f322b9ad' and 'bb3484634f9085aae573ddc5c90a9ad2d5c7635d'
author Evan Schoenberg <evan.s@dreskin.net>
date Tue, 01 Jul 2008 23:44:00 +0000
parents 3ea41f885135 (diff) 60f97d40ddab (current diff)
children 0e66def8b25e
files
diffstat 5 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 01 23:21:30 2008 +0000
+++ b/ChangeLog	Tue Jul 01 23:44:00 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.4.3 (??/??/2008):
+version 2.4.3 (07/01/2008):
 	libpurple:
 	* Yahoo! Japan now uses UTF-8, matching the behavior of official clients
 	  and restoring compatibility with the web messenger (Yusuke Odate)
--- a/ChangeLog.win32	Tue Jul 01 23:21:30 2008 +0000
+++ b/ChangeLog.win32	Tue Jul 01 23:44:00 2008 +0000
@@ -1,4 +1,4 @@
-version 2.4.3 (??/??/2008):
+version 2.4.3 (07/01/2008):
 	* No changes
 
 version 2.4.2 (05/17/2008):
--- a/NEWS	Tue Jul 01 23:21:30 2008 +0000
+++ b/NEWS	Tue Jul 01 23:44:00 2008 +0000
@@ -1,6 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-2.4.2 (5/XX/2008):
+2.4.3 (07/01/2008):
+	Richard: This release includes important bug fixes.  I'm just cutting
+	the release.  Thank you to the real heroes who did the fixing!
+
+2.4.2 (5/17/2008):
 	Sadrul: We added some usability changes in this release, including the
 	typing notification, buddyicon and input area size in the conversation
 	windows, escape to close conversation windows etc. These changes should
--- a/configure.ac	Tue Jul 01 23:21:30 2008 +0000
+++ b/configure.ac	Tue Jul 01 23:44:00 2008 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [4])
 m4_define([purple_micro_version], [3])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [4])
 m4_define([gnt_micro_version], [3])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/po/POTFILES.in	Tue Jul 01 23:21:30 2008 +0000
+++ b/po/POTFILES.in	Tue Jul 01 23:44:00 2008 +0000
@@ -143,12 +143,9 @@
 libpurple/protocols/qq/keep_alive.c
 libpurple/protocols/qq/login_logout.c
 libpurple/protocols/qq/qq.c
-libpurple/protocols/qq/qq_proxy.c
-libpurple/protocols/qq/recv_core.c
+libpurple/protocols/qq/qq_network.c
 libpurple/protocols/qq/send_file.c
-libpurple/protocols/qq/sendqueue.c
 libpurple/protocols/qq/sys_msg.c
-libpurple/protocols/qq/udp_proxy_s5.c
 libpurple/protocols/sametime/sametime.c
 libpurple/protocols/silc/buddy.c
 libpurple/protocols/silc/chat.c