[wallpapoz/f15] Fix crash witching from desktop style XML to workspace style one with workspace number increased (bu

[Mamoru Tasaka]

commit eff7ce7da18013b12cfb2f4e3f932b43c3ad6f34
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Wed Jun 1 00:33:36 2011 +0900

    Fix crash witching from desktop style XML to workspace style one
    with workspace number increased (bug 708769)

 ...lpaper-to-desktop-with-workspace-increase.patch |   22 ++++++++++++++++++++
 wallpapoz.spec                                     |   16 +++++++++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch b/wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
new file mode 100644
index 0000000..d6c5d95
--- /dev/null
+++ b/wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
@@ -0,0 +1,22 @@
+--- wallpapoz-0.5/src/wallpapoz.workspace_num_incr	2011-05-31 23:12:48.000000000 +0900
++++ wallpapoz-0.5/src/wallpapoz	2011-06-01 00:07:16.000000000 +0900
+@@ -723,12 +723,17 @@
+       # make the wallpaper list
+       wallpapoz_system = WallpapozSystem()
+       workspace_num = wallpapoz_system.get_total_workspaces()
++      ii = 0
+       for i in range(workspace_num):
+-	parent = self.store.append(None, [i+1, worklist[i].pop(0), True])
++	if (ii >= len(worklist)):
++         ii = 0 
++	tmplist = list(worklist[ii])
++	parent = self.store.append(None, [i+1, tmplist.pop(0), True])
+ 	j = 1
+-	for wallpaper in worklist[i]:
++	for wallpaper in tmplist:
+ 	  self.store.append(parent, [j, wallpaper, False])
+ 	  j = j + 1
++	ii = ii + 1
+ 
+       # enable rename workspace menu
+       self.main_window.get_widget("rename_workspace").set_sensitive(True)
diff --git a/wallpapoz.spec b/wallpapoz.spec
index bf21282..0d6f5ae 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.5
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      6
+%define         fedorarel      8
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -62,6 +62,10 @@ Patch10:	wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch
 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
+# Fix backtrace when switching from desktop style XML to workspace style one
+# with workspace number increased
+# bug 708769
+Patch13:	wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
 
 BuildArch:      noarch
 
@@ -100,7 +104,9 @@ wallpapers for different workspaces or virtual desktops.
 %patch8 -p1 -b .nonutf8
 %patch9 -p1 -b .deletelastone
 %patch10 -p1 -b .deletefirst
+%if 0%{?fedora} >= 15
 %patch11 -p1 -b .gsettings
+%endif
 %patch12 -p1 -b .workspace_img
 
 # Umm... permission fix
@@ -170,6 +176,14 @@ popd
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Jun  1 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5-8
+- Fix crash witching from desktop style XML to workspace style one
+  with workspace number increased (bug 708769)
+
+* Mon May  9 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5-6.1
+- F-14: kill gsettings patch explicitly: F-14 gsettings crashes
+  every time key is not found
+
 * 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)