rpms/wallpapoz/F-12 wallpapoz-0.4.1-rev92-compiz-respawn.patch, 1.3, 1.4 wallpapoz.spec, 1.32, 1.33

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5553/F-12

Modified Files:
	wallpapoz-0.4.1-rev92-compiz-respawn.patch wallpapoz.spec 
Log Message:
* Fri Feb 26 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-17.svn92_trunk
- Another try for race condition on checking compiz status
  (bug 567437)


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

Index: wallpapoz-0.4.1-rev92-compiz-respawn.patch
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-12/wallpapoz-0.4.1-rev92-compiz-respawn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wallpapoz-0.4.1-rev92-compiz-respawn.patch	9 Feb 2010 16:45:51 -0000	1.3
+++ wallpapoz-0.4.1-rev92-compiz-respawn.patch	25 Feb 2010 19:57:10 -0000	1.4
@@ -1,6 +1,6 @@
 --- 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-10 01:25:43.000000000 +0900
-@@ -25,6 +25,7 @@
++++ wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py	2010-02-26 04:44:33.000000000 +0900
+@@ -25,14 +25,28 @@
  # achieve goal by calling external program
  
  import os
@@ -8,7 +8,28 @@
  import string
  
  class WallpapozSystem:
-@@ -73,6 +74,11 @@
+ 
++  # Define static variable to save the initial value of self.beryl
++  static_check_beryl_called_p = False
++  static_beryl = False
++
+   def __init__(self):
+     self.wallpaper_style = 'scaled'
+     self.finding_screen_resolution()
++
++    # Save the first result of self.beryl, and respawn daemon
++    # if self.beryl value changed.
+     self.check_beryl()
++    if not WallpapozSystem.static_check_beryl_called_p :
++      WallpapozSystem.static_check_beryl_called_p = True
++      WallpapozSystem.static_beryl = self.beryl
++    if self.beryl != WallpapozSystem.static_beryl :
++      self.respawn_system()
++
+     if self.beryl:
+       self.finding_row_and_column()
+     self.finding_total_workspaces()
+@@ -73,6 +87,11 @@
      if self.geometry_height!=self.screen_height:
        self.beryl = True
  
@@ -20,7 +41,7 @@
    ## 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 +119,11 @@
+@@ -113,3 +132,11 @@
        return True
      else:
        return False
@@ -33,7 +54,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-10 01:30:29.000000000 +0900
++++ wallpapoz-0.4.1-svn92_trunk/src/daemon_wallpapoz	2010-02-26 04:44:12.000000000 +0900
 @@ -107,6 +107,9 @@
    delay = 60 * float(wallpapozxml.delay())
    randomvar = int(wallpapozxml.is_random())


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-12/wallpapoz.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- wallpapoz.spec	9 Feb 2010 16:45:52 -0000	1.32
+++ wallpapoz.spec	25 Feb 2010 19:57:10 -0000	1.33
@@ -8,7 +8,7 @@
 %define         mainver         0.4.1
 %undefine         betaver
 %define         svnver          svn92_trunk
-%define         fedorarel       16
+%define         fedorarel       17
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -122,6 +122,10 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Feb 26 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-17.svn92_trunk
+- Another try for race condition on checking compiz status
+  (bug 567437)
+
 * 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)