rpms/wallpapoz/devel wallpapoz-0.4.1-rev92-compiz-respawn.patch, 1.2, 1.3 wallpapoz.spec, 1.31, 1.32

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16331/devel

Modified Files:
	wallpapoz-0.4.1-rev92-compiz-respawn.patch wallpapoz.spec 
Log Message:
* Wed Feb 10 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-16.svn92_trunk
- Don't update compiz status to fix race (bug 562943)


wallpapoz-0.4.1-rev92-compiz-respawn.patch:
 share/wallpapoz/lib/wallpapoz_system.py |   14 ++++++++++++++
 src/daemon_wallpapoz                    |   19 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

Index: wallpapoz-0.4.1-rev92-compiz-respawn.patch
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/wallpapoz-0.4.1-rev92-compiz-respawn.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- wallpapoz-0.4.1-rev92-compiz-respawn.patch	8 Feb 2010 18:32:04 -0000	1.2
+++ wallpapoz-0.4.1-rev92-compiz-respawn.patch	9 Feb 2010 16:45:52 -0000	1.3
@@ -1,5 +1,5 @@
 --- wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py.compiz	2009-08-30 01:22:07.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py	2010-02-04 02:33:51.000000000 +0900
++++ wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py	2010-02-10 01:25:43.000000000 +0900
 @@ -25,6 +25,7 @@
  # achieve goal by calling external program
  
@@ -8,18 +8,19 @@
  import string
  
  class WallpapozSystem:
-@@ -73,6 +74,10 @@
+@@ -73,6 +74,11 @@
      if self.geometry_height!=self.screen_height:
        self.beryl = True
  
-+  def beryl_status(self):
-+    self.check_beryl()
++  def beryl_status(self, update = False):
++    if update:
++      self.check_beryl()
 +    return self.beryl
 +
    ## class method to find how many rows and columns of workspaces
    def finding_row_and_column(self):
      self.row_workspaces = self.geometry_height / self.screen_height
-@@ -113,3 +118,11 @@
+@@ -113,3 +119,11 @@
        return True
      else:
        return False
@@ -32,7 +33,7 @@
 +    sys.exit(1)
 +    return
 --- wallpapoz-0.4.1-svn92_trunk/src/daemon_wallpapoz.compiz	2009-08-30 01:22:07.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/src/daemon_wallpapoz	2010-02-04 02:31:21.000000000 +0900
++++ wallpapoz-0.4.1-svn92_trunk/src/daemon_wallpapoz	2010-02-10 01:30:29.000000000 +0900
 @@ -107,6 +107,9 @@
    delay = 60 * float(wallpapozxml.delay())
    randomvar = int(wallpapozxml.is_random())
@@ -52,7 +53,7 @@
 +	time.sleep(2)
 +
 +        # check if compiz is working every loop
-+        cur_beryl_status = wallpapoz_system.beryl_status()
++        cur_beryl_status = wallpapoz_system.beryl_status(update = True)
 +        if previous_beryl_status != cur_beryl_status:
 +          # compiz status changed, respawn daemon_wallpapoz
 +          print "Compiz status changed, respawning daemon_wallpapoz."


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/wallpapoz.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- wallpapoz.spec	8 Feb 2010 18:32:04 -0000	1.31
+++ wallpapoz.spec	9 Feb 2010 16:45:52 -0000	1.32
@@ -8,7 +8,7 @@
 %define         mainver         0.4.1
 %undefine         betaver
 %define         svnver          svn92_trunk
-%define         fedorarel       15
+%define         fedorarel       16
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -122,6 +122,9 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Feb 10 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-16.svn92_trunk
+- Don't update compiz status to fix race (bug 562943)
+
 * Tue Feb  9 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-15.svn92_trunk
 - Change the way to fix backtrace with no X resource issue