From db048125fb41c826319a747a98becfe89851dfa5 Mon Sep 17 00:00:00 2001
From: Stu Tomlinson <nosnilmot@fedoraproject.org>
Date: Nov 27 2007 12:11:43 +0000
Subject: - Fix MSN local display name bug


---

diff --git a/pidgin-2.3.0-msn-dispname.patch b/pidgin-2.3.0-msn-dispname.patch
new file mode 100644
index 0000000..26546de
--- /dev/null
+++ b/pidgin-2.3.0-msn-dispname.patch
@@ -0,0 +1,53 @@
+-----------------------------------------------------------------
+Revision: b576470ab9bee5e0b1c48de1e78e3e6234254cdb
+Ancestor: c55dabf731ea4d3fcb287e43b157062eb2d425fa
+Author: nosnilmot@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);
diff --git a/pidgin.spec b/pidgin.spec
index 0f7746b..31c8db6 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -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 @@ Source1:	purple-fedora-prefs.xml
 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 @@ and plugins.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 27 2007 Stu Tomlinson <stu@nosnilmot.com> - 2.3.0-1
+- Fix MSN local display name bug
+
 * Mon Nov 26 2007 Stu Tomlinson <stu@nosnilmot.com> - 2.3.0-1
 - 2.3.0