From: stephendenham <stephendenham@2dec19e3-eb1d-4749-8193-008c8bba0994>
Date: Wed, 28 Dec 2011 16:28:02 +0000 (+0000)
Subject: New icon for dark backgrounds. Socket timeout for Linux.
X-Git-Url: https://git.hcoop.net/clinton/xbmc-groove.git/commitdiff_plain/5b2e7132d931eb28f50bd0dff2d66a8a20462464

New icon for dark backgrounds. Socket timeout for Linux.

git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@72 2dec19e3-eb1d-4749-8193-008c8bba0994
---

diff --git a/addon.xml b/addon.xml
index ead02fb..5e57411 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.audio.groove" name="Grooveshark XBMC"
-	version="1.0.1" provider-name="Stephen Denham">
+	version="1.0.2" provider-name="Stephen Denham">
 	<requires>
 		<import addon="xbmc.python" version="2.0" />
 		<import addon="script.module.simplejson"/>
diff --git a/changelog.txt b/changelog.txt
index ee03994..2fc73e7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+1.0.2
+
+New icon for dark backgrounds. Socket timeout for Linux.
+
 1.0.1
 
 Bug fix.
diff --git a/description.xml b/description.xml
index 3ae1b2a..342a8a7 100644
--- a/description.xml
+++ b/description.xml
@@ -18,7 +18,7 @@
 	<title>Grooveshark XBMC</title>
 
 	<!-- (required) Major.minor.build -->
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 
 	<!--
 		(required) author name & email. at least one author name is required
diff --git a/icon.png b/icon.png
dissimilarity index 99%
index 7519e94..2d2ba74 100644
Binary files a/icon.png and b/icon.png differ
diff --git a/resources/img/default.tbn b/resources/img/default.tbn
dissimilarity index 99%
index 13716fb..1f8cc31 100644
Binary files a/resources/img/default.tbn and b/resources/img/default.tbn differ
diff --git a/resources/lib/GroovesharkAPI.py b/resources/lib/GroovesharkAPI.py
index a011276..d524ad2 100644
--- a/resources/lib/GroovesharkAPI.py
+++ b/resources/lib/GroovesharkAPI.py
@@ -15,7 +15,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with xbmc-groove.  If not, see <http://www.gnu.org/licenses/>.
 
-import urllib2, pprint, md5, os, pickle, tempfile, time, re, simplejson, base64
+import urllib2, pprint, md5, os, pickle, tempfile, time, re, simplejson, base64, sys, socket
 from blowfish import Blowfish
 
 SESSION_EXPIRY = 1209600 # 2 weeks
@@ -46,6 +46,9 @@ class GrooveAPI:
 		
 		self._debugging = debug
 		self.simplejson = simplejson
+		if "linux" in sys.platform.lower():
+			socket.setdefaulttimeout(30)
+			
 		self.cacheDir = os.path.join(tempfile.gettempdir(), 'groovesharkapi')
 		if os.path.isdir(self.cacheDir) == False:
 			os.makedirs(self.cacheDir)