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

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.

Files:

• trunk/qt4-gui/src/core/licqgui.cpp (modified) (3 diffs)

trunk/qt4-gui/src/core/licqgui.cpp

@@ -1143 +1143 @@
   }
 
-  // See if the clipboard contains a url or file (but only message events supported for msn)
-  if (Config::Chat::instance()->sendFromClipboard() && ppid != MSN_PPID)
+  // See if the clipboard contains a url or file
+  if (Config::Chat::instance()->sendFromClipboard())
   {
     QClipboard* clip = QApplication::clipboard();
@@ -1157 +1157 @@
     }
 
-    if (c.left(5) == "http:" || c.left(4) == "ftp:" || c.left(6) == "https:")
+    // Check which message types are supported for this protocol
+    unsigned long sendFuncs = 0xFFFFFFFF;
+    if (ppid != LICQ_PPID)
+    {
+      FOR_EACH_PROTO_PLUGIN_START(gLicqDaemon)
+      {
+        if ((*_ppit)->PPID() == ppid)
+        {
+          sendFuncs = (*_ppit)->SendFunctions();
+          break;
+        }
+      }
+      FOR_EACH_PROTO_PLUGIN_END
+    }
+
+    if (sendFuncs & PP_SEND_URL && (c.left(5) == "http:" || c.left(4) == "ftp:" || c.left(6) == "https:"))
     {
       UserEventCommon* ec = showEventDialog(UrlEvent, id, ppid);
@@ -1169 +1184 @@
       return;
     }
-    else if (c.left(5) == "file:" || c.left(1) == "/")
+    else if (sendFuncs & PP_SEND_FILE && (c.left(5) == "file:" || c.left(1) == "/"))
     {
       UserEventCommon* ec = showEventDialog(FileEvent, id, ppid);