changeset 25228:e4f8641cc62c

propagate from branch 'im.pidgin.pidgin' (head 3712dc87ef9c46da0dc5283a8d5a571d9a90d340) to branch 'im.pidgin.cpw.malu.xmpp.ibb_ft' (head b428e6c19e3b9052d50a72860e959efb3ec351c1)

--- a/ChangeLog	Sun Oct 19 14:29:37 2008 +0000
+++ b/ChangeLog	Mon Oct 20 18:30:55 2008 +0000
@@ -1,5 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.5.3 (??/??/????):
+
 version 2.5.2 (10/19/2008):
 	libpurple:
 	* Fixed a crash on removing a custom buddy icon on a buddy.

--- a/ChangeLog.win32	Sun Oct 19 14:29:37 2008 +0000
+++ b/ChangeLog.win32	Mon Oct 20 18:30:55 2008 +0000
@@ -1,5 +1,6 @@
 version 2.5.2 (10/19/2008):
-	* No changes
+	* Updated GTK+ to 2.12.12
+	  This will resolve an issue with stuff in QQ appearing as "(NULL)"
 
 version 2.5.1 (08/30/2008):
 	* No changes

--- a/configure.ac	Sun Oct 19 14:29:37 2008 +0000
+++ b/configure.ac	Mon Oct 20 18:30:55 2008 +0000
@@ -46,8 +46,8 @@
 m4_define([purple_lt_current], [5])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [5])
-m4_define([purple_micro_version], [2])
-m4_define([purple_version_suffix], [])
+m4_define([purple_micro_version], [3])
+m4_define([purple_version_suffix], [devel])
 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]))
@@ -55,8 +55,8 @@
 m4_define([gnt_lt_current], [5])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [5])
-m4_define([gnt_micro_version], [2])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_micro_version], [3])
+m4_define([gnt_version_suffix], [devel])
 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/libpurple/certificate.c	Sun Oct 19 14:29:37 2008 +0000
+++ b/libpurple/certificate.c	Mon Oct 20 18:30:55 2008 +0000
@@ -137,17 +137,17 @@
 GList *
 purple_certificate_copy_list(GList *crt_list)
 {
-	GList *new, *l;
+	GList *new_l, *l;
 
 	/* First, make a shallow copy of the list */
-	new = g_list_copy(crt_list);
+	new_l = g_list_copy(crt_list);
 
 	/* Now go through and actually duplicate each certificate */
-	for (l = new; l; l = l->next) {
+	for (l = new_l; l; l = l->next) {
 		l->data = purple_certificate_copy(l->data);
 	}
 
-	return new;
+	return new_l;
 }
 
 void
@@ -1897,10 +1897,13 @@
 
 	/* Make messages */
 	secondary = g_strdup_printf(_("Common name: %s\n\n"
-				      "Fingerprint (SHA1): %s\n\n"
-				      "Activation date: %s\n"
-				      "Expiration date: %s\n"),
-				    cn, sha_asc, activ_str, expir_str);
+								  "Fingerprint (SHA1): %s\n\n"
+								  "Activation date: %s\n"
+								  "Expiration date: %s\n"),
+								cn ? cn : "(null)",
+								sha_asc ? sha_asc : "(null)",
+								activ_str ? activ_str : "(null)",
+								expir_str ? expir_str : "(null)");
 
 	/* Make a semi-pretty display */
 	purple_notify_info(