openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-1092121 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-1092121/+merge/141255

XFCE change which need to be revoked as it pulled all the trunk changes into 2.0
-- 
https://code.launchpad.net/~trb143/openlp/bug-1092121/+merge/141255
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-1092121 into lp:openlp/2.0.

=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py	2012-11-11 21:16:14 +0000
+++ openlp/core/ui/advancedtab.py	2012-12-26 12:29:25 +0000
@@ -499,6 +499,9 @@
             # Default to False on Gnome.
             x11_bypass_default = bool(not
                 os.environ.get(u'GNOME_DESKTOP_SESSION_ID'))
+            # Default to False on XFce
+            if os.environ.get(u'DESKTOP_SESSION') == u'xfce':
+                x11_bypass_default = False
         self.x11BypassCheckBox.setChecked(settings.value(
             u'x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool())
         self.defaultColor = settings.value(u'default color',

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2012-11-11 21:16:14 +0000
+++ openlp/core/ui/maindisplay.py	2012-12-26 12:29:25 +0000
@@ -143,6 +143,9 @@
             # Default to False on Gnome.
             x11_bypass_default = bool(not
                 os.environ.get(u'GNOME_DESKTOP_SESSION_ID'))
+            # Default to False on XFce
+            if os.environ.get(u'DESKTOP_SESSION') == u'xfce':
+                x11_bypass_default = False
         if Settings().value(u'advanced/x11 bypass wm',
             QtCore.QVariant(x11_bypass_default)).toBool():
             windowFlags |= QtCore.Qt.X11BypassWindowManagerHint