#1838 randr belongs in display manager

git-svn-id: https://xpra.org/svn/Xpra/trunk@19439 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 25, 2018 · ff37278 · ff37278
1 parent 0e48a57
commit ff37278
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/src/xpra/server/gtk_server_base.py b/src/xpra/server/gtk_server_base.py
@@ -121,7 +121,6 @@ def do_get_info(self, proto, *args):
         vi = get_gtk_version_info()
         vi["type"] = "Python/gtk"
         info.setdefault("server", {}).update(vi)
-        info.setdefault("features", {})["randr"] = self.randr
         log("GTKServerBase.do_get_info took %ims", (monotonic_time()-start)*1000)
         return info
 

diff --git a/src/xpra/server/mixins/display_manager.py b/src/xpra/server/mixins/display_manager.py
@@ -55,6 +55,7 @@ def get_caps(self, source):
     def get_info(self, _proto):
         return {
             "display": {
+                "randr" : self.randr,
                 "bell"  : self.bell,
                 "cursors" : {
                     ""      : self.cursors,

diff --git a/src/xpra/server/server_base.py b/src/xpra/server/server_base.py
@@ -551,7 +551,6 @@ def get_packet_handlers_info(self):
 
     def get_features_info(self):
         i = {
-             "randr"            : self.randr,
              "sharing"          : self.sharing is not False,
              "idle_timeout"     : self.idle_timeout,
              }