rpms/awn-extras-applets/F-12 1310_1309.diff, NONE, 1.1 awn-extras-applets.spec, 1.34, 1.35

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/awn-extras-applets/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25074

Modified Files:
	awn-extras-applets.spec 
Added Files:
	1310_1309.diff 
Log Message:
* Thu May 27 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-10
- apply upstream fix for slickswitcher (Bz 591110)


1310_1309.diff:
 switch.py |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE 1310_1309.diff ---
=== modified file 'applets/maintained/slickswitcher/switch.py'
--- applets/maintained/slickswitcher/switch.py	2010-03-24 00:31:07 +0000
+++ applets/maintained/slickswitcher/switch.py	2010-05-27 21:21:37 +0000
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2010 sharkbaitbobby <sharkbaitbobby+awn at gmail.com>
 #
@@ -57,11 +56,18 @@
         if current_workspace is None:
             current_workspace = self.screen.get_active_workspace()
 
+        if current_workspace is None:
+            return 1
+
         #Get the workspace width
         workspace_width = current_workspace.get_width()
 
         #Return the number of columns
-        return workspace_width / self.width
+        num = workspace_width / self.width
+        if num <= 0:
+            return 1
+        else:
+            return num
 
     #Return the number of rows
     def get_num_rows(self, current_workspace=None):
@@ -69,11 +75,18 @@
         if current_workspace is None:
             current_workspace = self.screen.get_active_workspace()
 
+        if current_workspace is None:
+            return 1
+
         #Get the workspace height
         workspace_height = current_workspace.get_height()
 
         #Return the number of columns
-        return workspace_height / self.height
+        num = workspace_height / self.height
+        if num <= 0:
+            return 1
+        else:
+            return num
 
     #Return the number of the current workspace
     def get_current_workspace_num(self, current_workspace=None):
@@ -81,6 +94,9 @@
         if current_workspace is None:
             current_workspace = self.screen.get_active_workspace()
 
+        if current_workspace is None:
+            return 1
+
         if not current_workspace.is_virtual():
             return current_workspace.get_number() + 1
 
@@ -107,6 +123,9 @@
         #Get the current workspace
         current_workspace = self.screen.get_active_workspace()
 
+        if current_workspace is None:
+            return
+
         #Get the number of the current workspace
         current_workspace_num = self.get_current_workspace_num(current_workspace)
 



Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/F-12/awn-extras-applets.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- awn-extras-applets.spec	17 May 2010 07:41:12 -0000	1.34
+++ awn-extras-applets.spec	27 May 2010 21:50:37 -0000	1.35
@@ -8,7 +8,7 @@
 
 Name:           awn-extras-applets
 Version:        0.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -21,6 +21,7 @@ Patch0:         python_dir.patch
 #http://bazaar.launchpad.net/~awn-extras/awn-extras/trunk/revision/1305
 Patch1:         1305_1304.diff
 Patch2:         1306_1305.diff
+Patch3:         1310_1309.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,6 +93,7 @@ awn-extras-applets includes extras apple
 %patch0 -p0 -b .python_dir
 %patch1 -p0 -b .1305_1304
 %patch2 -p0 -b .1306_1305
+%patch3 -p0 -b .1310_1309
 cp -p %{SOURCE1} applets/unmaintained/MiMenu/icons
 
 
@@ -181,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 27 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-10
+- apply upstream fix for slickswitcher (Bz 591110)
+
 * Mon May 17 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-9
 - Add more requires python-vobject, python-gdata, python-dateutil,
   python-feedparser and gnome-python2-gconf