Changeset 6361 for trunk/console

Timestamp:

06/27/08 16:40:20 (5 months ago)

Author:

flynd

Message:

Some more uin functions in console plugin changed.

Location:

trunk/console/src

Files:

• console.cpp (modified) (3 diffs)
• console_menu.cpp (modified) (1 diff)

trunk/console/src/console.cpp

@@ -550 +550 @@
     break;
   case SIGNAL_ADDxSERVERxLIST:
-    licqDaemon->icqRenameUser(s->Uin());
+    licqDaemon->icqRenameUser(s->Id());
     break;
   case SIGNAL_NEWxPROTO_PLUGIN:
@@ -3222 +3222 @@
                      u->GetAlias());
     gUserManager.DropUser(u);
-    char *p;
-    unsigned long uin = strtoul(szId, &p,10);
-    if( (p == 0 || (p && !*p)) && nPPID == LICQ_PPID )
-      winMain->event = licqDaemon->icqOpenSecureChannel(uin);
+    if (nPPID == LICQ_PPID )
+      winMain->event = licqDaemon->icqOpenSecureChannel(szId);
   }
   else if(strcasecmp(szStatus, "close") == 0)
@@ -3232 +3230 @@
                      u->GetAlias());
     gUserManager.DropUser(u);
-    char *p;
-    unsigned long uin = strtoul(szId, &p,10);
-    if( (p == 0 || (p && !*p)) && nPPID == LICQ_PPID )
-      winMain->event = licqDaemon->icqCloseSecureChannel(uin);
+    if (nPPID == LICQ_PPID )
+      winMain->event = licqDaemon->icqCloseSecureChannel(szId);
   }
   else

trunk/console/src/console_menu.cpp

@@ -447 +447 @@
   if (bAlert)
   {
-    int nUin = atol(szArg);
-    licqDaemon->icqAlertUser(nUin);
-    winMain->wprintf("%C%AAlerted user %ld they were added.\n",
-                     m_cColorInfo->nColor, m_cColorInfo->nAttr,
-                     nUin);
+    licqDaemon->icqAlertUser(szArg, LICQ_PPID);
+    winMain->wprintf("%C%AAlerted user %s they were added.\n",
+        m_cColorInfo->nColor, m_cColorInfo->nAttr, szArg);
   }