Changeset 6196 for trunk/licq/src/icqd-srv.cpp

Timestamp:

05/18/08 14:18:27 (8 months ago)

Author:

emostar

Message:

Fix an issue with not downloading contacts.

Files:

• trunk/licq/src/icqd-srv.cpp (modified) (4 diffs)

trunk/licq/src/icqd-srv.cpp

@@ -4136 +4136 @@
           CSrvPacketTcp *p = new CPU_GenericFamily(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_ROSTxACK);
           SendEvent_Server(p);
-          break;
+          //This packet had the user list in it, but we didn't ask for it.
+          //Nonetheless, it appears we won't get a second chance for this packet, so process it
+          //break;
         }
 
@@ -4201 +4203 @@
               AddUserToList(szId, LICQ_PPID, false); // Don't notify server
             }
-
-            char *szUnicodeAlias = szNewName ? strdup(szNewName) : 0;
 
             ICQUser *u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_W);
@@ -4220 +4220 @@
 
               if (szNewName)
-              {
-                if (szUnicodeAlias)
-                {
-                  u->SetAlias(szUnicodeAlias);
-                }
-              }
+                u->SetAlias(szNewName);
 
               if (szSMSNumber)
@@ -4276 +4271 @@
             {
               gLog.Info(tr("%sAdded %s (%s) to list from server.\n"), L_SRVxSTR,
-                (szUnicodeAlias ? szUnicodeAlias : ""), szId);
+                (szNewName ? szNewName : szId), szId);
             }
 
-            if (szUnicodeAlias)
-              free(szUnicodeAlias);
             if (szNewName)
               delete [] szNewName;