Changeset 3471 for branches/protocol_plugin_1_3_0

Timestamp:

05/01/03 10:02:06 (6 years ago)

Author:

emostar

Message:

Fixes

Files:

• branches/protocol_plugin_1_3_0/qt-gui/src/usereventdlg.cpp (modified) (50 diffs)

branches/protocol_plugin_1_3_0/qt-gui/src/usereventdlg.cpp

@@ -75 +75 @@
 
 // -----------------------------------------------------------------------------
+#ifdef QT_PROTOCOL_PLUGIN
+UserEventCommon::UserEventCommon(CICQDaemon *s, CSignalManager *theSigMan,
+                                 CMainWindow *m, const char *_szId,
+                                 unsigned long _nPPID, QWidget *parent,
+                                 const char *name)
+  : QWidget(parent, name, WDestructiveClose)
+{
+  server = s;
+  mainwin = m;
+  sigman = theSigMan;
+  m_szId = _szId ? strdup(_szId) : 0;
+  m_nPPID = _nPPID;
+  m_bOwner = (gUserManager.FindOwner(m_szId, m_nPPID) != NULL);
+  m_bDeleteUser = false;
+  
+  top_hlay = new QHBoxLayout(this, 6);
+  top_lay = new QVBoxLayout(top_hlay);
+  top_hlay->setStretchFactor(top_lay, 1);
+
+  // initalize codec
+  codec = QTextCodec::codecForLocale();
+
+  QBoxLayout *layt = new QHBoxLayout(top_lay, 8);
+  layt->addWidget(new QLabel(tr("Status:"), this));
+  nfoStatus = new CInfoField(this, true);
+  nfoStatus->setMinimumWidth(nfoStatus->sizeHint().width()+30);
+  layt->addWidget(nfoStatus);
+  layt->addWidget(new QLabel(tr("Time:"), this));
+  nfoTimezone = new CInfoField(this, true);
+  nfoTimezone->setMinimumWidth(nfoTimezone->sizeHint().width()/2+10);
+  layt->addWidget(nfoTimezone);
+
+  popupEncoding = new QPopupMenu(this);
+  btnSecure = new QPushButton(this);
+  QToolTip::add(btnSecure, tr("Open / Close secure channel"));
+  layt->addWidget(btnSecure);
+  connect(btnSecure, SIGNAL(clicked()), this, SLOT(slot_security()));
+  btnHistory = new QPushButton(this);
+  btnHistory->setPixmap(mainwin->pmHistory);
+  QToolTip::add(btnHistory, tr("Show User History"));
+  connect(btnHistory, SIGNAL(clicked()), this, SLOT(showHistory()));
+  layt->addWidget(btnHistory);
+  btnInfo = new QPushButton(this);
+  btnInfo->setPixmap(mainwin->pmInfo);
+  QToolTip::add(btnInfo, tr("Show User Info"));
+  connect(btnInfo, SIGNAL(clicked()), this, SLOT(showUserInfo()));
+  layt->addWidget(btnInfo);
+  btnEncoding = new QPushButton(this);
+  btnEncoding->setPixmap(mainwin->pmEncoding);
+  QToolTip::add(btnEncoding, tr("Change user text encoding"));
+  QWhatsThis::add(btnEncoding, tr("This button selects the text encoding used when communicating with this user. You might need to change the encoding to communicate in a different language."));
+  btnEncoding->setPopup(popupEncoding);
+
+  layt->addWidget(btnEncoding);
+
+  tmrTime = NULL;
+
+  ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_W);
+  if (u != NULL)
+  {
+    nfoStatus->setData(u->StatusStr());
+    if (u->NewMessages() == 0)
+      setIcon(CMainWindow::iconForStatus(u->StatusFull()));
+    else
+      setIcon(CMainWindow::iconForEvent(ICQ_CMDxSUB_MSG));
+    SetGeneralInfo(u);
+
+    // restore prefered encoding
+    codec = UserCodec::codecForICQUser(u);
+
+    gUserManager.DropUser(u);
+  }
+
+  QString codec_name = QString::fromLatin1( codec->name() ).lower();
+  popupEncoding->setCheckable(true);
+
+  // populate the popup menu
+  UserCodec::encoding_t *it = &UserCodec::m_encodings[0];
+  while(it->encoding != NULL) {
+
+    if (QString::fromLatin1(it->encoding).lower() == codec_name) {
+      if (mainwin->m_bShowAllEncodings || it->isMinimal) {
+        popupEncoding->insertItem(UserCodec::nameForEncoding(it->encoding), this, SLOT(slot_setEncoding(int)), 0, it->mib);
+      } else {
+        // if the current encoding does not appear in the minimal list
+        popupEncoding->insertSeparator(0);
+        popupEncoding->insertItem(UserCodec::nameForEncoding(it->encoding), this, SLOT(slot_setEncoding(int)), 0, it->mib, 0);
+      }
+      popupEncoding->setItemChecked(it->mib, true);
+    } else {
+      if (mainwin->m_bShowAllEncodings || it->isMinimal) {
+        popupEncoding->insertItem(UserCodec::nameForEncoding(it->encoding), this, SLOT(slot_setEncoding(int)), 0, it->mib);
+      }
+    }
+
+    ++it;
+  }
+
+  connect (sigman, SIGNAL(signal_updatedUser(CICQSignal *)),
+           this, SLOT(slot_userupdated(CICQSignal *)));
+
+  mainWidget = new QWidget(this);
+  top_lay->addWidget(mainWidget);
+}
+#endif
+
 #if QT_VERSION >= 300
 UserEventTabDlg::UserEventTabDlg(QWidget *parent, const char *name)
@@ -235 +341 @@
 
 // -----------------------------------------------------------------------------
-#ifdef QT_PROTOCOL_PLUGIN
+
 UserEventCommon::UserEventCommon(CICQDaemon *s, CSignalManager *theSigMan,
-                                 CMainWindow *m, const char *_szId,
-                                 unsigned long _nPPID, QWidget *parent,
-                                 const char *name)
+                                 CMainWindow *m, unsigned long _nUin,
+                                 QWidget* parent, const char* name)
   : QWidget(parent, name, WDestructiveClose)
 {
+#ifdef QT_PROTOCOL_PLUGIN
+  char szUin[24];
+  sprintf(szUin, "%lu", _nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
+#endif
   server = s;
   mainwin = m;
   sigman = theSigMan;
-  m_szId = _szId ? strdup(_szId) : 0;
-  m_nPPID = _nPPID;
-  m_bOwner = (gUserManager.FindOwner(m_szId, m_nPPID) != NULL);
+  m_nUin = _nUin;
+  m_bOwner = (m_nUin == gUserManager.OwnerUin());
   m_bDeleteUser = false;
 
@@ -292 +402 @@
   tmrTime = NULL;
 
-  ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_W);
+  ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_W);
   if (u != NULL)
   {
@@ -339 +449 @@
   top_lay->addWidget(mainWidget);
 }
-#endif
-
-UserEventCommon::UserEventCommon(CICQDaemon *s, CSignalManager *theSigMan,
-                                 CMainWindow *m, unsigned long _nUin,
-                                 QWidget* parent, const char* name)
-  : QWidget(parent, name, WDestructiveClose)
-{
-#ifdef QT_PROTOCOL_PLUGIN
-  char szUin[24];
-  sprintf(szUin, "%lu", _nUin);
-  m_szId = strdup(szUin);
-  m_nPPID = LICQ_PPID;
-#endif
-  server = s;
-  mainwin = m;
-  sigman = theSigMan;
-  m_nUin = _nUin;
-  m_bOwner = (m_nUin == gUserManager.OwnerUin());
-  m_bDeleteUser = false;
-
-  top_hlay = new QHBoxLayout(this, 6);
-  top_lay = new QVBoxLayout(top_hlay);
-  top_hlay->setStretchFactor(top_lay, 1);
-
-  // initalize codec
-  codec = QTextCodec::codecForLocale();
-
-  QBoxLayout *layt = new QHBoxLayout(top_lay, 8);
-  layt->addWidget(new QLabel(tr("Status:"), this));
-  nfoStatus = new CInfoField(this, true);
-  nfoStatus->setMinimumWidth(nfoStatus->sizeHint().width()+30);
-  layt->addWidget(nfoStatus);
-  layt->addWidget(new QLabel(tr("Time:"), this));
-  nfoTimezone = new CInfoField(this, true);
-  nfoTimezone->setMinimumWidth(nfoTimezone->sizeHint().width()/2+10);
-  layt->addWidget(nfoTimezone);
-
-  popupEncoding = new QPopupMenu(this);
-  btnSecure = new QPushButton(this);
-  QToolTip::add(btnSecure, tr("Open / Close secure channel"));
-  layt->addWidget(btnSecure);
-  connect(btnSecure, SIGNAL(clicked()), this, SLOT(slot_security()));
-  btnHistory = new QPushButton(this);
-  btnHistory->setPixmap(mainwin->pmHistory);
-  QToolTip::add(btnHistory, tr("Show User History"));
-  connect(btnHistory, SIGNAL(clicked()), this, SLOT(showHistory()));
-  layt->addWidget(btnHistory);
-  btnInfo = new QPushButton(this);
-  btnInfo->setPixmap(mainwin->pmInfo);
-  QToolTip::add(btnInfo, tr("Show User Info"));
-  connect(btnInfo, SIGNAL(clicked()), this, SLOT(showUserInfo()));
-  layt->addWidget(btnInfo);
-  btnEncoding = new QPushButton(this);
-  btnEncoding->setPixmap(mainwin->pmEncoding);
-  QToolTip::add(btnEncoding, tr("Change user text encoding"));
-  QWhatsThis::add(btnEncoding, tr("This button selects the text encoding used when communicating with this user. You might need to change the encoding to communicate in a different language."));
-  btnEncoding->setPopup(popupEncoding);
-
-  layt->addWidget(btnEncoding);
-
-  tmrTime = NULL;
-
-  ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_W);
-  if (u != NULL)
-  {
-    nfoStatus->setData(u->StatusStr());
-    if (u->NewMessages() == 0)
-      setIcon(CMainWindow::iconForStatus(u->StatusFull()));
-    else
-      setIcon(CMainWindow::iconForEvent(ICQ_CMDxSUB_MSG));
-    SetGeneralInfo(u);
-
-    // restore prefered encoding
-    codec = UserCodec::codecForICQUser(u);
-
-    gUserManager.DropUser(u);
-  }
-
-  QString codec_name = QString::fromLatin1( codec->name() ).lower();
-  popupEncoding->setCheckable(true);
-
-  // populate the popup menu
-  UserCodec::encoding_t *it = &UserCodec::m_encodings[0];
-  while(it->encoding != NULL) {
-
-    if (QString::fromLatin1(it->encoding).lower() == codec_name) {
-      if (mainwin->m_bShowAllEncodings || it->isMinimal) {
-        popupEncoding->insertItem(UserCodec::nameForEncoding(it->encoding), this, SLOT(slot_setEncoding(int)), 0, it->mib);
-      } else {
-        // if the current encoding does not appear in the minimal list
-        popupEncoding->insertSeparator(0);
-        popupEncoding->insertItem(UserCodec::nameForEncoding(it->encoding), this, SLOT(slot_setEncoding(int)), 0, it->mib, 0);
-      }
-      popupEncoding->setItemChecked(it->mib, true);
-    } else {
-      if (mainwin->m_bShowAllEncodings || it->isMinimal) {
-        popupEncoding->insertItem(UserCodec::nameForEncoding(it->encoding), this, SLOT(slot_setEncoding(int)), 0, it->mib);
-      }
-    }
-    
-    ++it;
-  }
-
-  connect (sigman, SIGNAL(signal_updatedUser(CICQSignal *)),
-           this, SLOT(slot_userupdated(CICQSignal *)));
-
-  mainWidget = new QWidget(this);
-  top_lay->addWidget(mainWidget);
-}
 
 void UserEventCommon::slot_setEncoding(int encodingMib) {
@@ -471 +472 @@
 
     /* save prefered character set */
+#ifdef QT_PROTOCOL_PLUGIN
+    ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_W);
+#else
     ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_W);
+#endif
     if (u != NULL) {
       u->SetEnableSave(false);
@@ -544 +549 @@
   if (m_bDeleteUser && !m_bOwner)
     mainwin->RemoveUserFromList(strdup(m_szId), m_nPPID, this);
-
+    
   free(m_szId);
 #else
@@ -875 +880 @@
   if(!chkAutoClose->isChecked()) return;
 
+#ifdef QT_PROTOCOL_PLUGIN
+  ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_R);
+#else
   ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
+#endif
   bool doclose = (u->NewMessages() == 0);
   gUserManager.DropUser(u);
@@ -983 +992 @@
         btnRead4->setText(tr("Start Chat"));
         break;
-        
+
       case ICQ_CMDxSUB_SMS:
         btnEncoding->setEnabled(false);
@@ -1002 +1011 @@
         btnRead1->setText(tr("A&uthorize"));
         btnRead2->setText(tr("&Refuse"));
+#ifdef QT_PROTOCOL_PLUGIN
+        CEventAuthRequest *pAuthReq = (CEventAuthRequest *)m;;
+        ICQUser *u = gUserManager.FetchUser(pAuthReq->IdString(), pAuthReq->PPID(), LOCK_R);
+#else
         ICQUser *u = gUserManager.FetchUser( ((CEventAuthRequest *)m)->Uin(), LOCK_R);
+#endif
         if (u == NULL)
           btnRead3->setText(tr("A&dd User"));
@@ -1011 +1025 @@
       case ICQ_CMDxSUB_AUTHxGRANTED:
       {
+#ifdef QT_PROTOCOL_PLUGIN
+        CEventAuthGranted *pAuth = (CEventAuthGranted *)m;
+        ICQUser *u = gUserManager.FetchUser(pAuth->IdString(), pAuth->PPID(), LOCK_R);
+#else
         ICQUser *u = gUserManager.FetchUser( ((CEventAuthGranted *)m)->Uin(), LOCK_R);
+#endif
         if (u == NULL)
           btnRead1->setText(tr("A&dd User"));
@@ -1020 +1039 @@
       case ICQ_CMDxSUB_ADDEDxTOxLIST:
       {
+#ifdef QT_PROTOCOL_PLUGIN
+        CEventAdded *pAdd = (CEventAdded *)m;
+        ICQUser *u = gUserManager.FetchUser(pAdd->IdString(), pAdd->PPID(), LOCK_R);
+#else
         ICQUser *u = gUserManager.FetchUser( ((CEventAdded *)m)->Uin(), LOCK_R);
+#endif
         if (u == NULL)
           btnRead1->setText(tr("A&dd User"));
@@ -1048 +1072 @@
   if (e->m_nEventId != -1 && e->msg->Direction() == D_RECEIVER)
   {
+#ifdef QT_PROTOCOL_PLUGIN
+    ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_W);
+#else
     ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_W);
+#endif
     u->EventClearId(e->m_nEventId);
     gUserManager.DropUser(u);
@@ -1077 +1105 @@
 void UserViewEvent::sendMsg(QString txt)
 {
+#ifdef QT_PROTOCOL_PLUGIN
+  UserSendMsgEvent *e = new UserSendMsgEvent(server, sigman, mainwin, m_szId, m_nPPID);
+#else
   UserSendMsgEvent *e = new UserSendMsgEvent(server, sigman, mainwin, m_nUin);
+#endif
   e->setText(txt);
 
@@ -1121 +1153 @@
 
     case ICQ_CMDxSUB_AUTHxREQUEST:
+    {
+#ifdef QT_PROTOCOL_PLUGIN
+      CEventAuthRequest *p = (CEventAuthRequest *)m_xCurrentReadEvent;
+      (void) new AuthUserDlg(server, p->IdString(), p->PPID(), true);
+#else
       (void) new AuthUserDlg(server, ((CEventAuthRequest *)m_xCurrentReadEvent)->Uin(), true);
+#endif
       break;
+    }
 
     case ICQ_CMDxSUB_AUTHxGRANTED:
-#ifdef QT_PROTOCOL_PLUGIN
-    {
+    {
+#ifdef QT_PROTOCOL_PLUGIN
       CEventAuthGranted *p = (CEventAuthGranted *)m_xCurrentReadEvent;
       server->AddUserToList(p->IdString(), p->PPID());
-    }
 #else
       server->AddUserToList( ((CEventAuthGranted *)m_xCurrentReadEvent)->Uin());
 #endif
       break;
+    }
 
     case ICQ_CMDxSUB_ADDEDxTOxLIST:
-#ifdef QT_PROTOCOL_PLUGIN
-    {
+    {
+#ifdef QT_PROTOCOL_PLUGIN
       CEventAdded *p = (CEventAdded *)m_xCurrentReadEvent;
       server->AddUserToList(p->IdString(), p->PPID());
-    }
 #else
       server->AddUserToList( ((CEventAdded *)m_xCurrentReadEvent)->Uin());
 #endif
       break;
+    }
+
     case ICQ_CMDxSUB_CONTACTxLIST:
     {
@@ -1151 +1191 @@
       ContactList::const_iterator it;
       for(it = cl.begin(); it != cl.end(); ++it) {
+#ifdef QT_PROTOCOL_PLUGIN
+        ICQUser *u = gUserManager.FetchUser((*it)->IdString(), (*it)->PPID(), LOCK_R);
+#else
         ICQUser* u = gUserManager.FetchUser((*it)->Uin(), LOCK_R);
+#endif
         if(u == NULL)
           server->AddUserToList((*it)->Uin());
@@ -1186 +1230 @@
       {
         if (chatDlg->StartAsClient(c->Port()))
+#ifdef QT_PROTOCOL_PLUGIN
+        {
+          //TODO in CICQDaemon
+          server->icqChatRequestAccept(strtoul(m_szId, (char **)NULL, 10), 0,
+            c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+        }
+#else
           server->icqChatRequestAccept(m_nUin, 0, c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+#endif
       }
       else  // single party (other side connects to us)
       {
         if (chatDlg->StartAsServer())
+#ifdef QT_PROTOCOL_PLUGIN
+        {
+          //TODO in CICQDaemon
+          server->icqChatRequestAccept(strtoul(m_szId, (char **)NULL, 10),
+            chatDlg->LocalPort(), c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+        }
+#else
           server->icqChatRequestAccept(m_nUin, chatDlg->LocalPort(), c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+#endif
       }
       break;
@@ -1260 +1320 @@
         btnRead2->setEnabled(false);
         btnRead3->setEnabled(false);
+#ifdef QT_PROTOCOL_PLUGIN
+        //TODO in CICQDaemon
+        server->icqChatRequestRefuse(strtoul(m_szId, (char **)NULL, 10),
+          codec->fromUnicode(r->RefuseMessage()),
+          m_xCurrentReadEvent->Sequence(), c->MessageID(), c->IsDirect());
+#else
         server->icqChatRequestRefuse(m_nUin, codec->fromUnicode(r->RefuseMessage()),
            m_xCurrentReadEvent->Sequence(), c->MessageID(), c->IsDirect());
+#endif
       }
       delete r;
@@ -1269 +1336 @@
     case ICQ_CMDxSUB_FILE:  // refuse a file transfer
     {
+#ifdef QT_PROTOCOL_PLUGIN
+      CRefuseDlg *r = new CRefuseDlg(m_szId, m_nPPID, tr("File Transfer"), this);
+#else
       CRefuseDlg *r = new CRefuseDlg(m_nUin, tr("File Transfer"), this);
+#endif
       if (r->exec())
       {
@@ -1276 +1347 @@
         btnRead2->setEnabled(false);
         btnRead3->setEnabled(false);
+#ifdef QT_PROTOCOL_PLUGIN
+        //TODO
+        server->icqFileTransferRefuse(strtoul(m_szId, (char **)NULL, 10),
+          codec->fromUnicode(r->RefuseMessage()),
+          m_xCurrentReadEvent->Sequence(), f->MessageID(), f->IsDirect());
+#else
         server->icqFileTransferRefuse(m_nUin, codec->fromUnicode(r->RefuseMessage()),
            m_xCurrentReadEvent->Sequence(), f->MessageID(), f->IsDirect());
+#endif
       }
       delete r;
@@ -1284 +1362 @@
 
     case ICQ_CMDxSUB_AUTHxREQUEST:
+#ifdef QT_PROTOCOL_PLUGIN
+    {
+      CEventAuthRequest *p = (CEventAuthRequest *)m_xCurrentReadEvent;
+      server->AddUserToList(p->IdString(), p->PPID());
+      break;
+    }
+#else
       server->AddUserToList( ((CEventAuthRequest *)m_xCurrentReadEvent)->Uin());
       break;
-
+#endif
   }
 }
@@ -1298 +1383 @@
   {
     case ICQ_CMDxSUB_MSG:
+#ifdef QT_PROTOCOL_PLUGIN
+      mainwin->callFunction(mnuUserSendChat, m_szId, m_nPPID);
+#else
       mainwin->callFunction(mnuUserSendChat, Uin());
+#endif
       break;
     case ICQ_CMDxSUB_CHAT:  // join to current chat
@@ -1305 +1394 @@
       if (c->Port() != 0)  // Joining a multiparty chat (we connect to them)
       {
+#ifdef QT_PROTOCOL_PLUGIN
+        ChatDlg *chatDlg = new ChatDlg(m_szId, m_nPPID, server, mainwin);
+        //TODO
+        if (chatDlg->StartAsClient(c->Port()))
+          server->icqChatRequestAccept(strtoul(m_szId, (char **)NULL, 10), 0, c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+#else
         ChatDlg *chatDlg = new ChatDlg(m_nUin, server, mainwin);
         if (chatDlg->StartAsClient(c->Port()))
           server->icqChatRequestAccept(m_nUin, 0, c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+#endif
       }
       else  // single party (other side connects to us)
@@ -1314 +1410 @@
         CJoinChatDlg *j = new CJoinChatDlg(this);
         if (j->exec() && (chatDlg = j->JoinedChat()) != NULL)
+#ifdef QT_PROTOCOL_PLUGIN
+          //TODO
+          server->icqChatRequestAccept(strtoul(m_szId, (char **)NULL, 10), chatDlg->LocalPort(), c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+#else
           server->icqChatRequestAccept(m_nUin, chatDlg->LocalPort(), c->Clients(), c->Sequence(), c->MessageID(), c->IsDirect());
+#endif
         delete j;
       }
@@ -1384 +1485 @@
 void UserViewEvent::slot_sentevent(ICQEvent *e)
 {
+#ifdef QT_PROTOCOL_PLUGIN
+  if (e->PPID() != m_nPPID || (strcmp(e->Id(), m_szId) != 0)) return;
+#else
   if (e->Uin() != m_nUin) return;
+#endif
   if (!mainwin->m_bMsgChatView)
     (void) new MsgViewItem(e->GrabUserEvent(), codec, msgView);
@@ -1607 +1712 @@
 void UserSendCommon::windowActivationChange(bool oldActive)
 {
+#ifdef QT_PROTOCOL_PLUGIN
+  ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_R);
+#else
+  ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
+#endif
+
   if (isActiveWindow() && mainwin->m_bMsgChatView &&
       (!mainwin->userEventTabDlg ||
@@ -1613 +1724 @@
      mainwin->userEventTabDlg->tabIsSelected(this)))))
     {
-    ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
     if (u != NULL && u->NewMessages() > 0)
     {
@@ -1627 +1737 @@
         u->EventClearId(idList[i]);
     }
-    gUserManager.DropUser(u);
-  }
+  }
+  gUserManager.DropUser(u);
   QWidget::windowActivationChange(oldActive);
 }
@@ -1661 +1771 @@
 void UserSendCommon::trySecure()
 {
+#ifdef QT_PROTOCOL_PLUGIN
+  ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_R);
+#else
   ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
+#endif
   bool autoSecure = ( u->AutoSecure() && gLicqDaemon->CryptoEnabled() &&
                       (u->SecureChannelSupport() == SECURE_CHANNEL_SUPPORTED ) &&
@@ -1669 +1783 @@
   connect(btnSend, SIGNAL(clicked()), this, SLOT(sendButton()));
   if ( autoSecure ) {
+#ifdef QT_PROTOCOL_PLUGIN
+    QWidget *w = new KeyRequestDlg(sigman, m_szId, m_nPPID);
+#else
     QWidget* w = new KeyRequestDlg(sigman, m_nUin);
+#endif
     connect(w, SIGNAL( destroyed() ), this, SLOT( sendButton() ) );
   }
@@ -1704 +1822 @@
   switch(id)
   {
+#ifdef QT_PROTOCOL_PLUGIN
+  case 0:
+    e = new UserSendMsgEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    break;
+  case 1:
+    e = new UserSendUrlEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    break;
+  case 2:
+    e = new UserSendChatEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    break;
+  case 3:
+    e = new UserSendFileEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    break;
+  case 4:
+    e = new UserSendContactEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    break;
+  case 5:
+    e = new UserSendSmsEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    break;
+#else
   case 0:
     e = new UserSendMsgEvent(server, sigman, mainwin, m_nUin, parent);
@@ -1722 +1860 @@
     e = new UserSendSmsEvent(server, sigman, mainwin, m_nUin, parent);
     break;
+#endif
   }
 
@@ -1727 +1866 @@
   {
     if (e->mleSend && mleSend)
-    {  
+    {
       e->mleSend->setText(mleSend->text());
       e->mleSend->setEdited(e->mleSend->length());
@@ -1843 +1982 @@
 {
   if(!mainwin->m_bManualNewUser) {
+#ifdef QT_PROTOCOL_PLUGIN
+    ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_W);
+#else
     ICQUser* u = gUserManager.FetchUser(m_nUin, LOCK_W);
+#endif
 
     if(u->NewUser())
@@ -1849 +1992 @@
       u->SetNewUser(false);
       gUserManager.DropUser(u);
-
+#ifdef QT_PROTOCOL_PLUGIN
+      CICQSignal s(SIGNAL_UPDATExUSER, USER_BASIC, m_szId, m_nPPID);
+#else
       CICQSignal s(SIGNAL_UPDATExUSER, USER_BASIC, m_nUin);
+#endif
       emit updateUser(&s);
     }
@@ -1980 +2126 @@
   if (e->SubResult() == ICQ_TCPxACK_RETURN)
   {
+#ifdef QT_PROTOCOL_PLUGIN
+    u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_W);
+#else
     u = gUserManager.FetchUser(m_nUin, LOCK_W);
+#endif
     msg = tr("%1 is in %2 mode:\n%3\nSend...")
              .arg(codec->toUnicode(u->GetAlias())).arg(u->StatusStr())
@@ -2002 +2152 @@
   else if (e->SubResult() == ICQ_TCPxACK_REFUSE)
   {