From 5684599bf617d22ac9e17688aab91cb671aeb397 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Fri, 2 Apr 2004 03:41:14 +0000 Subject: [PATCH] - Fix MSN nickname display problem PR: ports/65056 Submitted by: Cheng-Lung Sung (maintainer) --- net-im/centericq/Makefile | 1 + net-im/centericq/files/patch-msnhook.cc | 16 ++++++++++++++++ net/centericq/Makefile | 1 + net/centericq/files/patch-msnhook.cc | 16 ++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 net-im/centericq/files/patch-msnhook.cc create mode 100644 net/centericq/files/patch-msnhook.cc diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile index 02d908adb5fb..56e65c7bb716 100644 --- a/net-im/centericq/Makefile +++ b/net-im/centericq/Makefile @@ -8,6 +8,7 @@ PORTNAME= centericq PORTVERSION= 4.9.11 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://centericq.de/archive/source/releases/ diff --git a/net-im/centericq/files/patch-msnhook.cc b/net-im/centericq/files/patch-msnhook.cc new file mode 100644 index 000000000000..0bbda9b195eb --- /dev/null +++ b/net-im/centericq/files/patch-msnhook.cc @@ -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(); + } diff --git a/net/centericq/Makefile b/net/centericq/Makefile index 02d908adb5fb..56e65c7bb716 100644 --- a/net/centericq/Makefile +++ b/net/centericq/Makefile @@ -8,6 +8,7 @@ PORTNAME= centericq PORTVERSION= 4.9.11 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://centericq.de/archive/source/releases/ diff --git a/net/centericq/files/patch-msnhook.cc b/net/centericq/files/patch-msnhook.cc new file mode 100644 index 000000000000..0bbda9b195eb --- /dev/null +++ b/net/centericq/files/patch-msnhook.cc @@ -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(); + }