rpms/gaim/FC-3 gaim-1.4.0-aim-login.crash.patch, NONE, 1.1 gaim-1.4.0-msn-space-username-disconnect.patch, NONE, 1.1 gaim.spec, 1.61, 1.62

[fedora-cvs-commits at redhat.com]

Author: wtogami

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

Modified Files:
	gaim.spec 
Added Files:
	gaim-1.4.0-aim-login.crash.patch 
	gaim-1.4.0-msn-space-username-disconnect.patch 
Log Message:
auto-import gaim-1.4.0-3.fc3 on branch FC-3 from gaim-1.4.0-3.fc3.src.rpm

gaim-1.4.0-aim-login.crash.patch:
 ssi.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.4.0-aim-login.crash.patch ---
http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/protocols/oscar/ssi.c?r1=1.60.2.1&r2=1.60.2.3&diff_format=u

===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ssi.c,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.3
diff -u -r1.60.2.1 -r1.60.2.3
--- gaim/gaim/src/protocols/oscar/ssi.c	2005/06/14 00:24:29	1.60.2.1
+++ gaim/gaim/src/protocols/oscar/ssi.c	2005/07/09 18:51:05	1.60.2.3
@@ -671,20 +671,18 @@
 	/* Make sure there aren't any duplicate buddies in a group, or duplicate permits or denies */
 	cur = sess->ssi.local;
 	while (cur) {
-		next = cur->next;
-
 		if ((cur->type == AIM_SSI_TYPE_BUDDY) || (cur->type == AIM_SSI_TYPE_PERMIT) || (cur->type == AIM_SSI_TYPE_DENY))
 		{
 			struct aim_ssi_item *cur2, *next2;
-			cur2 = next;
+			cur2 = cur->next;
 			while (cur2) {
 				next2 = cur2->next;
-				if ((cur->type == cur2->type) && (cur->gid == cur2->gid) && (!strcmp(cur->name, cur2->name)))
+				if ((cur->type == cur2->type) && (cur->gid == cur2->gid) && (cur->name != NULL) && (cur2->name != NULL) && (!strcmp(cur->name, cur2->name)))
 					aim_ssi_itemlist_del(&sess->ssi.local, cur2);
 				cur2 = next2;
 			}
 		}
-		cur = next;
+		cur = cur->next;
 	}
 
 	/* Check if there are empty groups and delete them */

gaim-1.4.0-msn-space-username-disconnect.patch:
 userlist.c |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE gaim-1.4.0-msn-space-username-disconnect.patch ---
http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/protocols/msn/userlist.c?r1=1.16.2.10&r2=1.16.2.11&diff_format=u
Patch #1223021 from Jason Roth (jroth2)
Fixes Bug #1222552

"As described in bug report #1222552, gaim will disconnect the current msn session and corrupt blist.xml when you try to add an msn screenname with a space in it" -- jroth2

I reworked this quite a bit.  Stu suggested using gaim_email_valid() rather than just checking for a space.  I took this advice.  I also made it display an error message instead of silently dropping the add request.

===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/userlist.c,v
retrieving revision 1.16.2.10
retrieving revision 1.16.2.11
diff -u -r1.16.2.10 -r1.16.2.11
--- gaim/gaim/src/protocols/msn/userlist.c	2005/03/17 05:17:04	1.16.2.10
+++ gaim/gaim/src/protocols/msn/userlist.c	2005/07/08 04:16:17	1.16.2.11
@@ -622,6 +622,15 @@
 
 	group_id = -1;
 
+	if (!gaim_email_is_valid(who))
+	{
+		char *str = g_strdup_printf(_("Unable to add \"%s\"."), who);
+		gaim_notify_error(NULL, NULL, str,
+						  _("The screen name specified is invalid."));
+		g_free(str);
+		return;
+	}
+
 	if (group_name != NULL)
 	{
 		group_id = msn_userlist_find_group_id(userlist, group_name);


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-3/gaim.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gaim.spec	8 Jul 2005 08:43:13 -0000	1.61
+++ gaim.spec	12 Jul 2005 00:21:37 -0000	1.62
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.4.0
-Release:	1.fc3
+Release:	3.fc3
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -43,7 +43,8 @@
 Patch6:		gaim-1.0.1-naive-gnome-check.patch
 
 ## Patches 100-199: Upstream CVS Backports
-#Patch147:	gaim-1.2.1-dnd-url-crash.patch
+Patch148:       gaim-1.4.0-aim-login.crash.patch
+Patch149:       gaim-1.4.0-msn-space-username-disconnect.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -109,7 +110,8 @@
 %patch6 -p1
 
 # CVS backports go here
-#%patch147 -p2
+%patch148 -p2
+%patch149 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -199,6 +201,12 @@
 %endif
 
 %changelog
+* Mon Jul 11 2005 Warren Togami <wtogami at redhat.com> 1:1.4.0-3
+- 149: MSN username with space disconnect fix
+
+* Sun Jul 10 2005 Warren Togami <wtogami at redhat.com> 1:1.4.0-2
+- 148: AIM login crash fix
+
 * Thu Jul 07 2005 Warren Togami <wtogami at redhat.com> 1:1.4.0-1
 - 1.4.0