ports/65056: [maintainer-update] fix cicq msn nickname display problem

[Cheng-Lung Sung]

>Number:         65056
>Category:       ports
>Synopsis:       [maintainer-update] fix cicq msn nickname display problem
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 01 18:30:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Cheng-Lung Sung
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD sungsung.csie.nctu.edu.tw 4.9-RELEASE FreeBSD 4.9-RELEASE #5: Wed Oct 29 20:13:25 CST 2003 root at sungsung.csie.nctu.edu.tw:/usr/obj/usr/src/sys/SUNGSUNG i386

>Description:
	Previous patch didn't fix original MSN nickname display problem
>How-To-Repeat:
	run cicq and get connected to MSN
>Fix:

diff -ruN /usr/ports/net/centericq/Makefile ./centericq/Makefile
--- /usr/ports/net/centericq/Makefile	Wed Mar 31 08:31:46 2004
+++ ./centericq/Makefile	Fri Apr  2 10:26:22 2004
@@ -8,6 +8,7 @@
 
 PORTNAME=	centericq
 PORTVERSION=	4.9.11
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://centericq.de/archive/source/releases/
 
diff -ruN /usr/ports/net/centericq/files/patch-msnhook.cc ./centericq/files/patch-msnhook.cc
--- /usr/ports/net/centericq/files/patch-msnhook.cc	Thu Jan  1 08:00:00 1970
+++ ./centericq/files/patch-msnhook.cc	Fri Apr  2 10:24:01 2004
@@ -0,0 +1,16 @@
+--- src/hooks/msnhook.cc.orig	Sun Mar  7 21:44:41 2004
++++ src/hooks/msnhook.cc	Fri Apr  2 10:23:03 2004
+@@ -408,11 +408,11 @@
+ 
+ void msnhook::checkfriendly(icqcontact *c, const string friendlynick, bool forcefetch) {
+     string oldnick = c->getnick();
+-    string newnick = unmime(friendlynick);
++    string newnick = rusconv("uk",unmime(friendlynick));
+ 
+     c->setnick(newnick);
+ 
+-    if(forcefetch || (oldnick != newnick && c->getdispnick() == oldnick) || oldnick.empty()) {
++    if(forcefetch || (oldnick != newnick && c->getdispnick() != newnick) || oldnick.empty()) {
+ 	c->setdispnick(newnick);
+ 	face.relaxedupdate();
+     }
>Release-Note:
>Audit-Trail:
>Unformatted: