Changeset 6405 for trunk/licq/src/history.cpp

Timestamp:

07/03/08 22:13:49 (5 months ago)

Author:

flynd

Message:

More UIN removed.

Files:

• trunk/licq/src/history.cpp (modified) (9 diffs)

trunk/licq/src/history.cpp

@@ -17 +17 @@
 #include <sys/types.h>
 #include <fcntl.h>
+#include <string>
 
 // Localization
@@ -39 +40 @@
 
 #define MAX_HISTORY_MSG_SIZE 8192
+
+using std::string;
 
 CUserHistory::CUserHistory()
@@ -250 +253 @@
     {
       GET_VALID_LINE_OR_BREAK;
-      unsigned long nUin = atol(&szResult[1]);
+        char* id = strdup(&szResult[1]);
       GET_VALID_LINE_OR_BREAK;
       char *szAlias = strdup(&szResult[1]);
@@ -260 +263 @@
       char *szEmail = strdup(&szResult[1]);
       GET_VALID_LINES;
-      e = new CEventAuthRequest(nUin, szAlias, szFName, szLName, szEmail, szMsg,
-                            nCommand, tTime, nFlags);
+        e = new CEventAuthRequest(id, LICQ_PPID, szAlias, szFName, szLName,
+            szEmail, szMsg, nCommand, tTime, nFlags);
+        free(id);
       free(szAlias);
       free(szFName);
@@ -271 +275 @@
     {
       GET_VALID_LINE_OR_BREAK;
-      unsigned long nUin = atol(&szResult[1]);
-      GET_VALID_LINES;
-      e = new CEventAuthGranted(nUin, szMsg, nCommand, tTime, nFlags);
+        char* id = strdup(&szResult[1]);
+      GET_VALID_LINES;
+        e = new CEventAuthGranted(id, LICQ_PPID, szMsg, nCommand, tTime, nFlags);
+        free(id);
       break;
     }
@@ -279 +284 @@
     {
       GET_VALID_LINE_OR_BREAK;
-      unsigned long nUin = atol(&szResult[1]);
-      GET_VALID_LINES;
-      e = new CEventAuthRefused(nUin, szMsg, nCommand, tTime, nFlags);
+        char* id = strdup(&szResult[1]);
+      GET_VALID_LINES;
+        e = new CEventAuthRefused(id, LICQ_PPID, szMsg, nCommand, tTime, nFlags);
+        free(id);
       break;
     }
@@ -287 +293 @@
     {
       GET_VALID_LINE_OR_BREAK;
-      unsigned long nUin = atol(&szResult[1]);
+        char* id = strdup(&szResult[1]);
       GET_VALID_LINE_OR_BREAK;
       char *szAlias = strdup(&szResult[1]);
@@ -296 +302 @@
       GET_VALID_LINE_OR_BREAK;
       char *szEmail = strdup(&szResult[1]);
-      e = new CEventAdded(nUin, szAlias, szFName, szLName, szEmail,
+        e = new CEventAdded(id, LICQ_PPID, szAlias, szFName, szLName, szEmail,
                             nCommand, tTime, nFlags);
+        free(id);
       free(szAlias);
       free(szFName);
@@ -334 +341 @@
       ContactList vc;
       bool b = true;
-      unsigned long nUin = 0;
+      string id;
       while (true)
       {
         GET_VALID_LINE_OR_BREAK;
         if (b)
-          nUin = atol(&szResult[1]);
-        else if (nUin != 0)
-          vc.push_back(new CContact(nUin, &szResult[1]));
+          id = &szResult[1];
+        else if (!id.empty())
+          vc.push_back(new CContact(id.c_str(), LICQ_PPID, &szResult[1]));
         b = !b;
       }