Changeset 6103 for trunk/qt4-gui/src/userevents

Timestamp:

03/16/08 04:09:36 (9 months ago)

Author:

flynd

Message:

Ask protocol plugin which events are supported instead of just checking for ppid=msn.

Location:

trunk/qt4-gui/src/userevents

Files:

• usereventcommon.cpp (modified) (2 diffs)
• usereventcommon.h (modified) (1 diff)
• usersendcommon.cpp (modified) (7 diffs)

trunk/qt4-gui/src/userevents/usereventcommon.cpp

@@ -74 +74 @@
   }
 
+  // Find out what's supported for this protocol
+  mySendFuncs = 0xFFFFFFFF;
+  if (ppid != LICQ_PPID)
+  {
+    FOR_EACH_PROTO_PLUGIN_START(gLicqDaemon)
+    {
+      if ((*_ppit)->PPID() == ppid)
+      {
+        mySendFuncs = (*_ppit)->SendFunctions();
+        break;
+      }
+    }
+    FOR_EACH_PROTO_PLUGIN_END
+  }
+
   myCodec = QTextCodec::codecForLocale();
   myIsOwner = (gUserManager.FindOwner(myUsers.front().c_str(), myPpid) != NULL);
@@ -131 +146 @@
   mySecure->setShortcut(Qt::ALT + Qt::Key_E);
   pushToolTip(mySecure, tr("Open / Close secure channel"));
+  if (!(mySendFuncs & PP_SEND_SECURE))
+    mySecure->setEnabled(false);
 
   tmrTime = NULL;

trunk/qt4-gui/src/userevents/usereventcommon.h

@@ -71 +71 @@
   time_t myRemoteTimeOffset;
   list<string> myUsers;
+  unsigned long mySendFuncs;
 
   // ID of the higest event we've processed. Helps determine

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -48 +48 @@
 #endif
 
+#include <licq_icq.h>
 #include <licq_icqd.h>
 #include <licq_log.h>
@@ -129 +130 @@
 
   QAction* action;
-
-  action = new QAction(tr("Message"), grpSendType);
-  action->setData(MessageEvent);
-  action->setCheckable(true);
-
-  action = new QAction(tr("URL"), grpSendType);
-  action->setData(UrlEvent);
-  action->setCheckable(true);
-
-  action = new QAction(tr("Chat Request"), grpSendType);
-  action->setData(ChatEvent);
-  action->setCheckable(true);
-
-  action = new QAction(tr("File Transfer"), grpSendType);
-  action->setData(FileEvent);
-  action->setCheckable(true);
-
-  action = new QAction(tr("Contact List"), grpSendType);
-  action->setData(ContactEvent);
-  action->setCheckable(true);
-
-  action = new QAction(tr("SMS"), grpSendType);
-  action->setData(SmsEvent);
-  action->setCheckable(true);
+  int eventTypesCount = 0;
+
+#define ADD_SENDTYPE(eventFlag, eventType, caption) \
+    if (mySendFuncs & eventFlag) { \
+      action = new QAction(caption, grpSendType); \
+      action->setData(eventType); \
+      action->setCheckable(true); \
+      eventTypesCount++; \
+    }
+
+  // Populated menu for switching event type
+  ADD_SENDTYPE(PP_SEND_MSG, MessageEvent, tr("Message"));
+  ADD_SENDTYPE(PP_SEND_URL, UrlEvent, tr("URL"));
+  ADD_SENDTYPE(PP_SEND_CHAT, ChatEvent, tr("Chat Request"));
+  ADD_SENDTYPE(PP_SEND_FILE, FileEvent, tr("File Transfer"));
+  ADD_SENDTYPE(PP_SEND_CONTACT, ContactEvent, tr("Contact List"));
+  ADD_SENDTYPE(PP_SEND_SMS, SmsEvent, tr("SMS"));
+
+#undef ADD_SENDTYPE
 
   QMenu* mnuSendType = new QMenu(this);
@@ -161 +157 @@
   pushToolTip(cmbSendType, tr("Select type of message to send"));
   cmbSendType->setMenu(mnuSendType);
-  if (ppid == MSN_PPID)
+  if (eventTypesCount <= 1)
     cmbSendType->setEnabled(false);
 
@@ -169 +165 @@
   chkSendServer->setCheckable(true);
 
+  bool canSendDirect = (mySendFuncs & PP_SEND_DIRECT);
+
   ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
 
-  if (u != 0)
+  if (u != NULL)
   {
     chkSendServer->setChecked(u->SendServer() ||
@@ -177 +175 @@
 
     if (u->GetInGroup(GROUPS_SYSTEM, GROUP_INVISIBLE_LIST) ||
-        u->PPID() == MSN_PPID ||
         (u->Port() == 0 && u->SocketDesc(ICQ_CHNxNONE) == -1))
-    {
-      chkSendServer->setChecked(true);
-      chkSendServer->setEnabled(false);
-    }
+      canSendDirect = false;
 
     gUserManager.DropUser(u);
   }
-  else
+  if (!canSendDirect)
   {
     chkSendServer->setChecked(true);
@@ -700 +694 @@
   {
     case MessageEvent:
-      e = new UserSendMsgEvent(myUsers.front().c_str(), myPpid, parent);
+      if (mySendFuncs & PP_SEND_MSG)
+        e = new UserSendMsgEvent(myUsers.front().c_str(), myPpid, parent);
       break;
     case UrlEvent:
-      e = new UserSendUrlEvent(myUsers.front().c_str(), myPpid, parent);
+      if (mySendFuncs & PP_SEND_URL)
+        e = new UserSendUrlEvent(myUsers.front().c_str(), myPpid, parent);
       break;
     case ChatEvent:
-      e = new UserSendChatEvent(myUsers.front().c_str(), myPpid, parent);
+      if (mySendFuncs & PP_SEND_CHAT)
+        e = new UserSendChatEvent(myUsers.front().c_str(), myPpid, parent);
       break;
     case FileEvent:
-      e = new UserSendFileEvent(myUsers.front().c_str(), myPpid, parent);
+      if (mySendFuncs & PP_SEND_FILE)
+        e = new UserSendFileEvent(myUsers.front().c_str(), myPpid, parent);
       break;
     case ContactEvent:
-      e = new UserSendContactEvent(myUsers.front().c_str(), myPpid, parent);
+      if (mySendFuncs & PP_SEND_CONTACT)
+        e = new UserSendContactEvent(myUsers.front().c_str(), myPpid, parent);
       break;
     case SmsEvent:
-      e = new UserSendSmsEvent(myUsers.front().c_str(), myPpid, parent);
+      if (mySendFuncs & PP_SEND_SMS)
+        e = new UserSendSmsEvent(myUsers.front().c_str(), myPpid, parent);
       break;
     default:
@@ -721 +721 @@
   }
 
-  if (e != 0)
+  if (e != NULL)
   {
     if (e->mleSend != 0 && mleSend != 0)