rpms/gaim/FC-5 gaim-1.5.0-msn-block-crash.patch, NONE, 1.1 gaim.spec, 1.114, 1.115

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16395

Modified Files:
	gaim.spec 
Added Files:
	gaim-1.5.0-msn-block-crash.patch 
Log Message:
MSN block crash (#185222 Stu Tomlinson)


gaim-1.5.0-msn-block-crash.patch:
 privacy.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.5.0-msn-block-crash.patch ---
===================================================================
RCS file: /cvsroot/gaim/gaim/src/privacy.c,v
retrieving revision 1.16
retrieving revision 1.18
diff -u -r1.16 -r1.18
--- gaim/gaim/src/privacy.c	2005/07/17 23:36:33	1.16
+++ gaim/gaim/src/privacy.c	2006/02/07 02:49:56	1.18
@@ -85,8 +85,8 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->permit = g_slist_remove(account->permit, l->data);
 	g_free(l->data);
+	account->permit = g_slist_delete_link(account->permit, l);
 
 	if (!local_only && gaim_account_is_connected(account))
 		serv_rem_permit(gaim_account_get_connection(account), who);
@@ -156,15 +156,16 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->deny = g_slist_remove(account->deny, l->data);
-	g_free(l->data);
+	name = l->data;
+	account->deny = g_slist_delete_link(account->deny, l);
 
 	if (!local_only && gaim_account_is_connected(account))
-		serv_rem_deny(gaim_account_get_connection(account), who);
+		serv_rem_deny(gaim_account_get_connection(account), name);
 
 	if (privacy_ops != NULL && privacy_ops->deny_removed != NULL)
-		privacy_ops->deny_removed(account, who);
+		privacy_ops->deny_removed(account, name);
 
+	g_free(name);
 	gaim_blist_schedule_save();
 
 	return TRUE;


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-5/gaim.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gaim.spec	11 Feb 2006 02:47:22 -0000	1.114
+++ gaim.spec	9 Apr 2006 00:58:42 -0000	1.115
@@ -1,3 +1,5 @@
+ExclusiveArch: i386
+
 # OPTION: perl integration (FC1+)
 %define perl_integration	1
 # OPTION: krb5 for Zephyr protocol (FC1+)
@@ -13,7 +15,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:        15.fc5.1
+Release:        16.fc5
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -69,6 +71,7 @@
 Patch180: gaim-1.5.0-aim-rate-limiting.patch
 Patch181: gaim-1.5.0-nss-detect.patch
 Patch182: gaim-1.5.0-logging-compatibility.patch
+Patch183: gaim-1.5.0-msn-block-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -161,6 +164,7 @@
 %patch180 -p2
 %patch181 -p1
 %patch182 -p0
+%patch183 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -275,6 +279,9 @@
 %endif
 
 %changelog
+* Sat Apr 08 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-16
+- MSN block crash (#185222 Stu Tomlinson)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-15.fc5.1
 - bump again for double-long bug on ppc(64)