From 4faaea26b0d329f23b01a10b31a5df833143303a Mon Sep 17 00:00:00 2001
From: stephendenham <stephendenham@2dec19e3-eb1d-4749-8193-008c8bba0994>
Date: Sun, 6 Jan 2013 13:36:05 +0000
Subject: [PATCH] Frodo version.

git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@83 2dec19e3-eb1d-4749-8193-008c8bba0994
---
 addon.xml                              |  4 +-
 changelog.txt                          |  4 ++
 default.py                             |  4 +-
 description.xml                        | 75 --------------------------
 resources/language/English/strings.xml |  4 +-
 5 files changed, 10 insertions(+), 81 deletions(-)
 delete mode 100644 description.xml

diff --git a/addon.xml b/addon.xml
index f4a5cee..8dffb03 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.audio.groove" name="Grooveshark XBMC"
-	version="1.0.7" provider-name="Stephen Denham">
+	version="2.0.0" provider-name="Stephen Denham">
 	<requires>
-		<import addon="xbmc.python" version="2.0" />
+		<import addon="xbmc.python" version="2.1.0" />
 		<import addon="script.module.simplejson"/>
 	</requires>
 	<extension point="xbmc.python.pluginsource" library="default.py">
diff --git a/changelog.txt b/changelog.txt
index 5c623bf..df64849 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+2.0.0
+
+Frodo version.
+
 1.0.7
 
 Allow unicode symbols in playlist names.
diff --git a/default.py b/default.py
index 62d8938..1c71e7f 100644
--- a/default.py
+++ b/default.py
@@ -704,7 +704,7 @@ class Grooveshark:
     def _get_login(self):
         if (self.username == "" or self.password == ""):
             dialog = xbmcgui.Dialog()
-            dialog.ok(__language__(30008), __language__(30069), __language__(30070))
+            dialog.ok(__language__(30008), __language__(30069), __language__(30070), __language__(30082))
             return 0
         else:
             if self.userid == 0:
@@ -713,7 +713,7 @@ class Grooveshark:
                 return uid
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(__language__(30008), __language__(30069), __language__(30070))
+                dialog.ok(__language__(30008), __language__(30069), __language__(30070), __language__(30082))
                 return 0
     
     # File download            
diff --git a/description.xml b/description.xml
deleted file mode 100644
index 5dca06a..0000000
--- a/description.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addoninfo>
-	<!--
-		(required) guuid: unique identifier of this addon guuids can be
-		generated online at sites such as
-		http://www.famkruithof.net/uuid/uuidgen
-	-->
-	<guid>d2d9c790-fe2f-11df-8cff-0800200c9a66</guid>
-
-	<!--
-		(required) type: 1: visualization 2: skin 3: pvrdll 4: script 5:
-		scraper 6: screensaver 7: plugin-pvr 8: plugin-video 9: plugin-music
-		10: plugin-program 11: plugin-pictures 12: plugin-weather
-	-->
-	<type>9</type>
-
-	<!-- (required) Title -->
-	<title>Grooveshark XBMC</title>
-
-	<!-- (required) Major.minor.build -->
-	<version>1.0.7</version>
-
-	<!--
-		(required) author name & email. at least one author name is required
-	-->
-	<authors>
-		<author name="Stephen Denham" email="stephen.denham@gmail.com" />
-	</authors>
-
-	<!-- (required) Short description of addon. -->
-	<summary>Grooveshark addon for XBMC.</summary>
-
-	<!--
-		Longer descrption of addon. Usage instructions should go here if
-		required.
-	-->
-	<description lang="en">
-		Grooveshark addon for XBMC. You should enter your Grooveshark Anywhere username and password in the addon settings.
-	</description>
-	<!-- user defined tags e.g. <tags><tag>Example</tag></tags> -->
-	<tags>
-		<tag></tag>
-	</tags>
-
-	<!--
-		minimum revision of xbmc your addon will run on. Leave blank all
-		revisions
-	-->
-	<minrevision>r21819</minrevision>
-
-	<!--
-		platforms compatible with your addon. xbox, osx, windows, linux, or
-		all
-	-->
-	<platforms>
-		<platform>windows,linux, osx</platform>
-	</platforms>
-
-	<!--
-		list any dependancies (such as another addon, your addon may have.
-		minversion and maxversion are optional
-	-->
-	<dependencies>
-		<dependency minversion="" maxversion=""></dependency>
-	</dependencies>
-
-	<!--
-		(optional) Whatever is put in disclaimer will be shown before download
-		in an ok/cancel dialog. Keep it short and to the point.
-	-->
-	<disclaimer></disclaimer>
-
-	<!-- (optional) The License the addon is released under.-->
-	<license>GPL</license>
-</addoninfo>
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 67b5ea0..daba4b0 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -81,8 +81,8 @@
 	<string id="30078">Rename Grooveshark playlist</string>
 	<string id="30079"></string>		
 	<string id="30080"></string>
-	<string id="30081"></string>		
-			
+	<string id="30081"></string>
+	<string id="30082">Grooveshark Anywhere account is required.</string>		
 </strings>
 
 
-- 
2.20.1