[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/gaim/devel gaim-1.4.0-msn-space-username-disconnect.patch, NONE, 1.1 gaim.spec, 1.89, 1.90



Author: wtogami

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

Modified Files:
	gaim.spec 
Added Files:
	gaim-1.4.0-msn-space-username-disconnect.patch 
Log Message:
149: MSN username with space disconnect fix


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/devel/gaim.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gaim.spec	11 Jul 2005 09:24:10 -0000	1.89
+++ gaim.spec	11 Jul 2005 22:35:40 -0000	1.90
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.4.0
-Release:	2.fc5
+Release:	3.fc5
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -44,6 +44,7 @@
 
 ## Patches 100-199: Upstream CVS Backports
 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
@@ -110,6 +111,7 @@
 
 # CVS backports go here
 %patch148 -p2
+%patch149 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -199,7 +201,10 @@
 %endif
 
 %changelog
-* Sun Jul 10 2005 Warren Togami <wtogami redhat com  1:1.4.0-2
+* Mon Jul 11 2005 Warren Togami <wtogami redhat com> 1:1.4.0-3
+- 149: MSN username with space disconnect fix
+
+* Sun Jul 10 2005 Warren Togami <wtogami redhat com> 1:1.4.0-2
 - 148: AIM login crash fix
 
 * Thu Jul 07 2005 Warren Togami <wtogami redhat com> 1:1.4.0-1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]