[gentoo-commits] gentoo-x86 commit in net-im/pidgin/files: pidgin-2.7.4-bonjour-crash.patch pidgin-2.7.4-icq-html-regression.patch pidgin-2.7.4-missing-break-bug-12810.patch pidgin-2.7.4-icq-authorization-empty-nick.patch

[Peter Volkov (pva)]

pva         10/10/29 09:59:46

  Added:                pidgin-2.7.4-bonjour-crash.patch
                        pidgin-2.7.4-icq-html-regression.patch
                        pidgin-2.7.4-missing-break-bug-12810.patch
                        pidgin-2.7.4-icq-authorization-empty-nick.patch
  Log:
  Backport upstream patches to fix ICQ regressions (e.g. bug #342779 thank Phil Stracchino for report) and crashes.
  
  (Portage version: 2.1.9.22/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-im/pidgin/files/pidgin-2.7.4-bonjour-crash.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.7.4-bonjour-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.7.4-bonjour-crash.patch?rev=1.1&content-type=text/plain

Index: pidgin-2.7.4-bonjour-crash.patch
===================================================================
http://developer.pidgin.im/viewmtn/revision/info/82e935b340047646fa99de444cd143a4523928cc

Fix crash when attempting to log into a bonjour account and init failed

#
#
# patch "libpurple/protocols/bonjour/bonjour.c"
#  from [9f373f1963c40837750948ec0b072e6eb1abb608]
#    to [e0955c7f0b8020ffa9848c290b42f88f981a3572]
#
============================================================
--- libpurple/protocols/bonjour/bonjour.c	9f373f1963c40837750948ec0b072e6eb1abb608
+++ libpurple/protocols/bonjour/bonjour.c	e0955c7f0b8020ffa9848c290b42f88f981a3572
@@ -189,7 +189,8 @@ bonjour_close(PurpleConnection *connecti
 		purple_xfer_cancel_local(bd->xfer_lists->data);
 	}
 
-	g_free(bd->jid);
+	if (bd != NULL)
+		g_free(bd->jid);
 	g_free(bd);
 	connection->proto_data = NULL;
 }



1.1                  net-im/pidgin/files/pidgin-2.7.4-icq-html-regression.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.7.4-icq-html-regression.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.7.4-icq-html-regression.patch?rev=1.1&content-type=text/plain

Index: pidgin-2.7.4-icq-html-regression.patch
===================================================================
http://theflamingbanker.blogspot.com/2010/10/death-of-thousand-tickets.html
http://bugs.gentoo.org/show_bug.cgi?id=342779

#
#
# patch "libpurple/protocols/oscar/family_chat.c"
#  from [9b3ad3b5c68ab5d3f33b0b856fdeaf898a5ed9a9]
#    to [397a3d8572c9863216cc7b37d26858f34a1583ab]
#
============================================================
--- libpurple/protocols/oscar/family_chat.c	9b3ad3b5c68ab5d3f33b0b856fdeaf898a5ed9a9
+++ libpurple/protocols/oscar/family_chat.c	397a3d8572c9863216cc7b37d26858f34a1583ab
@@ -88,6 +88,8 @@ infoupdate(OscarData *od, FlapConnection
 		return 1;
 	}
 
+	byte_stream_get16(bs); // skip the TLV count
+
 	/*
 	 * Everything else are TLVs.
 	 */



1.1                  net-im/pidgin/files/pidgin-2.7.4-missing-break-bug-12810.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.7.4-missing-break-bug-12810.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.7.4-missing-break-bug-12810.patch?rev=1.1&content-type=text/plain

Index: pidgin-2.7.4-missing-break-bug-12810.patch
===================================================================
http://developer.pidgin.im/viewmtn/revision/info/7d1c9a75673aed36deaeca9e96975462a68e2dcd

There seems to be a missing break here. I noticed it in the log, but
probably not related. Refs #12810.

#
#
# patch "pidgin/minidialog.c"
#  from [0ff3f39351172aebcd5504f3915242777b6d05cd]
#    to [2e29d56ddb428c86d1e4ee9854fd56b0925b948c]
#
============================================================
--- pidgin/minidialog.c	0ff3f39351172aebcd5504f3915242777b6d05cd
+++ pidgin/minidialog.c	2e29d56ddb428c86d1e4ee9854fd56b0925b948c
@@ -332,6 +332,7 @@ pidgin_mini_dialog_set_property(GObject 
 			break;
 		case PROP_CUSTOM_ICON:
 			gtk_image_set_from_pixbuf(priv->icon, g_value_get_object(value));
+			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 	}



1.1                  net-im/pidgin/files/pidgin-2.7.4-icq-authorization-empty-nick.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.7.4-icq-authorization-empty-nick.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.7.4-icq-authorization-empty-nick.patch?rev=1.1&content-type=text/plain

Index: pidgin-2.7.4-icq-authorization-empty-nick.patch
===================================================================
http://developer.pidgin.im/viewmtn/revision/info/b4c65c273f2934560d9e643a124b31ac2d2328f2

We should always display the "Authorize buddy?" mini-dialog, even
if the buddy doesn't have a non-empty nickname. Fixes #12810.
Also, why the hell did gotalias() return int? That should be void.

#
#
# patch "libpurple/protocols/oscar/family_icq.c"
#  from [6e79de6d0d602cb32962d5a6eb9884d41ecf4d2a]
#    to [da2f91e3871e683861698a416bb17e6f4fc7eca1]
# 
# patch "pidgin/gtkaccount.c"
#  from [67355ddf08aa04ea8bc82450a9b0276a03937981]
#    to [c6c6f42af0d54071a143aeab36b4165866907064]
#
============================================================
--- libpurple/protocols/oscar/family_icq.c	6e79de6d0d602cb32962d5a6eb9884d41ecf4d2a
+++ libpurple/protocols/oscar/family_icq.c	da2f91e3871e683861698a416bb17e6f4fc7eca1
@@ -408,27 +408,27 @@ int aim_icq_sendsms(OscarData *od, const
 	return 0;
 }
 
-static int
+static void
 gotalias(OscarData *od, struct aim_icq_info *info)
 {
 	PurpleConnection *gc = od->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
-	gchar who[16], *utf8;
 	PurpleBuddy *b;
+	gchar *utf8 = oscar_utf8_try_convert(account, od, info->nick);
 
-	if (info->nick[0] && (utf8 = oscar_utf8_try_convert(account, od, info->nick))) {
-		if (info->for_auth_request) {
-			oscar_auth_recvrequest(gc, g_strdup_printf("%u", info->uin), utf8, info->auth_request_reason);
-		} else {
+	if (info->for_auth_request) {
+		oscar_auth_recvrequest(gc, g_strdup_printf("%u", info->uin), utf8, info->auth_request_reason);
+	} else {
+		if (utf8 && *utf8) {
+			gchar who[16];
 			g_snprintf(who, sizeof(who), "%u", info->uin);
 			serv_got_alias(gc, who, utf8);
 			if ((b = purple_find_buddy(account, who))) {
 				purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", utf8);
 			}
-			g_free(utf8);
 		}
+		g_free(utf8);
 	}
-	return 1;
 }
 
 /**
============================================================
--- pidgin/gtkaccount.c	67355ddf08aa04ea8bc82450a9b0276a03937981
+++ pidgin/gtkaccount.c	c6c6f42af0d54071a143aeab36b4165866907064
@@ -2468,6 +2468,7 @@ pidgin_accounts_request_authorization(Pu
 	GtkWidget *alert;
 	GdkPixbuf *prpl_icon;
 	struct auth_request *aa;
+	gboolean have_valid_alias = alias && *alias;
 
 	gc = purple_account_get_connection(account);
 	if (message != NULL && *message == '\0')
@@ -2475,9 +2476,9 @@ pidgin_accounts_request_authorization(Pu
 
 	buffer = g_strdup_printf(_("%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"),
 				remote_user,
-				(alias != NULL ? " ("  : ""),
-				(alias != NULL ? alias : ""),
-				(alias != NULL ? ")"   : ""),
+				(have_valid_alias ? " ("  : ""),
+				(have_valid_alias ? alias : ""),
+				(have_valid_alias ? ")"   : ""),
 				(id != NULL
 				? id
 				: (purple_connection_get_display_name(gc) != NULL