Mailinglist Archive: opensuse-commit (1943 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package simple-ccsm
checked in at Fri Nov 28 16:03:54 CET 2008.


--------
--- simple-ccsm/simple-ccsm.changes     2008-11-21 13:58:47.000000000 +0100
+++ simple-ccsm/simple-ccsm.changes     2008-11-27 19:45:36.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 27 19:44:35 CET 2008 - rodrigo@xxxxxxxxxx
+
+- Improve rollback mechanism with a timeout'ed dialog, which
+  restores previous settings if something goes wrong
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ simple-ccsm.spec ++++++
--- /var/tmp/diff_new_pack.X20888/_old  2008-11-28 16:03:21.000000000 +0100
+++ /var/tmp/diff_new_pack.X20888/_new  2008-11-28 16:03:21.000000000 +0100
@@ -24,7 +24,7 @@
 Group:          System/X11/Utilities
 PreReq:         %fillup_prereq
 Version:        0.7.8 
-Release:        9
+Release:        10
 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,9 @@
 %{py_sitedir}/*
 
 %changelog
+* Thu Nov 27 2008 rodrigo@xxxxxxxxxx
+- Improve rollback mechanism with a timeout'ed dialog, which
+  restores previous settings if something goes wrong
 * Fri Nov 21 2008 rodrigo@xxxxxxxxxx
 - If running compiz fails, disable desktop effects (bnc#407729)
 * Fri Nov 14 2008 rodrigo@xxxxxxxxxx

++++++ simple-ccsm-cm-dry.patch ++++++
--- /var/tmp/diff_new_pack.X20888/_old  2008-11-28 16:03:21.000000000 +0100
+++ /var/tmp/diff_new_pack.X20888/_new  2008-11-28 16:03:21.000000000 +0100
@@ -2,7 +2,24 @@
 ===================================================================
 --- simple-ccsm.in.orig
 +++ simple-ccsm.in
-@@ -1220,10 +1220,7 @@ class MainWin:
+@@ -1213,6 +1213,16 @@ class MainWin:
+         self.Notebook.set_sensitive(running)
+         self.ProfileChooser.set_sensitive(running)
+ 
++    def EffectsEnabledDialogResponse(self, response, dialog):
++        if response != gtk.RESPONSE_OK:
++            self.EnableEffectsButton.set_active(False)
++            os.system("killall -9 compiz")
++
++        dialog.destroy()
++
++    def EffectsEnabledDialogTimeout(self, dialog):
++        self.EffectsEnabledDialogResponse(gtk.RESPONSE_CANCEL, dialog)
++
+     def EnableDesktopEffectsChanged(self, widget):
+         if self.Block > 0:
+             return
+@@ -1220,10 +1230,7 @@ class MainWin:
          enabled = self.EnableEffectsButton.get_active()
          if enabled:
              # First try to check if compiz can be run
@@ -14,17 +31,51 @@
                  # Dry run detected problems, warn the user
                  dialog = gtk.Dialog ()
                  dialog.set_title("Error")
-@@ -1268,6 +1265,9 @@ class MainWin:
+@@ -1231,11 +1238,11 @@ class MainWin:
+                 label = gtk.Label(_("Desktop effects are not supported on 
your current hardware / configuration. Would you like to cancel enabling of 
desktop effects or run them anyway?"))
+                 label.set_line_wrap(True)
+                 dialog.vbox.pack_start(label,
+-                                       gtk.TRUE,
+-                                       gtk.FALSE,
++                                       True,
++                                       False,
+                                        3)
+                 dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
+-                dialog.add_button("Run anyway", gtk.RESPONSE_OK)
++                dialog.add_button(_("Run anyway"), gtk.RESPONSE_OK)
+                 dialog.show_all()
+                 response = dialog.run()
+                 dialog.destroy()
+@@ -1267,7 +1274,7 @@ class MainWin:
+ 
              # Start compiz
              cmd = CompizStartCommand.split(" ")
-             subprocess.Popen(cmd)
-+            if subprocess.returncode != 0:
-+                self.EnableEffectsButton.set_active(False)
-+                return
+-            subprocess.Popen(cmd)
++            proc = subprocess.Popen(cmd)
  
              # Enable compiz in kde
              try:
-@@ -1297,8 +1297,10 @@ class MainWin:
+@@ -1284,6 +1291,19 @@ class MainWin:
+                 os.remove(path)
+             except (IOError, OSError):
+                 pass
++
++            # Show a timeout dialog to rollback if there's any problem
++            dialog = gtk.Dialog()
++            dialog.set_title(_("Desktop effects enabled"))
++            dialog.set_border_width(6)
++            label = gtk.Label(_("Do you want to keep these settings or return 
to the previous settings? In 10 seconds, previous settings will be restored if 
you don't aknowledge the changes to your configuration"))
++            label.set_line_wrap(True)
++            dialog.vbox.pack_start(label, True, False, 3)
++            dialog.add_button(_("Keep previous settings"), 
gtk.RESPONSE_CANCEL)
++            dialog.add_button(_("Use new settings"), gtk.RESPONSE_OK)
++            dialog.connect("response", self.EffectsEnabledDialogResponse, 
dialog)
++            dialog.show_all()
++            gobject.timeout_add(10000, self.EffectsEnabledDialogTimeout, 
dialog)
+         else:
+             fallbackWM = ""
+             if GnomeSession in os.environ and os.environ[GnomeSession]:
+@@ -1297,8 +1317,10 @@ class MainWin:
                  subprocess.Popen(cmd)
  
              # Reset window manager config for KDE


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx