#2351 don't enable webcam mixin if webcam flag is False, so 'top' cli…

…ent doesn't load it

git-svn-id: https://xpra.org/svn/Xpra/trunk@25159 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/client/gobject_client_base.py

@@ -121,7 +121,9 @@ def __init__(self, opts):
         self.printing = False
         #don't bother with many of these things for one-off commands:
         for x in ("ui_client", "wants_aliases", "wants_encodings",
-                  "wants_versions", "wants_features", "wants_sound", "windows"):
+                  "wants_versions", "wants_features", "wants_sound", "windows",
+                  "webcam",
+                  ):
             self.hello_extra[x] = False
 
     def setup_connection(self, conn):

src/xpra/server/source/webcam_mixin.py

@@ -35,7 +35,9 @@ class WebcamMixin(StubSourceMixin):
     @classmethod
     def is_needed(cls, caps : typedict) -> bool:
         #the 'webcam' capability was only added in v4,
-        #so we have to enabled the mixin:
+        #so we have to enable the mixin by default:
+        if not caps.boolget("webcam", True):
+            return False
         try:
             from xpra.codecs.pillow.decoder import HEADERS
             assert HEADERS