[awn-extras-applets/f14/master] * Thu Aug 05 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-18 - apply upstream fix for fil

[Leigh Scott]

commit db4f357aeec4aaa6f736e0f6c6e84a61f3719a86
Author: Leigh Scott <leigh123linux at googlemail.com>
Date:   Thu Aug 5 22:36:56 2010 +0100

    * Thu Aug 05 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-18
    - apply upstream fix for file-browser-launcher (Bz 604868)

 1331_1330.diff          |   21 +++++++++++++++++++++
 awn-extras-applets.spec |    8 ++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/1331_1330.diff b/1331_1330.diff
new file mode 100644
index 0000000..5963dad
--- /dev/null
+++ b/1331_1330.diff
@@ -0,0 +1,21 @@
+=== modified file 'applets/maintained/file-browser-launcher/prefs.py'
+--- applets/maintained/file-browser-launcher/prefs.py	2010-05-03 23:51:41 +0000
++++ applets/maintained/file-browser-launcher/prefs.py	2010-06-30 02:59:47 +0000
+@@ -221,10 +221,12 @@
+     self.places_all.set_active(True)
+ 
+     for place in self.places_ordered:
+-      val = self.places[place]
+-      if not ((type(val) == bool and val == True) or (type(val) == int and val == 2)):
+-        self.places_all.set_active(False)
+-        break
++      if place in self.places:
++        val = self.places[place]
++        if not ((type(val) == bool and val == True) or (type(val) == int and val == 2)):
++          self.places_all.set_active(False)
++          break
++
+     self.places_all.connect('toggled', self.check_toggled)
+     places_vbox.pack_start(self.places_all, False)
+ 
+
diff --git a/awn-extras-applets.spec b/awn-extras-applets.spec
index 0424795..daeaa7d 100644
--- a/awn-extras-applets.spec
+++ b/awn-extras-applets.spec
@@ -8,7 +8,7 @@
 
 Name:           awn-extras-applets
 Version:        0.4.0
-Release:        19%{?dist}
+Release:        18%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -27,6 +27,7 @@ Patch5:         1312_1311.diff
 Patch6:         1302_1301.diff
 Patch7:         1303_1302.diff
 Patch8:         1318_1317.diff
+Patch20:        1331_1330.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -104,6 +105,7 @@ awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
 %patch6 -p0 -b .1302_1301
 %patch7 -p0 -b .1303_1302
 %patch8 -p0 -b .1318_1317
+%patch20 -p0 -b .1331_1330
 
 cp -p %{SOURCE1} applets/unmaintained/MiMenu/icons
 
@@ -168,7 +170,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/awn-applet-pandora.schemas
 rm -f $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/applets/pandora.desktop
 
 
-
 %pre
 %gconf_schema_prepare awn-applet-awnterm awn-applet-bandwidth-monitor awn-applet-battery awn-applet-cairo-clock awn-applet-cairo-menu awn-applet-calendar awn-applet-comics awn-applet-cpufreq awn-applet-dialect awn-applet-digital-clock awn-applet-feeds awn-applet-file-browser-launcher awn-applet-garbage awn-applet-hardware-sensors awn-applet-mail awn-applet-media-control awn-applet-media-player awn-applet-mount awn-applet-notification-area awn-applet-notification-daemon awn-applet-places awn-applet-quit awn-applet-shinyswitcher awn-applet-slickswitcher awn-applet-stacks awn-applet-sysmon awn-applet-to-do awn-applet-volume-control awn-applet-weather awn-applet-webapplet awnsystemmonitor
 
@@ -214,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 05 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-18
+- apply upstream fix for file-browser-launcher (Bz 604868)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.4.0-19
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild