changeset 24709:8d49c8f019d9

merge of '1588a62b7442c86d09ede6244012e7c0eed52478' and 'fb96e8d1db91d871d26f751cc200f9d228f0553d'
author Richard Laager <rlaager@wiktel.com>
date Fri, 12 Dec 2008 17:08:23 +0000
parents 19198eac578b (current diff) c624b5502874 (diff)
children d1d9d085d626 c5fddaf62414
files ChangeLog
diffstat 5 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Dec 12 16:56:20 2008 +0000
+++ b/ChangeLog	Fri Dec 12 17:08:23 2008 +0000
@@ -22,7 +22,7 @@
 	  called before the buddy list is initialized (Florian Quèze)
 	* On MSN, the Games and Office media can now be set and displayed (in
 	  addition to the previous Music media). The Media status text now shows
-	  the album, if possible. 
+	  the album, if possible.
 	* Fix use of av_len in perl bindings to fix some off-by-one bugs (Paul
 	  Aurich)
 	* On ICQ, advertise the ICQ 6 typing capability.  This should fix the
@@ -72,6 +72,7 @@
 	  buddylist.  (Thanks to Casey Ho)
 	* Fix a crash when closing an authorization minidialog with the X then
 	  immediately going offline (Paul Aurich)
+	* Fix compatibility with old GTK+ yet again
 
 	Finch:
 	* Allow binding meta+arrow keys for actions.
--- a/configure.ac	Fri Dec 12 16:56:20 2008 +0000
+++ b/configure.ac	Fri Dec 12 17:08:23 2008 +0000
@@ -1173,6 +1173,8 @@
 			"-Wendif-labels" \
 			"-Werror-implicit-function-declaration" \
 			"-Wextra -Wno-sign-compare -Wno-unused-parameter" \
+			"-Wformat-security" \
+				"-Werror=format-security" \
 			"-Winit-self" \
 			"-Wmissing-declarations" \
 			"-Wmissing-noreturn" \
--- a/libpurple/protocols/bonjour/bonjour.c	Fri Dec 12 16:56:20 2008 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Fri Dec 12 17:08:23 2008 +0000
@@ -376,20 +376,20 @@
 	}
 
 	/* Only show first/last name if there is a nickname set (to avoid duplication) */
-	if (bb->nick != NULL) {
-		if (bb->first != NULL)
+	if (bb->nick != NULL && *bb->nick != '\0') {
+		if (bb->first != NULL && *bb->first != '\0')
 			purple_notify_user_info_add_pair(user_info, _("First name"), bb->first);
-		if (bb->first != NULL)
+		if (bb->last != NULL && *bb->last != '\0')
 			purple_notify_user_info_add_pair(user_info, _("Last name"), bb->last);
 	}
 
-	if (bb->email != NULL)
+	if (bb->email != NULL && *bb->email != '\0')
 		purple_notify_user_info_add_pair(user_info, _("Email"), bb->email);
 
-	if (bb->AIM != NULL)
+	if (bb->AIM != NULL && *bb->AIM != '\0')
 		purple_notify_user_info_add_pair(user_info, _("AIM Account"), bb->AIM);
 
-	if (bb->jid!= NULL)
+	if (bb->jid != NULL && *bb->jid != '\0')
 		purple_notify_user_info_add_pair(user_info, _("XMPP Account"), bb->jid);
 }
 
--- a/libpurple/protocols/bonjour/buddy.c	Fri Dec 12 16:56:20 2008 +0000
+++ b/libpurple/protocols/bonjour/buddy.c	Fri Dec 12 17:08:23 2008 +0000
@@ -161,7 +161,7 @@
 	name = purple_buddy_get_name(buddy);
 
 	/* Create the alias for the buddy using the first and the last name */
-	if (bonjour_buddy->nick)
+	if (bonjour_buddy->nick && *bonjour_buddy->nick)
 		serv_got_alias(purple_account_get_connection(account), name, bonjour_buddy->nick);
 	else {
 		gchar *alias = NULL;
--- a/libpurple/protocols/qq/group_im.c	Fri Dec 12 16:56:20 2008 +0000
+++ b/libpurple/protocols/qq/group_im.c	Fri Dec 12 17:08:23 2008 +0000
@@ -329,6 +329,7 @@
 	return;
 }
 
+#if 0
 static void request_room_send_im_ex(PurpleConnection *gc, guint32 room_id,
 	qq_im_format *fmt, gchar *msg, guint16 msg_id, guint8 frag_count, guint8 frag_index)
 {
@@ -358,6 +359,7 @@
 	/*qq_show_packet("QQ_ROOM_CMD_SEND_IM_EX", raw_data, bytes); */
 	qq_send_room_cmd(gc, QQ_ROOM_CMD_SEND_IM_EX, room_id, raw_data, bytes);
 }
+#endif
 
 /* send a chat msg to a QQ Qun
  * called by purple */