[prev in list] [next in list] [prev in thread] [next in thread] 

List:       licq-cvs
Subject:    [Licq-cvs] r4372 - trunk/licq/src
From:       emostar () users ! sourceforge ! net
Date:       2006-02-14 2:45:33
Message-ID: 20060214024533.14753.qmail () mail ! thejon ! org
[Download RAW message or body]

Author: emostar
Date: 2006-02-14 11:45:33 +0900 (Tue, 14 Feb 2006)
New Revision: 4372

Modified:
   trunk/licq/src/icqd-srv.cpp
Log:
Fix bug 1408915 - Users shown as invisible after attempting to update an offline
 user's picture.
Don't call this function anymore.. seems to just spin cpu cycles and do nothing.
let me know if this causes some roblems, i've been running it locally for awhile
 w/o any issues.


Modified: trunk/licq/src/icqd-srv.cpp
===================================================================
--- trunk/licq/src/icqd-srv.cpp	2006-01-17 22:18:36 UTC (rev 4371)
+++ trunk/licq/src/icqd-srv.cpp	2006-02-14 02:45:33 UTC (rev 4372)
@@ -2903,21 +2903,7 @@
     unsigned short err = packet.UnpackUnsignedShortBE();
 
     ICQEvent *e = DoneServerEvent(nSubSequence, EVENT_ERROR);
-    
-    bool bHandled = false;
-    if (e && e->SNAC() == MAKESNAC(ICQ_SNACxFAM_MESSAGE, ICQ_SNACxMSG_SENDxSERVER))
-    {
-      bHandled = true;
-      ICQUser *u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
-      if (u->StatusOffline())
-      {
-        gLog.Info(tr("%s%s (%s) is Invisible.\n"), L_SRVxSTR, u->GetAlias(), u->IdString());
-        u->SetOnlineSince(time(NULL));
-        ChangeUserStatus(u, ICQ_STATUS_ONLINE | ICQ_STATUS_FxPRIVATE);
-      }
-      gUserManager.DropUser(u);
-    }
-    
+
     switch (err)
     {
     case 0x0004:
@@ -2927,8 +2913,7 @@
       gLog.Warn(tr("%sClient does not understand type-2 messages.\n"), L_WARNxSTR);
       break;
     case 0x000e:
-      if (!bHandled)
-        gLog.Warn(tr("%sPacket was malformed.\n"), L_WARNxSTR);
+      gLog.Warn(tr("%sPacket was malformed.\n"), L_WARNxSTR);
       break;
     case 0x0015:
       gLog.Info(tr("%sList overflow.\n"), L_WARNxSTR);
@@ -4117,11 +4102,14 @@
                 gUserManager.RenameGroup(nGroup, szUnicodeName, false);
               }
               
-              if (gUserManager.UpdateUsersInGroups())
-              {
-                PushPluginSignal(new CICQSignal(SIGNAL_UPDATExLIST,
-                  LIST_ALL, 0));
-              }
+              // This is bad, i don't think we want to call this at all..
+              // it will add users to different groups that they werent even
+              // assigned to
+              //if (gUserManager.UpdateUsersInGroups())
+              //{
+              //  PushPluginSignal(new CICQSignal(SIGNAL_UPDATExLIST,
+              //    LIST_ALL, 0));
+              //}
             }
             break;
           }



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Licq-cvs mailing list
Licq-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/licq-cvs
[prev in list] [next in list] [prev in thread] [next in thread]