[wallpapoz/f15/master] Fix crash on wallpapoz with desktop style xml which was introduced in -5 (bug 702538)

[Mamoru Tasaka]

commit f139aa067cc22e3d4f6e17206fe2a33dad6b9d4e
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Fri May 6 15:52:01 2011 +0900

    Fix crash on wallpapoz with desktop style xml which was introduced
    in -5 (bug 702538)

 ...poz-0.5-startup-warn-about-workspace-name.patch |   11 ++++++-----
 wallpapoz.spec                                     |    6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/wallpapoz-0.5-startup-warn-about-workspace-name.patch b/wallpapoz-0.5-startup-warn-about-workspace-name.patch
index bd83082..e4a397d 100644
--- a/wallpapoz-0.5-startup-warn-about-workspace-name.patch
+++ b/wallpapoz-0.5-startup-warn-about-workspace-name.patch
@@ -1,6 +1,6 @@
---- wallpapoz-0.5/src/wallpapoz.startupwarn	2011-05-05 18:13:34.000000000 +0900
-+++ wallpapoz-0.5/src/wallpapoz	2011-05-06 00:13:51.000000000 +0900
-@@ -1296,9 +1296,13 @@
+--- wallpapoz-0.5/src/wallpapoz.startupwarn	2011-05-06 00:21:06.000000000 +0900
++++ wallpapoz-0.5/src/wallpapoz	2011-05-06 15:41:58.000000000 +0900
+@@ -1296,9 +1296,14 @@
  
      filename = self.store.get_value(position_iter, 1)
  
@@ -9,7 +9,8 @@
 -    try:
 +    # display image properly, when cursor actually points to the contents of
 +    # files' list (i.e. not pointing to desktop name)
-+    if parent == None:
++    if ( (type(self.store) == gtk.TreeStore) and
++	( parent == None ) ):
 +	self.image_widget.clear()
 +    else:
 +     from glib import GError as glib_GError
@@ -17,7 +18,7 @@
        anime = gtk.gdk.PixbufAnimation(filename)
  
        if anime.is_static_image() :
-@@ -1318,9 +1322,9 @@
+@@ -1318,9 +1323,9 @@
          else:
            self.image_widget.set_from_pixbuf(static_im.scale_simple(int((float(width)/height)*300),300,gtk.gdk.INTERP_BILINEAR))
  
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 16295a7..bf21282 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.5
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      5
+%define         fedorarel      6
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -170,6 +170,10 @@ popd
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri May  6 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5-6
+- Fix crash on wallpapoz with desktop style xml which was introduced
+  in -5 (bug 702538)
+
 * Fri May  5 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5-5
 - And more fix for gsettings key name change
 - Kill warnings on startup when wallpapoz tries to show workspace name