Changeset 6386

Timestamp:

07/01/08 19:20:07 (2 months ago)

Author:

flynd

Message:

Some more uin function usage in email plugin removed.

Location:

trunk/email/src

Files:

• forwarder.cpp (modified) (2 diffs)
• forwarder.h (modified) (1 diff)

trunk/email/src/forwarder.cpp

@@ -102 +102 @@
     case FORWARD_ICQ:
       conf.SetSection("ICQ");
-      conf.ReadNum("Uin", m_nUINTo, 0);
-      if (m_nUINTo == 0)
+      conf.ReadStr("Uin", myUserId, "");
+      if (myUserId[0] == '\0')
       {
-        gLog.Error("%sInvalid ICQ forward UIN: %ld\n", L_FORWARDxSTR, m_nUINTo);
+        gLog.Error("%sInvalid ICQ forward UIN: %s\n", L_FORWARDxSTR, myUserId);
         return 1;
       }
@@ -342 +342 @@
   sprintf(szText, "[ %s from %s (%s) sent %s ]\n\n%s\n", e->Description(),
           u->GetAlias(), u->IdString(), szTime, e->Text());
-  unsigned long tag = licqDaemon->icqSendMessage(m_nUINTo, szText, false, ICQ_TCPxMSG_NORMAL);
+  unsigned long tag = licqDaemon->icqSendMessage(myUserId, szText, false, ICQ_TCPxMSG_NORMAL);
   delete []szText;
   if (tag == 0)
   {
-    gLog.Warn("%sSending message to %ld failed.\n", L_FORWARDxSTR, m_nUINTo);
-    return false;
-  }
-  gLog.Info("%sForwarded message from %s (%s) to %ld.\n", L_FORWARDxSTR, u->GetAlias(), u->IdString(), m_nUINTo);
+    gLog.Warn("%sSending message to %s failed.\n", L_FORWARDxSTR, myUserId);
+    return false;
+  }
+  gLog.Info("%sForwarded message from %s (%s) to %s.\n", L_FORWARDxSTR, u->GetAlias(), u->IdString(), myUserId);
   return true;
 }

trunk/email/src/forwarder.h

@@ -33 +33 @@
   char m_szSMTPHost[256], m_szSMTPTo[256], m_szSMTPFrom[256],
        m_szSMTPDomain[256];
-  unsigned long m_nUINTo;
+  char myUserId[16];
   unsigned short m_nForwardType;