rpms/pidgin/devel pidgin-2.3.0-msn-dispname.patch, NONE, 1.1 pidgin.spec, 1.41, 1.42

[Stu Tomlinson (nosnilmot)]

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15515/devel

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.3.0-msn-dispname.patch 
Log Message:
- Fix MSN local display name bug


pidgin-2.3.0-msn-dispname.patch:

--- NEW FILE pidgin-2.3.0-msn-dispname.patch ---
-----------------------------------------------------------------
Revision: b576470ab9bee5e0b1c48de1e78e3e6234254cdb
Ancestor: c55dabf731ea4d3fcb287e43b157062eb2d425fa
Author: nosnilmot at pidgin.im
Date: 2007-11-26T22:22:04
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msnp9/notification.c

ChangeLog: 

Don't update our local display name when we get a response from the server
when we store buddies' friendly names on the server. Fixes #4062.

For other people who encounter this issue with Pidgin 2.3.0 I suggest you
set an Alias for your account, your own friendly name is *not* being set to
random things - this is a purely local display issue.

============================================================
--- libpurple/protocols/msnp9/notification.c	dd690580185c00b68db4240fd22732b5e3770c36
+++ libpurple/protocols/msnp9/notification.c	83db9e1346bfbee5a95f55cfe10508d78fdac196
@@ -780,14 +780,27 @@ rea_cmd(MsnCmdProc *cmdproc, MsnCommand 
 static void
 rea_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	/* TODO: This might be for us too */
-
 	MsnSession *session;
+	PurpleAccount *account;
 	PurpleConnection *gc;
 	const char *friendly;
+	char *username;
 
 	session = cmdproc->session;
-	gc = session->account->gc;
+	account = session->account;
+	username = g_strdup(purple_normalize(account,
+						purple_account_get_username(account)));
+
+	/* Only set display name if our *own* friendly name changed! */
+	if (strcmp(username, purple_normalize(account, cmd->params[2])))
+	{
+		g_free(username);
+		return;
+	}
+
+	g_free(username);
+
+	gc = account->gc;
 	friendly = purple_url_decode(cmd->params[3]);
 
 	purple_connection_set_display_name(gc, friendly);


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pidgin.spec	26 Nov 2007 20:55:10 -0000	1.41
+++ pidgin.spec	27 Nov 2007 12:11:43 -0000	1.42
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -59,6 +59,7 @@
 Patch0: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100: pidgin-2.3.0-msn-dispname.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -287,6 +288,7 @@
 %patch0 -p1
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0
 
 # If not using gnome-open, then default to htmlview 
 cp %{SOURCE1} prefs.xml
@@ -496,6 +498,9 @@
 
 
 %changelog
+* Tue Nov 27 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.3.0-1
+- Fix MSN local display name bug
+
 * Mon Nov 26 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.3.0-1
 - 2.3.0