#3592 remove unused rpc subsystem

Xpra-org · Jul 26, 2023 · 058f8f2 · 058f8f2
1 parent 8c442a2
commit 058f8f2
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 237 deletions.
diff --git a/xpra/client/gui/client_window_base.py b/xpra/client/gui/client_window_base.py
@@ -932,16 +932,6 @@ def keyboard_layout_changed(self, *args) -> None:
         self._client.window_keyboard_layout_changed(self)
 
 
-    def dbus_call(self, *args, **kwargs) -> None:
-        #alias for rpc_call using dbus as rpc_type, see UIXpraClient.dbus_call
-        if not self._client.server_dbus_proxy:
-            log.error("Error: cannot send remote dbus call:")
-            log.error(" this server does not support dbus-proxying")
-            return
-        rpc_args = [self.wid]+list(args)
-        self._client.rpc_call("dbus", rpc_args, **kwargs)
-
-
     def get_mouse_event_wid(self, *_args) -> int:
         #used to be overridden in GTKClientWindowBase
         return self.wid

diff --git a/xpra/client/gui/ui_client_base.py b/xpra/client/gui/ui_client_base.py
@@ -55,9 +55,6 @@
 if mixin_features.notifications:
     from xpra.client.mixins.notifications import NotificationClient
     CLIENT_BASES.append(NotificationClient)
-if mixin_features.dbus:
-    from xpra.client.mixins.rpc import RPCClient
-    CLIENT_BASES.append(RPCClient)
 if mixin_features.mmap:
     from xpra.client.mixins.mmap import MmapClient
     CLIENT_BASES.append(MmapClient)

diff --git a/xpra/client/mixins/rpc.py b/xpra/client/mixins/rpc.py
diff --git a/xpra/log.py b/xpra/log.py
@@ -159,7 +159,6 @@ def enable_format(format_string:str) -> None:
                 "fps"           : "Frames per second",
                 "xsettings"     : "XSettings synchronization",
                 "dbus"          : "DBUS calls",
-                "rpc"           : "Remote Procedure Calls",
                 "menu"          : "Menus",
                 "events"        : "System and window events",
                 },

diff --git a/xpra/net/common.py b/xpra/net/common.py
@@ -119,8 +119,6 @@ class ConnectionClosedException(Exception):
     "clipboard-contents", "clipboard-contents-none", "clipboard-pending-requests", "clipboard-enable-selections",
     #notifications:
     "notify_show", "notify_close",
-    #rpc:
-    "rpc-reply",
     ]
 
 def get_log_packets(exclude=False) -> Tuple[str, ...]:

diff --git a/xpra/server/mixins/dbusrpc.py b/xpra/server/mixins/dbusrpc.py
diff --git a/xpra/server/server_base.py b/xpra/server/server_base.py
@@ -51,9 +51,6 @@ def get_server_base_classes() -> Tuple[Type,...]:
     if server_features.input_devices:
         from xpra.server.mixins.input import InputServer
         classes.append(InputServer)
-    if server_features.dbus:
-        from xpra.server.mixins.dbusrpc import DBUS_RPC_Server
-        classes.append(DBUS_RPC_Server)
     if server_features.encoding:
         from xpra.server.mixins.encoding import EncodingServer
         classes.append(EncodingServer)

diff --git a/xpra/server/source/client_connection.py b/xpra/server/source/client_connection.py
@@ -399,8 +399,3 @@ def set_deflate(self, level : int):
     def send_client_command(self, *args):
         if self.hello_sent:
             self.send_more("control", *args)
-
-
-    def rpc_reply(self, *args):
-        if self.hello_sent:
-            self.send("rpc-reply", *args)