diff options
| author | ijliao <ijliao@FreeBSD.org> | 2003-10-06 15:57:24 +0000 |
|---|---|---|
| committer | ijliao <ijliao@FreeBSD.org> | 2003-10-06 15:57:24 +0000 |
| commit | 43815ee1f1fe18cb62debe03a05dc03f80a799d4 (patch) | |
| tree | 6d84dcf0d2c68aa46349dc3e3c926ab07b214d83 /net-im/centericq/files | |
| parent | 50e51a91ddf0c66d7b12a9605036258f787b8f4a (diff) | |
| download | FreeBSD-ports-43815ee1f1fe18cb62debe03a05dc03f80a799d4.zip FreeBSD-ports-43815ee1f1fe18cb62debe03a05dc03f80a799d4.tar.gz | |
upgrade to 4.9.7
Diffstat (limited to 'net-im/centericq/files')
| -rw-r--r-- | net-im/centericq/files/patch-msnhook.cc | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/net-im/centericq/files/patch-msnhook.cc b/net-im/centericq/files/patch-msnhook.cc index 6ec55a2..a99dce4 100644 --- a/net-im/centericq/files/patch-msnhook.cc +++ b/net-im/centericq/files/patch-msnhook.cc @@ -1,24 +1,16 @@ ---- src/hooks/msnhook.cc.orig Thu May 8 14:42:56 2003 -+++ src/hooks/msnhook.cc Thu May 8 14:47:52 2003 -@@ -30,6 +30,7 @@ - #include "eventmanager.h" - #include "imlogger.h" - #include "connwrap.h" -+#include "utf8conv.h" - - #include "msn_bittybits.h" - -@@ -259,7 +260,8 @@ +--- src/hooks/msnhook.cc.orig Mon Oct 6 01:01:52 2003 ++++ src/hooks/msnhook.cc Mon Oct 6 01:05:37 2003 +@@ -248,7 +248,8 @@ } icqcontact *c = clist.get(ev.getcontact()); -- text = siconv(text, conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET, "utf8"); -+// text = siconv(text, conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET, "utf8"); -+ text = StrToUtf8(text); +- text = siconv(text, conf.getrussian(msn) ? "koi8-u" : conf.getdefcharset(), "utf8"); ++// text = siconv(text, conf.getrussian(msn) ? "koi8-u" : conf.getdefcharset(), "utf8"); ++ text = StrToUtf8(text); if(c) if(c->getstatus() != offline || !c->inlist()) { -@@ -389,11 +391,11 @@ +@@ -378,11 +379,11 @@ void msnhook::checkfriendly(icqcontact *c, const string friendlynick, bool forcefetch) { string oldnick = c->getnick(); @@ -28,21 +20,21 @@ c->setnick(newnick); - if(forcefetch || (oldnick != newnick && c->getdispnick() == oldnick) || oldnick.empty()) { -+ if(forcefetch || (oldnick != newnick && c->getdispnick() != newnick) || oldnick.empty()) { ++ if(forcefetch || (oldnick != newnick && c->getdispnick() != oldnick) || oldnick.empty()) { c->setdispnick(newnick); face.relaxedupdate(); } -@@ -613,7 +615,8 @@ +@@ -602,7 +603,8 @@ mhook.checkinlist(ic); -- string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET); -+// string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET); -+ string text = Utf8ToStr(msg->body); +- string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : conf.getdefcharset()); ++// string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : conf.getdefcharset()); ++ string text = Utf8ToStr(msg->body); em.store(immessage(ic, imevent::incoming, text)); } -@@ -795,3 +798,137 @@ +@@ -779,5 +781,139 @@ log(string("[OUT] ") + buf); } } @@ -180,3 +172,5 @@ + }; +} +#endif /* HAVE_ICONV_H */ + + #endif |
