[KMess-commits] SF.net SVN: kmess:[5762] trunk/kmess/lib/src/utils/utils.cpp

[<it_...@us...>]

Revision: 5762
          http://kmess.svn.sourceforge.net/kmess/?rev=5762&view=rev
Author:   it_amroth
Date:     2009-12-29 14:03:40 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
Added better comments to the library capabilities code.

Modified Paths:
--------------
    trunk/kmess/lib/src/utils/utils.cpp

Modified: trunk/kmess/lib/src/utils/utils.cpp
===================================================================
--- trunk/kmess/lib/src/utils/utils.cpp	2009-12-29 13:54:21 UTC (rev 5761)
+++ trunk/kmess/lib/src/utils/utils.cpp	2009-12-29 14:03:40 UTC (rev 5762)
@@ -125,26 +125,23 @@
   // NOTE: When changing this property, all MSNP2P code need to be retested again!!
   // The capabilities are like a contract. The other client assumes everything works that's promised here.
 
-  quint64 capabilities =
-    MSN_CAP_INK_GIF  // If Isf-Qt is disabled, we can still receive GIF images
-  | MSN_CAP_WINKS
-  | MSN_CAP_MULTI_PACKET;
+  quint64 capabilities = MSN_CAP_MULTI_PACKET;
 
   // We can choose not to advertise any protocol-related caps, for p2p testing
 #if NOTIFICATION_HIDE_P2P_SUPPORT == 0
   capabilities |=  MSN_CAP_MSN75;
 #endif
 
-  // FIXME: only show webcam capability if the user has a webcam
-#if ENABLE_WEBCAM
+  // The library doesn't natively support Ink, it only acts as a transport for
+  // ink data. The client must be able to tell the lib that it supports isf and/or
+  // gif ink.
+#warning TODO: Allow enabling/disabling ISF/GIF ink support via some global call
+  capabilities |= MSN_CAP_INK_GIF;
+  capabilities |= MSN_CAP_INK_ISF;
+  // Same as above
+  capabilities |= MSN_CAP_WINKS;
   capabilities |= MSN_CAP_VIDEO_CHAT;
-#endif
 
-  // ISF support can be disabled at compile time
-#if KMESS_ENABLE_INK == 1
-  capabilities |= MSN_CAP_INK_ISF;
-#endif
-
   // NOTE: The caps are stored in an enum. Probably the MSN protocol development
   // team also had them into an enum, because they have no more available values
   // and resorted to another enum. The other enum's values are appended to the


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.