Hello community, here is the log from the commit of package simple-ccsm checked in at Fri Nov 21 17:14:23 CET 2008. -------- --- simple-ccsm/simple-ccsm.changes 2008-11-14 11:13:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/simple-ccsm/simple-ccsm.changes 2008-11-21 13:58:47.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 21 13:55:08 CET 2008 - rodrigo@novell.com + +- If running compiz fails, disable desktop effects (bnc#407729) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simple-ccsm.spec ++++++ --- /var/tmp/diff_new_pack.kr6892/_old 2008-11-21 17:14:16.000000000 +0100 +++ /var/tmp/diff_new_pack.kr6892/_new 2008-11-21 17:14:16.000000000 +0100 @@ -24,7 +24,7 @@ Group: System/X11/Utilities PreReq: %fillup_prereq Version: 0.7.8 -Release: 8 +Release: 9 Requires: compiz python-compizconfig python-xml compiz-manager compiz-fusion-plugins-main compizconfig-settings-manager Summary: Simple Settings Manager for Compiz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,6 +82,8 @@ %{py_sitedir}/* %changelog +* Fri Nov 21 2008 rodrigo@novell.com +- If running compiz fails, disable desktop effects (bnc#407729) * Fri Nov 14 2008 rodrigo@novell.com - Review and merge changes from X11:Compiz * Fri Nov 14 2008 cyberorg@opensuse.org ++++++ simple-ccsm-cm-dry.patch ++++++ --- /var/tmp/diff_new_pack.kr6892/_old 2008-11-21 17:14:16.000000000 +0100 +++ /var/tmp/diff_new_pack.kr6892/_new 2008-11-21 17:14:16.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- simple-ccsm.in.orig +++ simple-ccsm.in -@@ -1220,10 +1220,11 @@ class MainWin: +@@ -1220,10 +1220,7 @@ class MainWin: enabled = self.EnableEffectsButton.get_active() if enabled: # First try to check if compiz can be run @@ -10,15 +10,21 @@ - proc = subprocess.Popen(cmd, shell=True) - proc.wait() - if proc.returncode != 0: -+ #cmd = CompizDryRunCommand.split(" ") -+ #proc = subprocess.Popen(cmd, shell=True) -+ #proc.wait() -+ #if proc.returncode != 0: + if os.system(CompizDryRunCommand) != 0: # Dry run detected problems, warn the user dialog = gtk.Dialog () dialog.set_title("Error") -@@ -1291,8 +1292,10 @@ class MainWin: +@@ -1268,6 +1265,9 @@ class MainWin: + # Start compiz + cmd = CompizStartCommand.split(" ") + subprocess.Popen(cmd) ++ if subprocess.returncode != 0: ++ self.EnableEffectsButton.set_active(False) ++ return + + # Enable compiz in kde + try: +@@ -1297,8 +1297,10 @@ class MainWin: subprocess.Popen(cmd) # Reset window manager config for KDE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de