[cinnamon/f19: 1/3] patch to fix spice download crash (bz 969162)

[leigh123linux]

commit 1c1c38111a13be178419915eee1e7c9faf3e331c
Author: Leigh Scott <leigh123linux at googlemail.com>
Date:   Fri May 31 02:30:38 2013 +0100

    patch to fix spice download crash (bz 969162)

 cinnamon.spec         |    5 ++++-
 spice_crash_fix.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 84efb39..4a99b23 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,6 +1,6 @@
 Name:           cinnamon
 Version:        1.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -184,6 +184,9 @@ fi
 %{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
 
 %changelog
+* Fri May 31 2013 leigh scott <leigh123linux at googlemail.com> - 1.8.6-2
+- patch to fix spice download crash (bz 969162)
+
 * Thu May 30 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.6-1
 - Update to version 1.8.6
 - patch to fix brightness applet (bz 967993)
diff --git a/spice_crash_fix.patch b/spice_crash_fix.patch
new file mode 100644
index 0000000..38d9e84
--- /dev/null
+++ b/spice_crash_fix.patch
@@ -0,0 +1,49 @@
+--- a/files/usr/lib/cinnamon-settings/bin/Spices.py
++++ b/files/usr/lib/cinnamon-settings/bin/Spices.py
+@@ -71,6 +71,8 @@ class Spice_Harvester:
+         self.cache_folder = self.get_cache_folder()
+         self.install_folder = self.get_install_folder()
+         self.index_cache = {}
++
++        self.error = None
+         self.themes = collection_type == "theme"
+         
+         if not os.path.exists(os.path.join(self.cache_folder, "index.json")):
+@@ -164,10 +166,8 @@ class Spice_Harvester:
+             self.load(lambda x: self.show_detail(uuid))
+             return
+ 
+-        self.load_assets([uuid])
+-        
+         appletData = self.index_cache[uuid] 
+-        
++
+         # Browsing the info within the app would be great (ala mintinstall) but until it is fully ready 
+         # and it gives a better experience (layout, comments, reviewing) than 
+         # browsing online we will open the link with an external browser 
+@@ -278,14 +278,13 @@ class Spice_Harvester:
+                 pass
+             self.errorMessage(_("Something went wrong with the spices download.  Please try refreshing the list again."), str(detail))
+ 
+-    def load_assets(self, uuids=None):
++    def load_assets(self):
+         self.progresslabel.set_text(_("Refreshing %s cache...") % (self.noun))
+         self.progress_button_abort.set_sensitive(True)
+         needs_refresh = 0
+         used_thumbs = []
+ 
+-        if uuids == None:
+-            uuids = self.index_cache.keys()
++        uuids = self.index_cache.keys()
+ 
+         for uuid in uuids:
+             if not self.themes:
+@@ -603,7 +602,7 @@ class Spice_Harvester:
+                 pass
+             self.progress_window.hide()
+             if self.abort_download == ABORT_ERROR:
+-                self.errorMessage(_("An error occurred while trying to access the server.  Please try again in a little while."), self.error or None)
++                self.errorMessage(_("An error occurred while trying to access the server.  Please try again in a little while."), self.error)
+             raise Exception(_('Download aborted.'))
+ 
+         return outfile