View | Details | Raw Unified | Return to bug 46772
Collapse All | Expand All

(-)/tmp/centericq/files/patch-msnhook.cc (-1 / +15 lines)
Lines 1-5 Link Here
1
--- src/hooks/msnhook.cc	Fri Dec 13 00:17:12 2002
1
--- src/hooks/msnhook.cc	Fri Dec 13 00:17:12 2002
2
+++ src/hooks/msnhook.cc	Wed Dec 18 14:57:02 2002
2
+++ src/hooks/msnhook.cc	Sun Jan  5 02:02:44 2003
3
@@ -29,6 +29,7 @@
3
@@ -29,6 +29,7 @@
4
 #include "accountmanager.h"
4
 #include "accountmanager.h"
5
 #include "eventmanager.h"
5
 #include "eventmanager.h"
Lines 18-23 Link Here
18
 
18
 
19
     if(c)
19
     if(c)
20
     if(c->getstatus() != offline || !c->inlist()) {
20
     if(c->getstatus() != offline || !c->inlist()) {
21
@@ -352,11 +354,11 @@
22
 
23
 void msnhook::checkfriendly(icqcontact *c, const string friendlynick, bool forcefetch) {
24
     string oldnick = c->getnick();
25
-    string newnick = unmime(friendlynick);
26
+    string newnick = Utf8ToStr(unmime(friendlynick));
27
 
28
     c->setnick(newnick);
29
 
30
-    if(forcefetch || (oldnick != newnick && c->getdispnick() == oldnick) || oldnick.empty()) {
31
+    if(forcefetch || (oldnick != newnick && c->getdispnick() != newnick) || oldnick.empty()) {
32
 	c->setdispnick(newnick);
33
 	face.relaxedupdate();
34
     }
21
@@ -556,7 +558,8 @@
35
@@ -556,7 +558,8 @@
22
 
36
 
23
     mhook.checkinlist(ic);
37
     mhook.checkinlist(ic);

Return to bug 46772