rpms/wallpapoz/F-11 wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch, 1.2, 1.3 wallpapoz.spec, 1.31, 1.32

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch 
	wallpapoz.spec 
Log Message:
* Wed Mar 10 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-19.svn92_trunk
- Kill daemon_wallpapoz in more cases (may fix bug 571827)


wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch:
 wallpapoz_system.py |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

Index: wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-11/wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch	28 Feb 2010 17:59:31 -0000	1.2
+++ wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch	9 Mar 2010 19:03:25 -0000	1.3
@@ -1,5 +1,5 @@
---- wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2010-03-01 02:24:19.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py	2010-03-01 02:25:20.000000000 +0900
+--- wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2010-03-10 03:29:22.000000000 +0900
++++ wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py	2010-03-10 03:30:08.000000000 +0900
 @@ -24,9 +24,11 @@
  ## wallpapoz_system.py -- finds current desktop and changes wallpaper
  # achieve goal by calling external program
@@ -12,7 +12,7 @@
  
  class WallpapozSystem:
  
-@@ -49,12 +51,47 @@
+@@ -49,12 +51,46 @@
        self.finding_row_and_column()
      self.finding_total_workspaces()
  
@@ -25,7 +25,7 @@
 +        shell = True
 +        )
 +    except OSError:
-+      print "Fork failed for %s, exiting." %cmd
++      print "daemon_wallpapoz: fork failed for %s, exiting." %cmd
 +      sys.exit(1)
 +
 +    pstdout = p.stdout.read()
@@ -35,10 +35,8 @@
 +    kill_daemon = False
 +
 +    if (ret != 0) and (ret & 0xFF):
-+      if pstderr.find('unable to open display') >= 0:
-+        kill_daemon = True
-+      if ((cmd.find('xwininfo') >= 0) and 
-+        (pstderr.find("Can't get window attributes") >= 0)):
++        print "daemon_wallpapoz: %s returned status %i." %(cmd, ret)
++        print "daemon_wallpapoz: error message: %s" %pstderr
 +        kill_daemon = True
 +
 +    if (cmd.find('xprop') >= 0) and (pstdout.find('no such atom') >= 0):
@@ -46,7 +44,8 @@
 +
 +    if kill_daemon:
 +        ## No X resource available, kill daemon_wallpapoz
-+        print "X resource seems no longer available, killing daemon_wallpapoz."
++        print "daemon_wallpapoz: X resource seems no longer available."
++        print "daemon_wallpapoz: killing daemon_wallpapoz."
 +        sys.exit(1)
 +
 +    return pstdout
@@ -61,7 +60,7 @@
      start_width = raw_resolution.find('Width')
      end_width = raw_resolution.find('\n',start_width)
      start_height = raw_resolution.find('Height')
-@@ -67,11 +104,11 @@
+@@ -67,11 +103,11 @@
      if self.beryl:
        self.total_workspaces = self.row_workspaces * self.column_workspaces
      else:
@@ -75,7 +74,7 @@
      # output of xprop -root _NET_DESKTOP_GEOMETRY is '_NET_DESKTOP_GEOMETRY(CARDINAL) = 1024, 768\n'
      # and we just need the '1024, 768' part
      raw_geometry = raw_geometry[34:raw_geometry.find('\n')]
-@@ -102,7 +139,7 @@
+@@ -102,7 +138,7 @@
    ## class method to know what workspace we are in now
    def current_desktop(self):
      if self.beryl:
@@ -84,7 +83,7 @@
        # output of xprop -root _NET_DESKTOP_VIEWPORT is '_NET_DESKTOP_VIEWPORT(CARDINAL) = 1024, 768\n'
        # and we just need the '1024, 768' part
        raw_viewport = raw_viewport[34:raw_viewport.find('\n')]
-@@ -111,7 +148,7 @@
+@@ -111,7 +147,7 @@
        y_pos = int(viewport[1]) / self.screen_height
        workspace = x_pos + self.column_workspaces * y_pos
      else:


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-11/wallpapoz.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- wallpapoz.spec	28 Feb 2010 17:59:31 -0000	1.31
+++ wallpapoz.spec	9 Mar 2010 19:03:25 -0000	1.32
@@ -8,7 +8,7 @@
 %define         mainver         0.4.1
 %undefine         betaver
 %define         svnver          svn92_trunk
-%define         fedorarel       18
+%define         fedorarel       19
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -123,6 +123,9 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Mar 10 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-19.svn92_trunk
+- Kill daemon_wallpapoz in more cases (may fix bug 571827)
+
 * Mon Mar  1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-18.svn92_trunk
 - -compiz-respawn.patch: simplify
 - Handle more cases where X is no longer available (bug 569135)