#2163 remove 'global-menus'

Xpra-org · Jul 15, 2022 · 4b7a3de · 4b7a3de
1 parent 7353767
commit 4b7a3de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/xpra/scripts/config.py b/xpra/scripts/config.py
@@ -641,7 +641,6 @@ def may_create_user_config(xpra_conf_filename=DEFAULT_XPRA_CONF_FILENAME):
                     "start-new-commands": bool,
                     "proxy-start-sessions": bool,
                     "desktop-fullscreen": bool,
-                    "global-menus"      : bool,
                     "forward-xdg-open"  : bool,
                     "modal-windows"     : bool,
                     "bandwidth-detection" : bool,
@@ -758,7 +757,7 @@ def may_create_user_config(xpra_conf_filename=DEFAULT_XPRA_CONF_FILENAME):
                   "av-sync", "swap-keys",
                   "opengl",
                   "start-new-commands",
-                  "desktop-fullscreen", "global-menus",
+                  "desktop-fullscreen",
                   "video-encoders", "csc-modules", "video-decoders",
                   "compressors", "packet-encoders",
                   "key-shortcut",
@@ -791,7 +790,7 @@ def may_create_user_config(xpra_conf_filename=DEFAULT_XPRA_CONF_FILENAME):
     "readonly", "keyboard-sync", "cursors", "bell", "notifications", "xsettings",
     "system-tray", "sharing", "lock", "windows", "webcam", "html", "http-scripts",
     "terminate-children", "exit-with-children", "exit-with-client",
-    "av-sync", "global-menus",
+    "av-sync",
     "forward-xdg-open", "modal-windows", "bandwidth-detection",
     "ssh-upgrade",
     "splash",
@@ -1073,7 +1072,6 @@ def get_defaults():
                     "mdns"              : not WIN32,
                     "swap-keys"         : OSX,  #only used on osx
                     "desktop-fullscreen": False,
-                    "global-menus"      : True,
                     "forward-xdg-open"  : None,
                     "modal-windows"     : False,
                     "bandwidth-detection" : True,

diff --git a/xpra/scripts/parsing.py b/xpra/scripts/parsing.py
@@ -846,6 +846,8 @@ def ignore(defaults):
         ignore_options(cmdline, defaults.keys())
         for k,v in defaults.items():
             hidden_options[k.replace("-", "_")] = v
+    #removed in 4.4:
+    ignore_options(cmdline, "global-menus")
     group = optparse.OptionGroup(parser, "Server Options",
                 "These options are only relevant on the server when using the %s mode." %
                 " or ".join(["'%s'" % x for x in get_server_modes()]))
@@ -1271,10 +1273,6 @@ def dcsv(v):
                           help="Which API to use for input devices. Default: %s." % defaults.input_devices)
     else:
         ignore({"input-devices" : INPUT_DEVICES[0]})
-    legacy_bool_parse("global-menus")
-    group.add_option("--global-menus", action="store",
-                      dest="global_menus", default=defaults.global_menus, metavar="yes|no",
-                      help="Forward application global menus. Default: %s." % enabled_str(defaults.global_menus))
     legacy_bool_parse("xsettings")
     if POSIX:
         group.add_option("--xsettings", action="store", metavar="auto|yes|no",