Changeset 4081 for trunk/rms

Timestamp:

04/20/05 22:20:58 (4 years ago)

Author:

emostar

Message:

Add some support for the multi-protocol features now. Doesn't work with MSN yet, but we can use it with AIM users now.

Location:

trunk/rms/src

Files:

• rms.cpp (modified) (7 diffs)
• rms.h (modified) (1 diff)

trunk/rms/src/rms.cpp

@@ -829 +829 @@
   if (*data_arg == '\0')
   {
-    strcpy(format, "%9u %-20a %3m %s");
+    strcpy(format, "%u %-20a %3m %s");
   }
   else
@@ -871 +871 @@
 int CRMSClient::Process_MESSAGE()
 {
-  unsigned long nUin = strtoul(data_arg, (char**)NULL, 10);
-
-  if (nUin < 10000)
-  {
-    fprintf(fs, "%d Invalid UIN.\n", CODE_INVALIDxUSER);
-    return fflush(fs);
-  }
+//  unsigned long nUin = strtoul(data_arg, (char**)NULL, 10);
+
+//  if (nUin < 10000)
+//  {
+//    fprintf(fs, "%d Invalid UIN.\n", CODE_INVALIDxUSER);
+//    return fflush(fs);
+//  }
 
   fprintf(fs, "%d Enter message, terminate with a . on a line by itself:\n",
      CODE_ENTERxTEXT);
 
-  m_nUin = nUin;
+//  m_nUin = nUin;
+  m_szId = strdup(data_arg);
   m_szText[0] = '\0';
   m_nTextPos = 0;
@@ -892 +893 @@
 int CRMSClient::Process_MESSAGE_text()
 {
-  unsigned long tag = licqDaemon->icqSendMessage(m_nUin, m_szText, false, ICQ_TCPxMSG_NORMAL);
-
-  fprintf(fs, "%d [%ld] Sending message to %ld.\n", CODE_COMMANDxSTART,
-     tag, m_nUin);
+  unsigned long tag = licqDaemon->icqSendMessage(m_szId, m_szText, false, ICQ_TCPxMSG_NORMAL);
+
+  fprintf(fs, "%d [%ld] Sending message to %s.\n", CODE_COMMANDxSTART,
+     tag, m_szId);
 
   tags.push_back(tag);
@@ -1143 +1144 @@
 {
   unsigned long nUin = 0;
+  char *szId = 0;
 
   if (*data_arg != '\0')
   {
     nUin = strtoul(data_arg, (char**)NULL, 10);
+    szId = strdup(data_arg);
   }
   else
@@ -1156 +1159 @@
     {
       if(pUser->NewMessages() > 0)
-        nUin = pUser->Uin();
+        szId = strdup(pUser->IdString());
     }
     FOR_EACH_USER_END
   
-    if (nUin == 0)
+    if (szId == 0)
     {
       fprintf(fs, "%d No new messages.\n", CODE_VIEWxNONE);
@@ -1167 +1170 @@
   }
 
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+  ICQUser *u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_W);
   if (u == NULL)
   {
@@ -1231 +1234 @@
   gUserManager.DropUser(u);
 
+  if (szId) free(szId);
   return fflush(fs);
 }

trunk/rms/src/rms.h

@@ -96 +96 @@
 
   unsigned long m_nUin;
+  char *m_szId;
   char m_szText[MAX_TEXT_LENGTH + 1];
   char m_szLine[MAX_LINE_LENGTH + 1];