[wallpapoz] And more fix for gsettings key name change Kill warnings on startup when wallpapoz tries to show wor

[Mamoru Tasaka]

commit 4e345c13e4dc12efdf4450e2af534b9ec910538c
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Fri May 6 00:38:48 2011 +0900

    And more fix for gsettings key name change
    Kill warnings on startup when wallpapoz tries to show workspace name
    as "images"

 wallpapoz-0.5-gsettings.patch                      |    8 ++--
 ...poz-0.5-startup-warn-about-workspace-name.patch |   31 ++++++++++++++++++++
 wallpapoz.spec                                     |   10 ++++++-
 3 files changed, 44 insertions(+), 5 deletions(-)
---
diff --git a/wallpapoz-0.5-gsettings.patch b/wallpapoz-0.5-gsettings.patch
index de36751..0456657 100644
--- a/wallpapoz-0.5-gsettings.patch
+++ b/wallpapoz-0.5-gsettings.patch
@@ -1,5 +1,5 @@
---- wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py.gsettings	2010-12-07 02:44:37.000000000 +0900
-+++ wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py	2011-04-16 00:13:47.000000000 +0900
+--- wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py.gsettings	2011-05-05 18:13:34.000000000 +0900
++++ wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py	2011-05-05 18:13:34.000000000 +0900
 @@ -171,6 +171,13 @@
      os.system('gconftool-2 -t string -s /desktop/gnome/background/picture_filename ' + 
  	'"' + wallpaper + '"' + ' -s /desktop/gnome/background/picture_options ' + 
@@ -15,7 +15,7 @@
    ## class method to detect that we have changed workspace or not
    def has_changed(self, previous_desktop, cur_desk):
 --- wallpapoz-0.5/share/wallpapoz/lib/xml_processing.py.gsettings	2010-03-08 13:41:50.000000000 +0900
-+++ wallpapoz-0.5/share/wallpapoz/lib/xml_processing.py	2010-12-07 02:57:27.000000000 +0900
++++ wallpapoz-0.5/share/wallpapoz/lib/xml_processing.py	2011-05-05 18:33:12.000000000 +0900
 @@ -57,7 +57,12 @@
      self.config_file = home + "/.wallpapoz/wallpapoz.xml"
  
@@ -24,7 +24,7 @@
 +    # First read from gsettings, then from gconf
 +    status=os.system("which gsettings &>/dev/null")
 +    if status == 0:
-+      self.current_wallpaper = os.popen("gsettings get org.gnome.desktop.background  picture-filename").read()[1:-2]
++      self.current_wallpaper = os.popen("gsettings get org.gnome.desktop.background  picture-uri").read()[1:-2].replace("file://","")
 +    if self.current_wallpaper == '':
 +      self.current_wallpaper = os.popen("gconftool-2 -g /desktop/gnome/background/picture_filename").read()[:-1]
      if self.current_wallpaper == '':
diff --git a/wallpapoz-0.5-startup-warn-about-workspace-name.patch b/wallpapoz-0.5-startup-warn-about-workspace-name.patch
new file mode 100644
index 0000000..bd83082
--- /dev/null
+++ b/wallpapoz-0.5-startup-warn-about-workspace-name.patch
@@ -0,0 +1,31 @@
+--- 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 @@
+ 
+     filename = self.store.get_value(position_iter, 1)
+ 
+-    # display image properly
+-    from glib import GError as glib_GError
+-    try:
++    # display image properly, when cursor actually points to the contents of
++    # files' list (i.e. not pointing to desktop name)
++    if parent == None:
++	self.image_widget.clear()
++    else:
++     from glib import GError as glib_GError
++     try:
+       anime = gtk.gdk.PixbufAnimation(filename)
+ 
+       if anime.is_static_image() :
+@@ -1318,9 +1322,9 @@
+         else:
+           self.image_widget.set_from_pixbuf(static_im.scale_simple(int((float(width)/height)*300),300,gtk.gdk.INTERP_BILINEAR))
+ 
+-    except IOError:
++     except IOError:
+       self.image_widget.clear()
+-    except glib_GError, (msg):
++     except glib_GError, (msg):
+       print msg
+       self.image_widget.clear()
+ 
diff --git a/wallpapoz.spec b/wallpapoz.spec
index f128283..16295a7 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.5
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      4
+%define         fedorarel      5
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -60,6 +60,8 @@ Patch9:		wallpapoz-0.4.1-rev92-delete-one-wallpaper.patch
 Patch10:	wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch
 # Port to gsettins
 Patch11:	wallpapoz-0.5-gsettings.patch
+# At startup, wallpapoz will try to show workspace name as "images"
+Patch12:	wallpapoz-0.5-startup-warn-about-workspace-name.patch
 
 BuildArch:      noarch
 
@@ -99,6 +101,7 @@ wallpapers for different workspaces or virtual desktops.
 %patch9 -p1 -b .deletelastone
 %patch10 -p1 -b .deletefirst
 %patch11 -p1 -b .gsettings
+%patch12 -p1 -b .workspace_img
 
 # Umm... permission fix
 find . -type f -print0 | xargs -0 chmod 0644
@@ -167,6 +170,11 @@ popd
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* 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
+  as "images"
+
 * Sat Apr 16 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5-4
 - Modify for gsettings key name change