From a10c6eb2f0e6478318737fba6ef8d25288168ceb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Jul 2023 17:21:18 +0200 Subject: [PATCH] #3592 assume info-namespace (unused anyway?) --- xpra/client/base/gobject_client_base.py | 4 ---- xpra/client/mixins/network_state.py | 1 - xpra/server/source/client_connection.py | 2 -- 3 files changed, 7 deletions(-) diff --git a/xpra/client/base/gobject_client_base.py b/xpra/client/base/gobject_client_base.py index b554676f50..bc878ff260 100644 --- a/xpra/client/base/gobject_client_base.py +++ b/xpra/client/base/gobject_client_base.py @@ -279,8 +279,6 @@ class InfoXpraClient(CommandConnectClient): def __init__(self, opts): super().__init__(opts) self.hello_extra["request"] = "info" - if FLATTEN_INFO>=1: - self.hello_extra["info-namespace"] = True def timeout(self, *_args): self.warn_and_quit(ExitCode.TIMEOUT, "timeout: did not receive the info") @@ -357,7 +355,6 @@ def __init__(self, opts, **kwargs): "request" : "connect_test", #tells proxy servers we don't want to connect to the real / new instance: "connect" : False, - "info-namespace" : True, }) self.hello_extra.update(kwargs) @@ -393,7 +390,6 @@ def __init__(self, opts): self.hello_extra[f"wants_{x}"] = True self.hello_extra.setdefault("wants", []).append(x) self.hello_extra["request"] = "event" - self.hello_extra["info-namespace"] = True def timeout(self, *args): pass diff --git a/xpra/client/mixins/network_state.py b/xpra/client/mixins/network_state.py index 67fba1225d..14232096d4 100644 --- a/xpra/client/mixins/network_state.py +++ b/xpra/client/mixins/network_state.py @@ -205,7 +205,6 @@ def get_info(self) -> Dict[str,Any]: def get_caps(self) -> Dict[str,Any]: caps : Dict[str, Any] = { "network-state" : True, - "info-namespace" : True, #v4 servers assume this is always supported } ssh_auth_sock = os.environ.get("SSH_AUTH_SOCK") if SSH_AGENT and ssh_auth_sock and os.path.isabs(ssh_auth_sock): diff --git a/xpra/server/source/client_connection.py b/xpra/server/source/client_connection.py index 7780067a34..7eae4e826d 100644 --- a/xpra/server/source/client_connection.py +++ b/xpra/server/source/client_connection.py @@ -104,7 +104,6 @@ def __repr__(self) -> str: def init_state(self): self.hello_sent = False - self.info_namespace = False self.share = False self.lock = False self.control_commands : Tuple[str,...] = () @@ -198,7 +197,6 @@ def update_bandwidth_limits(self): def parse_client_caps(self, c : typedict): #general features: - self.info_namespace = c.boolget("info-namespace", True) self.share = c.boolget("share") self.lock = c.boolget("lock") self.control_commands = c.strtupleget("control_commands")