From AlanSung@alansung.dragon2.net  Sat Jan  4 17:36:30 2003
Return-Path: <AlanSung@alansung.dragon2.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6948537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Jan 2003 17:36:30 -0800 (PST)
Received: from alansung.dragon2.net (140-109-226-5.adsl.sinica.edu.tw [140.109.226.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ECD3143EB2
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Jan 2003 17:36:28 -0800 (PST)
	(envelope-from AlanSung@alansung.dragon2.net)
Received: from alansung.dragon2.net (localhost [127.0.0.1])
	by alansung.dragon2.net (8.12.6/8.12.6) with ESMTP id h051aRVU085752;
	Sun, 5 Jan 2003 09:36:29 +0800 (CST)
	(envelope-from AlanSung@alansung.dragon2.net)
Received: (from AlanSung@localhost)
	by alansung.dragon2.net (8.12.6/8.12.6/Submit) id h051aRiU085751;
	Sun, 5 Jan 2003 09:36:27 +0800 (CST)
Message-Id: <200301050136.h051aRiU085751@alansung.dragon2.net>
Date: Sun, 5 Jan 2003 09:36:27 +0800 (CST)
From: Cheng-Lung Sung <AlanSung@alansung.dragon2.net>
Reply-To: Cheng-Lung Sung <clsung@dragon2.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: clsung@dragon2.net
Subject: [PATCH] centericq MSN UTF-8 (fixed UTF-8 nickname)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         46772
>Category:       ports
>Synopsis:       [PATCH] centericq MSN UTF-8 (fixed UTF-8 nickname)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ijliao
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 04 17:40:01 PST 2003
>Closed-Date:    Tue Jan 07 01:43:45 PST 2003
>Last-Modified:  Tue Jan 07 01:43:45 PST 2003
>Originator:     Cheng-Lung Sung <clsung@dragon2.net>
>Release:        FreeBSD 4.7-RELEASE-p2 i386
>Organization:
NCTU CSIE FreeBSD Server
>Environment:
System: FreeBSD AlanSung.dragon2.net 4.7-RELEASE-p2 FreeBSD 4.7-RELEASE-p2 #2: Mon Nov 18 12:12:55 CST 2002 root@AlanSung.dragon2.net:/usr/obj/usr/src/sys/SungSung i386


gnu iconv library needed
>Description:
	centericq 4.9.0 add some new features, but still lacks MSN UTF8
	support, previous patch only fix message converting, this patch
	also fix nickname converting (utf8 -> string)
>How-To-Repeat:
	multibyte character nickname will cause incorrect screen display.
>Fix:


diff -ruN /usr/ports/net/centericq/files/patch-msnhook.cc /tmp/centericq/files/patch-msnhook.cc
--- /usr/ports/net/centericq/files/patch-msnhook.cc	Sat Dec 21 01:15:36 2002
+++ /tmp/centericq/files/patch-msnhook.cc	Sun Jan  5 02:05:04 2003
@@ -1,5 +1,5 @@
 --- src/hooks/msnhook.cc	Fri Dec 13 00:17:12 2002
-+++ src/hooks/msnhook.cc	Wed Dec 18 14:57:02 2002
++++ src/hooks/msnhook.cc	Sun Jan  5 02:02:44 2003
 @@ -29,6 +29,7 @@
  #include "accountmanager.h"
  #include "eventmanager.h"
@@ -18,6 +18,20 @@
  
      if(c)
      if(c->getstatus() != offline || !c->inlist()) {
+@@ -352,11 +354,11 @@
+ 
+ void msnhook::checkfriendly(icqcontact *c, const string friendlynick, bool forcefetch) {
+     string oldnick = c->getnick();
+-    string newnick = unmime(friendlynick);
++    string newnick = Utf8ToStr(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();
+     }
 @@ -556,7 +558,8 @@
  
      mhook.checkinlist(ic);

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->ijliao 
Responsible-Changed-By: obraun 
Responsible-Changed-When: Sun Jan 5 00:08:11 PST 2003 
Responsible-Changed-Why:  
Over to maintainer(s) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46772 
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Tue Jan 7 01:43:20 PST 2003 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46772 
>Unformatted:
