Changeset 3496 for branches/protocol_plugin_1_3_0

Timestamp:

05/06/03 12:43:04 (6 years ago)

Author:

emostar

Message:

Plugin support for sending contacts as a string

Location:

branches/protocol_plugin_1_3_0/qt-gui/src

Files:

• mmlistview.cpp (modified) (1 diff)
• mmsenddlg.cpp (modified) (2 diffs)
• mmsenddlg.h (modified) (1 diff)
• userbox.cpp (modified) (3 diffs)
• usereventdlg.cpp (modified) (4 diffs)
• usereventdlg.h (modified) (1 diff)

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

@@ -246 +246 @@
   }
 
-  //TODO
-  AddUser(text.latin1(), LICQ_PPID);
+  //TODO get protocol id from text
+  AddUser(text.mid(4, text.length() - 4).latin1(), LICQ_PPID);
 }
 

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

@@ -103 +103 @@
 
 
-int CMMSendDlg::go_contact(UinList &_uins)
+int CMMSendDlg::go_contact(UserStringList &_users)
 {
   m_nEventType = ICQ_CMDxSUB_CONTACTxLIST;
-  uins = &_uins;
+  users = &_users;
 
   setCaption(tr("Multiple Recipient Contact List"));
@@ -258 +258 @@
       gUserManager.DropUser(u);
 
-      //TODO in the daemon
-      icqEventTag = server->icqSendContactList(strtoul(m_szId, (char **)NULL, 0), *uins,
-        false, ICQ_TCPxMSG_NORMAL);
+      icqEventTag = server->icqSendContactList(m_szId, *users, false,
+        ICQ_TCPxMSG_NORMAL);
       break;
     }

branches/protocol_plugin_1_3_0/qt-gui/src/mmsenddlg.h

@@ -32 +32 @@
   int go_message(QString);
   int go_url(QString, QString);
-  //TODO String List please
-  int go_contact(UinList &_uins);
+  int go_contact(UserStringList &_users);
 protected:
   QString s1, s2;
-  //TODO String list please
-  UinList *uins;
+  UserStringList *users;
 
   unsigned long m_nEventType;

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

@@ -49 +49 @@
 
 #define FLASH_TIME 500
+
+extern char *PPIDSTRING(unsigned long);
 
 QColor  *CUserViewItem::s_cOnline = NULL,
@@ -1022 +1024 @@
         }
       }
-      //TODO change this
       else if(QTextDrag::decode(e, text)) {
-        unsigned long Uin = text.toULong();
-
-        if(Uin >= 10000) {
-          if(Uin == it->ItemUin()) return;
+        const char *p = (text.left(4).latin1());
+        char *szId = strdup((text.mid(4, text.length() - 4).latin1()));
+        unsigned long nPPID = LICQ_PPID; //TODO fix this
+
+        if(szId) {
+          if(strcmp(szId, it->ItemId()) == 0 && nPPID == it->ItemPPID()) return;
           UserSendContactEvent* e = static_cast<UserSendContactEvent*>
-            (gMainWindow->callFunction(mnuUserSendContact, it->ItemUin()));
-          ICQUser* u = gUserManager.FetchUser(Uin, LOCK_R);
+            (gMainWindow->callFunction(mnuUserSendContact, it->ItemId(), it->ItemPPID()));
+          ICQUser* u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
           QString alias = u ? u->GetAlias() : "";
           gUserManager.DropUser(u);
 
-          e->setContact(Uin, alias);
+          e->setContact(szId, nPPID, alias);
           e->show();
         }
         else {
           UserSendMsgEvent* e = static_cast<UserSendMsgEvent*>
-            (gMainWindow->callFunction(mnuUserSendMsg, it->ItemUin()));
+            (gMainWindow->callFunction(mnuUserSendMsg, it->ItemId(), it->ItemPPID()));
           e->setText(text);
           e->show();
         }
-      }
-    }
-    //TODO Change this
+        
+        free (szId);
+      }
+    }
     else if(it->isGroupItem())
     {
       QString text;
       if(QTextDrag::decode(e, text)) {
-        unsigned long Uin = text.toULong();
-        if(Uin >= 10000) {
-          gUserManager.AddUserToGroup(Uin, it->GroupId());
+        const char *p = (text.left(4).latin1());
+        char *szId = strdup(text.mid(4, text.length() - 4).latin1());
+        unsigned long nPPID = LICQ_PPID; //TODO Fix this
+
+        if(szId) {
+          gUserManager.AddUserToGroup(szId, nPPID, it->GroupId());
           gMainWindow->updateUserWin();
         }
+
+        free(szId);
       }
     }
@@ -1303 +1312 @@
 
   if (parent() && (me->state() & LeftButton) && (i = (CUserViewItem *)currentItem())
-      && !mousePressPos.isNull() && i->ItemUin() &&
+      && !mousePressPos.isNull() && i->ItemId() &&
       (QPoint(me->pos() - mousePressPos).manhattanLength() > 8))
   {
-    QTextDrag *d = new QTextDrag(QString::number(i->ItemUin()), this);
+    char *p = PPIDSTRING(i->ItemPPID());
+    QString data(p);
+    data += i->ItemId();
+    delete [] p;
+    QTextDrag *d = new QTextDrag(data, this);
     d->dragCopy();
   }

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

@@ -2951 +2951 @@
 {
   CMMUserViewItem *i = static_cast<CMMUserViewItem*>(lstContacts->firstChild());
-  UinList uins;
+  UserStringList users;
 
   while (i)
   {
-    uins.push_back(i->Uin());
+    users.push_back(i->Id());
     i = static_cast<CMMUserViewItem *>(i->nextSibling());
   }
 
-  if (uins.size() == 0)
+  if (users.size() == 0)
     return;
 
@@ -2967 +2967 @@
   {
     CMMSendDlg *m = new CMMSendDlg(server, sigman, lstMultipleRecipients, this);
-    int r = m->go_contact(uins);
+    int r = m->go_contact(users);
     delete m;
     if (r != QDialog::Accepted) return;
@@ -2973 +2973 @@
 
   unsigned long icqEventTag;
-  icqEventTag = server->icqSendContactList(m_nUin, uins,
+  icqEventTag = server->icqSendContactList(m_szId, users,
     chkSendServer->isChecked() ? false : true,
     chkUrgent->isChecked() ? ICQ_TCPxMSG_URGENT : ICQ_TCPxMSG_NORMAL,
@@ -3007 +3007 @@
 
 //-----UserSendContactEvent::setContact--------------------------------------
-//TODO for new protocol plugin
-void UserSendContactEvent::setContact(unsigned long Uin, const QString&)
-{
-  ICQUser* u = gUserManager.FetchUser(Uin, LOCK_R);
+void UserSendContactEvent::setContact(const char *szId, unsigned long nPPID,
+  const QString&)
+{
+  ICQUser* u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
 
   if(u != NULL)

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

@@ -380 +380 @@
   virtual ~UserSendContactEvent();
 
-  //TODO
-  void setContact(unsigned long uin, const QString& alias);
+  void setContact(const char *, unsigned long, const QString& alias);
 
 protected: