Changeset 3768 for trunk/console

Timestamp:

06/14/04 08:20:17 (4 years ago)

Author:

emostar

Message:

Patch by Philip Nelson <phatfil AT optusnet.com.au> to add initial support for protocol plugins to the console plugin.

Location:

trunk/console/src

Files:

• console.cpp (modified) (45 diffs)
• console.h (modified) (5 diffs)
• console_menu.cpp (modified) (28 diffs)
• console_print.cpp (modified) (5 diffs)
• event_data.h (modified) (10 diffs)
• window.h (modified) (1 diff)

trunk/console/src/console.cpp

@@ -242 +242 @@
   // Register with the daemon, we want to receive all signals
   m_nPipe = _licqDaemon->RegisterPlugin(SIGNAL_ALL);
-  m_bExit = false;
+  m_bExit = false; 
+  _licqDaemon->AddProtocolPlugins();
   licqDaemon = _licqDaemon;
   m_nCurrentGroup = gUserManager.DefaultGroup();
@@ -282 +283 @@
   PrintUsers();
 
-  if (gUserManager.OwnerUin() == 0)
+  if (gUserManager.NumOwners() == 0)
   {
     RegistrationWizard();
@@ -512 +513 @@
   case SIGNAL_UPDATExUSER:
     {
-      if (s->Uin() == gUserManager.OwnerUin() && s->SubSignal() == USER_STATUS
+      if (gUserManager.FindOwner(s->Id(), s->PPID()) != NULL && s->SubSignal() == USER_STATUS
           || s->SubSignal() == USER_EVENTS)
         PrintStatus();
-      ICQUser *u = gUserManager.FetchUser(s->Uin(), LOCK_R);
+      ICQUser *u = gUserManager.FetchUser(s->Id(), s->PPID(), LOCK_R);
       if (u != NULL)
       {
@@ -535 +536 @@
     licqDaemon->icqRenameUser(s->Uin());
     break;
+  case SIGNAL_NEWxPROTO_PLUGIN:
+    //ignore for now
+    break;
+  case SIGNAL_EVENTxID:
+    AddEventTag(s->Id(), s->PPID(), s->Argument());
+    break;
   default:
     gLog.Warn("%sInternal error: CLicqConsole::ProcessSignal(): Unknown signal command received from daemon: %ld.\n",
@@ -543 +550 @@
 }
 
+/*---------------------------------------------------------------------------
+ * CLicqConsole::AddEventTag
+ *-------------------------------------------------------------------------*/
+void CLicqConsole::AddEventTag(char *_szId, unsigned long _nPPID, unsigned long _nEventTag)
+{
+  if (!_szId || !_nPPID || !_nEventTag)
+    return;
+
+  CData *data;
+  unsigned short i;
+  for (i = 1; i <= MAX_CON; i++)
+  {
+    data = (CData *)winCon[i]->data;
+    if (strcmp(data->szId, _szId) == 0 && data->nPPID == _nPPID)
+    {
+      winCon[i]->event = _nEventTag;
+      break;
+    }
+  }
+} 
+    
 
 /*---------------------------------------------------------------------------
@@ -556 +584 @@
   }
 
+  if (e->SNAC() == 0) {
+    // Not from ICQ
+    ProcessDoneEvent(e); //FIXME
+    return;
+  }
+  
   switch (e->SNAC())
   {
@@ -699 +733 @@
   if (win == NULL)
   {
-    gLog.Warn("%sInternal error: CLicqConsole::ProcessEvent(): Unknown event from daemon: %d.\n",
+    gLog.Warn("%sInternal error: CLicqConsole::ProcessDoneEvent(): Unknown event from daemon: %d.\n",
               L_WARNxSTR, e->SubCommand());
     return;
@@ -1424 +1458 @@
  * CLicqConsole::UserCommand_Info
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_Info(unsigned long nUin, char *)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+void CLicqConsole::UserCommand_Info(const char *szId, unsigned long nPPID, char *)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   if (u == NULL)
     return;
@@ -1433 +1467 @@
   winMain->fProcessInput = &CLicqConsole::InputInfo;
   winMain->state = STATE_QUERY;
-  winMain->data = new CData(nUin);
+  winMain->data = new CData(szId, nPPID);
 
   winMain->wprintf("%C%A"
@@ -1441 +1475 @@
                    "(A)bout Info\n"
                    "(U)pdate Info\n"
-                   "for %s (%ld)? %C%Z",
+                   "for %s (%s)? %C%Z",
                    m_cColorQuery->nColor, m_cColorQuery->nAttr,
-                   u->GetAlias(), nUin, COLOR_WHITE, A_BOLD);
+                   u->GetAlias(), szId, COLOR_WHITE, A_BOLD);
   winMain->RefreshWin();
   gUserManager.DropUser(u);
@@ -1465 +1499 @@
     {
     case 'g':
-      PrintInfo_General(data->nUin);
+      PrintInfo_General(data->szId, data->nPPID);
       break;
     case 'm':
-      PrintInfo_More(data->nUin);
+      PrintInfo_More(data->szId, data->nPPID);
       break;
     case 'w':
-      PrintInfo_Work(data->nUin);
+      PrintInfo_Work(data->szId, data->nPPID);
       break;
     case 'a':
-      PrintInfo_About(data->nUin);
+      PrintInfo_About(data->szId, data->nPPID);
       break;
     case 'u':
       winMain->wprintf("%C%AUpdate info...", m_cColorInfo->nColor,
                        m_cColorInfo->nAttr);
-      winMain->event = licqDaemon->icqRequestMetaInfo(data->nUin);
+      winMain->event = licqDaemon->icqRequestMetaInfo(data->szId);
       winMain->state = STATE_PENDING;
       return;
@@ -1511 +1545 @@
  * CLicqConsole::UserCommand_View
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_View(unsigned long nUin, char *)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+void CLicqConsole::UserCommand_View(const char *szId, unsigned long nPPID, char *)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_W);
   if (u == NULL)
     return;
@@ -1543 +1577 @@
     // Do we want to accept the file transfer?
     if (e->SubCommand() == ICQ_CMDxSUB_FILE)
-      FileChatOffer(e->Sequence(), u->Uin());
+      //FIXME
+      //FileChatOffer(e->Sequence(), u->Uin());
 
     delete e;
@@ -1549 +1584 @@
     //PrintUsers();
     //PrintStatus();
-    ProcessSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_EVENTS, nUin));
+    ProcessSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_EVENTS, szId, nPPID));
   }
   else
@@ -1563 +1598 @@
  * CLicqConsole::UserCommand_Remove
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_Remove(unsigned long nUin, char *)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+void CLicqConsole::UserCommand_Remove(const char *szId, unsigned long nPPID, char *)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   if (u == NULL)
     return;
@@ -1572 +1607 @@
   winMain->fProcessInput = &CLicqConsole::InputRemove;
   winMain->state = STATE_QUERY;
-  winMain->data = new CData(nUin);
-
-  winMain->wprintf("%C%ARemove %s (%ld) from contact list (y/N)? %C%Z",
+  winMain->data = new CData(szId, nPPID);
+
+  winMain->wprintf("%C%ARemove %s (%s) from contact list (y/N)? %C%Z",
                    m_cColorQuery->nColor, m_cColorQuery->nAttr,
-                   u->GetAlias(), nUin, COLOR_WHITE, A_BOLD);
+                   u->GetAlias(), szId, COLOR_WHITE, A_BOLD);
   winMain->RefreshWin();
   gUserManager.DropUser(u);
@@ -1598 +1633 @@
     if (strncasecmp(data->szQuery, "yes", strlen(data->szQuery)) == 0)
     {
-      licqDaemon->RemoveUserFromList(data->nUin);
+      licqDaemon->RemoveUserFromList(data->szId, data->nPPID);
       winMain->wprintf("%C%AUser removed.\n", m_cColorInfo->nColor,
                        m_cColorInfo->nAttr);
@@ -1627 +1662 @@
  * CLicqConsole::UserCommand_FetchAutoResponse
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_FetchAutoResponse(unsigned long nUin, char *)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
-  winMain->wprintf("%C%AFetching auto-response for %s (%ld)...",
+void CLicqConsole::UserCommand_FetchAutoResponse(const char *szId, unsigned long nPPID, char *)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
+  winMain->wprintf("%C%AFetching auto-response for %s (%s)...",
                    m_cColorInfo->nColor, m_cColorInfo->nAttr,
-                   u->GetAlias(), nUin);
+                   u->GetAlias(), szId);
   winMain->RefreshWin();
   gUserManager.DropUser(u);
 
-  winMain->event = licqDaemon->icqFetchAutoResponse(nUin);
+  winMain->event = licqDaemon->icqFetchAutoResponse(szId, nPPID);
   // InputMessage just to catch the cancel key
   winMain->fProcessInput = &CLicqConsole::InputMessage;
@@ -1695 +1730 @@
  * CLicqConsole::UserCommand_History
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_History(unsigned long nUin, char *szArg)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+void CLicqConsole::UserCommand_History(const char *szId, unsigned long nPPID, char *szArg)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
+  if (u == NULL)
+    return;
   HistoryList lHistory;
   if (!u->GetHistory(lHistory))
@@ -1706 +1743 @@
   }
   char szFrom[32];
-  if (gUserManager.OwnerUin() == nUin)
-    strcpy(szFrom, "Server");
-  else
+  //TODO: FIX THIS:
+  //if (gUserManager.OwnerUin() == nUin)
+  //  strcpy(szFrom, "Server");
+  //else
     strcpy(szFrom, u->GetAlias());
   gUserManager.DropUser(u);
@@ -1781 +1819 @@
  * CLicqConsole::UserCommand_Msg
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_Msg(unsigned long nUin, char *)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+void CLicqConsole::UserCommand_Msg(const char *szId, unsigned long nPPID, char *)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   if (u == NULL)
     return;
@@ -1790 +1828 @@
   winMain->fProcessInput = &CLicqConsole::InputMessage;
   winMain->state = STATE_MLE;
-  winMain->data = new DataMsg(nUin);
-
-  winMain->wprintf("%BEnter message to %b%s%B (%b%ld%B):\n", u->GetAlias(),
-                   nUin);
+  winMain->data = new DataMsg(szId, nPPID);
+
+  winMain->wprintf("%BEnter message to %b%s%B (%b%s%B):\n", u->GetAlias(),
+                   szId);
   winMain->RefreshWin();
   gUserManager.DropUser(u);
@@ -1802 +1840 @@
  * SendDirect
  *-------------------------------------------------------------------------*/
-static bool SendDirect(unsigned long nUin, char c)
+static bool SendDirect(const char *szId, unsigned long nPPID, char c)
 {
   bool bDirect = (c != 's');
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   if (u != NULL)
   {
@@ -1861 +1899 @@
       *sz = '\0';
       sz++;
-      bool bDirect = SendDirect(data->nUin, *sz);
+      bool bDirect = SendDirect(data->szId, data->nPPID, *sz);
       winMain->wprintf("%C%ASending message %s...", m_cColorInfo->nColor,
                        m_cColorInfo->nAttr,
                        !bDirect ? "through the server" : "direct");
-      winMain->event = licqDaemon->icqSendMessage(data->nUin, data->szMsg,
+      winMain->event = licqDaemon->ProtoSendMessage(data->szId, data->nPPID, data->szMsg,
                        bDirect, *sz == 'u');
       winMain->state = STATE_PENDING;
@@ -1880 +1918 @@
       winMain->wprintf("%C%ASending message through the server...",
                        m_cColorInfo->nColor, m_cColorInfo->nAttr);
-      winMain->event = licqDaemon->icqSendMessage(data->nUin, data->szMsg,
+      winMain->event = licqDaemon->ProtoSendMessage(data->szId, data->nPPID, data->szMsg,
                        false, false);
       winMain->state = STATE_PENDING;
@@ -1902 +1940 @@
  * CLicqConsole::UserCommand_SendFile
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_SendFile(unsigned long nUin, char *)
+void CLicqConsole::UserCommand_SendFile(const char *szId, unsigned long nPPID, char *)
 {
   // Get the file name
   winMain->fProcessInput = &CLicqConsole::InputSendFile;
   winMain->state = STATE_LE;
-  winMain->data = new DataSendFile(nUin);
-
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
-  winMain->wprintf("%BEnter file to send to %b%s%B (%b%ld%B):\n",
-                   u->GetAlias(), nUin);
+  winMain->data = new DataSendFile(szId, nPPID);
+
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
+  winMain->wprintf("%BEnter file to send to %b%s%B (%b%s%B):\n",
+                   u->GetAlias(), szId);
   winMain->RefreshWin();
   gUserManager.DropUser(u);
@@ -1990 +2028 @@
       *sz = '\0';
       sz++;
-      bool bDirect = SendDirect(data->nUin, *sz);
+      bool bDirect = SendDirect(data->szId, data->nPPID, *sz);
       bDirect = true; // XXX hack
       winMain->wprintf("%C%ASending File %s...",
@@ -1999 +2037 @@
       lFileList.push_back(strdup(data->szFileName));
 
-      winMain->event = licqDaemon->icqFileTransfer(data->nUin, data->szFileName,
-                       data->szDescription, lFileList, ICQ_TCPxMSG_NORMAL,
+      winMain->event = licqDaemon->icqFileTransfer(strtoul(data->szId, (char **)NULL, 10),
+              data->szFileName, data->szDescription, lFileList, ICQ_TCPxMSG_NORMAL,
                        !bDirect);
       break;
@@ -2014 +2052 @@
  * CLicqConsole::UserCommand_SetAutoResponse
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_SetAutoResponse(unsigned long nUin, char *)
+void CLicqConsole::UserCommand_SetAutoResponse(const char *szId, unsigned long nPPID, char *)
 {
   // First put this console into edit mode
@@ -2072 +2110 @@
  * CLicqConsole::UserCommand_Url
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_Url(unsigned long nUin, char *)
+void CLicqConsole::UserCommand_Url(const char *szId, unsigned long nPPID, char *)
 {
   // First put this console into edit mode
   winMain->fProcessInput = &CLicqConsole::InputUrl;
   winMain->state = STATE_LE;
-  winMain->data = new DataUrl(nUin);
-
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  winMain->data = new DataUrl(szId, nPPID);
+
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   winMain->wprintf("%BEnter URL to %b%s%B (%b%ld%B): ",
-                   u->GetAlias(), nUin);
+                   u->GetAlias(), szId);
   winMain->RefreshWin();
   gUserManager.DropUser(u);
@@ -2136 +2174 @@
       *sz = '\0';
       sz++;
-      bool bDirect = SendDirect(data->nUin, *sz);
+      bool bDirect = SendDirect(data->szId, data->nPPID, *sz);
       winMain->wprintf("%C%ASending URL %s...",
                        m_cColorInfo->nColor, m_cColorInfo->nAttr,
                        !bDirect ? "through the server" : "direct");
-      winMain->event = licqDaemon->icqSendUrl(data->nUin, data->szUrl,
+      winMain->event = licqDaemon->ProtoSendUrl(data->szId, data->nPPID, data->szUrl,
                                               data->szDesc,
                                               bDirect, *sz == 'u');
@@ -2156 +2194 @@
       winMain->wprintf("%C%ASending URL through the server...",
                        m_cColorInfo->nColor, m_cColorInfo->nAttr);
-      winMain->event = licqDaemon->icqSendUrl(data->nUin, data->szUrl,
+      winMain->event = licqDaemon->ProtoSendUrl(data->szId, data->nPPID, data->szUrl,
                                               data->szDesc, false, false);
       winMain->state = STATE_PENDING;
@@ -2178 +2216 @@
  * CLicqConsole::UserCommand_Sms
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_Sms(unsigned long nUin, char *)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+void CLicqConsole::UserCommand_Sms(const char *szId, unsigned long nPPID, char *)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   if (u == NULL)
     return;
@@ -2187 +2225 @@
   winMain->fProcessInput = &CLicqConsole::InputSms;
   winMain->state = STATE_MLE;
-  winMain->data = new DataSms(nUin);
+  winMain->data = new DataSms(szId, nPPID);
   winMain->wprintf("%BEnter SMS to %b%s%B (%b%s%B):\n", u->GetAlias(),
                    u->GetCellularNumber());
@@ -2232 +2270 @@
       *sz = '\0';
       sz++;
-      ICQUser *u = gUserManager.FetchUser(data->nUin, LOCK_R);
+      ICQUser *u = gUserManager.FetchUser(data->szId, data->nPPID, LOCK_R);
       winMain->wprintf("%C%ASending SMS to %s ...", m_cColorInfo->nColor,
                        m_cColorInfo->nAttr, u->GetCellularNumber());
       winMain->event = licqDaemon->icqSendSms(u->GetCellularNumber(),
-                       data->szMsg, data->nUin);
+                       data->szMsg, strtoul(data->szId, (char **)NULL, 0));
       gUserManager.DropUser(u);
       winMain->state = STATE_PENDING;
@@ -2283 +2321 @@
       if (data->bUrgent)
       {
-        winMain->wprintf("%C%AGranting authorizing to %lu...", m_cColorInfo->nColor,
-                         m_cColorInfo->nAttr, data->nUin);
-        winMain->event = licqDaemon->icqAuthorizeGrant(data->nUin, data->szMsg);
+        winMain->wprintf("%C%AGranting authorizing to %s...", m_cColorInfo->nColor,
+                         m_cColorInfo->nAttr, data->szId);
+        winMain->event = licqDaemon->icqAuthorizeGrant(strtoul(data->szId, (char **)NULL, 10), data->szMsg);
       }
       else
       {
-        winMain->wprintf("%C%ARefusing authorizing to %lu...", m_cColorInfo->nColor,
-                         m_cColorInfo->nAttr, data->nUin);
-        winMain->event = licqDaemon->icqAuthorizeRefuse(data->nUin, data->szMsg);
+        winMain->wprintf("%C%ARefusing authorizing to %s...", m_cColorInfo->nColor,
+                         m_cColorInfo->nAttr, data->szId);
+        winMain->event = licqDaemon->icqAuthorizeRefuse(strtoul(data->szId, (char **)NULL, 10), data->szMsg);
       }
 
@@ -2491 +2529 @@
           data->nPos = 0;
 
-          data->nUin = atol(sz);
-
-          if (data->nUin != 0)
+          data->szId = sz;
+
+          if (data->szId != 0)
           {
             winMain->wprintf("%C%ASearching:\n",
                              m_cColorInfo->nColor, m_cColorInfo->nAttr);
 
-            winMain->event = licqDaemon->icqSearchByUin(data->nUin);
+            winMain->event = licqDaemon->icqSearchByUin(strtoul(data->szId, (char **)NULL, 10));
             winMain->state = STATE_PENDING;
 
@@ -2981 +3019 @@
  * CLicqConsole::FileChatOffer
  *-------------------------------------------------------------------------*/
-void CLicqConsole::FileChatOffer(unsigned long _nSequence, unsigned long _nUin)
+void CLicqConsole::FileChatOffer(unsigned long _nSequence, const char *_szId, unsigned long _nPPID)
 {
   // Get y or n
   winMain->fProcessInput = &CLicqConsole::InputFileChatOffer;
   winMain->state = STATE_QUERY;
-  winMain->data = new DataFileChatOffer(_nSequence, _nUin);
+  winMain->data = new DataFileChatOffer(_nSequence, _szId, _nPPID);
   winMain->wprintf("%C%ADo you wish to accept this request? (y/N) %C%Z",
                    m_cColorQuery->nColor, m_cColorQuery->nAttr, COLOR_WHITE, A_BOLD);
@@ -3014 +3052 @@
           // Make the ftman
           CFileTransferManager *ftman = new CFileTransferManager(licqDaemon,
-                                        data->nUin);
+                                        strtoul(data->szId, (char **)NULL, 10));
           ftman->SetUpdatesEnabled(1);
           m_lFileStat.push_back(ftman);
@@ -3023 +3061 @@
           // XXX hack
           unsigned long dummy[2] = { 0, 0};
-          licqDaemon->icqFileTransferAccept(data->nUin, ftman->LocalPort(),
+          licqDaemon->icqFileTransferAccept(strtoul(data->szId, (char **)NULL, 10), ftman->LocalPort(),
                                             data->nSequence, dummy, true);
           winMain->fProcessInput = &CLicqConsole::InputCommand;
@@ -3055 +3093 @@
       // XXX hack
       unsigned long dummy[2] = { 0, 0 };
-      licqDaemon->icqFileTransferRefuse(data->nUin, data->szReason,
+      licqDaemon->icqFileTransferRefuse(strtoul(data->szId, (char **)NULL, 10), data->szReason,
                                         data->nSequence, dummy, true);
 
       // We are done now
-      winMain->wprintf("%ARefusing file from %ld with reason: %Z%s\n",
-                       A_BOLD, data->nUin, A_BOLD, data->szReason);
+      winMain->wprintf("%ARefusing file from %s with reason: %Z%s\n",
+                       A_BOLD, data->szId, A_BOLD, data->szReason);
       winMain->fProcessInput = &CLicqConsole::InputCommand;
 
@@ -3077 +3115 @@
  * CLicqConsole::UserCommand_Secure
  *-----------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_Secure(unsigned long nUin, char *szStatus)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+void CLicqConsole::UserCommand_Secure(const char *szId, unsigned long nPPID, char *szStatus)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
 
   if(!licqDaemon->CryptoEnabled())
@@ -3116 +3154 @@
                      u->GetAlias());
     gUserManager.DropUser(u);
-    winMain->event = licqDaemon->icqOpenSecureChannel(nUin);
+    char *p;
+    unsigned long uin = strtoul(szId, &p,10);
+    if( (p == 0 || (p && !*p)) && nPPID == LICQ_PPID )
+      winMain->event = licqDaemon->icqOpenSecureChannel(uin);
   }
   else if(strcasecmp(szStatus, "close") == 0)
@@ -3123 +3164 @@
                      u->GetAlias());
     gUserManager.DropUser(u);
-    winMain->event = licqDaemon->icqCloseSecureChannel(nUin);
+    char *p;
+    unsigned long uin = strtoul(szId, &p,10);
+    if( (p == 0 || (p && !*p)) && nPPID == LICQ_PPID )
+      winMain->event = licqDaemon->icqCloseSecureChannel(uin);
   }
   else
@@ -3142 +3186 @@
   winMain->fProcessInput = &CLicqConsole::InputUserSelect;
   winMain->state = STATE_LE;
-  winMain->data = new DataUserSelect(gUserManager.OwnerUin()); 
+
+  char sz[20];
+  //TODO which owner
+  sprintf(sz, "%lu", gUserManager.OwnerUin());
+  
+  winMain->data = new DataUserSelect(sz, LICQ_PPID); 
   
   ICQOwner *o = gUserManager.FetchOwner(LOCK_R);

trunk/console/src/console.h

@@ -30 +30 @@
 {
   char szKey[32];
-  unsigned long nUin;
+  char szId[32];
+  unsigned long nPPID;
   char *szLine;
   bool bOffline;
   const struct SColorMap *color;
+};
+
+struct SContact
+{
+  char *szId;
+  unsigned long nPPID;
 };
 
@@ -96 +103 @@
   void SwitchToCon(unsigned short nCon);
   void CreateUserList();
+  void AddEventTag(char *, unsigned long, unsigned long);
 
   void InputCommand(int cIn);
@@ -124 +132 @@
   void PrintHelp();
   void PrintHistory(HistoryList &, unsigned short, unsigned short, const char *);
-  void PrintInfo_General(unsigned long);
-  void PrintInfo_More(unsigned long);
-  void PrintInfo_Work(unsigned long);
-  void PrintInfo_About(unsigned long);
+  void PrintInfo_General(const char *, unsigned long);
+  void PrintInfo_More(const char *, unsigned long);
+  void PrintInfo_Work(const char *, unsigned long);