summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Leuenberger <dimstar@opensuse.org>2011-02-17 22:28:52 +0100
committerDominique Leuenberger <dimstar@opensuse.org>2011-02-17 22:28:52 +0100
commit030dc309b2d2f66579b9653279e920e8d8ae590b (patch)
tree1a2ef17aab317cfe642cdf08de5824107a462209
parent28dc57076fd11be48f8b90c679d251a5096d34bd (diff)
downloadsimple-ccsm-030dc309b2d2f66579b9653279e920e8d8ae590b.tar.gz
simple-ccsm-030dc309b2d2f66579b9653279e920e8d8ae590b.tar.bz2
Revert "When disbaling compiz, put a disable-compiz file to indicate so."
This reverts commit 28dc57076fd11be48f8b90c679d251a5096d34bd.
-rwxr-xr-xsimple-ccsm.in15
1 files changed, 1 insertions, 14 deletions
diff --git a/simple-ccsm.in b/simple-ccsm.in
index c5c225b..4e74929 100755
--- a/simple-ccsm.in
+++ b/simple-ccsm.in
@@ -1309,12 +1309,6 @@ class MainWin:
# Create a file that indicates wether compiz is enabled or not
path = os.path.expanduser("~/.config/compiz/enable-compiz")
open(path, "w+").close() # touch replacement
-
- path = os.path.expanduser("~/.config/compiz/disable-compiz")
- try:
- os.remove(path)
- except (IOError, OSError):
- pass
else:
fallbackWM = ""
if GnomeSession in os.environ and os.environ[GnomeSession]:
@@ -1334,18 +1328,11 @@ class MainWin:
except (IOError, OSError):
pass
- # Create a file that indicates compiz is explicitly disabled, so should not be started
- path = os.path.expanduser("~/.config/compiz/disable-compiz")
- open(path, "w+").close() # touch replacement
-
# Remove old config
files = ("~/.config/compiz/enable-compiz", "~/.config/compiz/compiz-manager")
for file in files:
path = os.path.expanduser(file)
- try:
- os.remove(path)
- except (IOError, OSError):
- pass
+ os.remove(path)
self.Notebook.set_sensitive(enabled)
self.ProfileChooser.set_sensitive(enabled)