mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00
Code Issues Releases Wiki Activity

utils/apparmor/sandbox.py: set QT_X11_NO_NATIVE_MENUBAR=1

Browse Source 
utils/aa-sandbox.pod: update KNOWN LIMITATIONS for global menu
This commit is contained in:
Jamie Strandboge 2012-08-29 08:43:48 -05:00
parent 08d91ef714
commit a324724cf3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/aa-sandbox.pod
View File

@ -192,6 +192,10 @@ Using a nested X server for each application is expensive.
Only the old X cursor is available with B<xpra> and B<xpra3d>. Only the old X cursor is available with B<xpra> and B<xpra3d>.
The Ubuntu global menu is not currently supported. Gtk and Qt applications
should display the non-global menu by default, but applications like Firefox
and Thunderbird should be adjusted to disable the global menu.
=back =back
=head1 BUGS =head1 BUGS

2
utils/apparmor/sandbox.py
View File

@ -187,6 +187,7 @@ class SandboxXserver():
self.old_environ['DISPLAY'] = os.environ['DISPLAY'] self.old_environ['DISPLAY'] = os.environ['DISPLAY']
self.old_environ['XAUTHORITY'] = os.environ['XAUTHORITY'] self.old_environ['XAUTHORITY'] = os.environ['XAUTHORITY']
self.old_environ['UBUNTU_MENUPROXY'] = os.environ['UBUNTU_MENUPROXY'] self.old_environ['UBUNTU_MENUPROXY'] = os.environ['UBUNTU_MENUPROXY']
self.old_environ['QT_X11_NO_NATIVE_MENUBAR'] = os.environ['QT_X11_NO_NATIVE_MENUBAR']
# prepare the new environment # prepare the new environment
self.display, self.xauth = self.find_free_x_display() self.display, self.xauth = self.find_free_x_display()
@ -200,6 +201,7 @@ class SandboxXserver():
self.new_environ['XAUTHORITY'] = self.xauth self.new_environ['XAUTHORITY'] = self.xauth
# Disable the global menu for now # Disable the global menu for now
self.new_environ["UBUNTU_MENUPROXY"] = "" self.new_environ["UBUNTU_MENUPROXY"] = ""
self.new_environ["QT_X11_NO_NATIVE_MENUBAR"] = "1"
def cleanup(self): def cleanup(self):
'''Cleanup our forked pids, reset the environment, etc''' '''Cleanup our forked pids, reset the environment, etc'''