[rhythmbox] lyrics: remove the default lyrics folder

[Jonathan Matthew <jmatthew src gnome org>]

commit df7a9dce29b20e167bcd525e2a712a0f2887d5b4
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sun Jun 14 17:38:21 2009 +1000

    lyrics: remove the default lyrics folder
    
    This makes the plugin use the XDG cache dir rather than ~/.lyrics.

 data/rhythmbox.schemas            |    2 +-
 plugins/lyrics/lyrics/__init__.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/rhythmbox.schemas b/data/rhythmbox.schemas
index 52eb5fb..7a15021 100644
--- a/data/rhythmbox.schemas
+++ b/data/rhythmbox.schemas
@@ -1439,7 +1439,7 @@
 	<applyto>/apps/rhythmbox/plugins/lyrics/folder</applyto>
 	<owner>rhythmbox</owner>
         <type>string</type>
-        <default>~/.lyrics</default>
+        <default></default>
 	<locale name="C">
 	  <short>The directory to store lyrics in</short>
 	  <long>The directory to store lyrics in</long>
diff --git a/plugins/lyrics/lyrics/__init__.py b/plugins/lyrics/lyrics/__init__.py
index c7a21f2..a1645b4 100644
--- a/plugins/lyrics/lyrics/__init__.py
+++ b/plugins/lyrics/lyrics/__init__.py
@@ -103,7 +103,7 @@ def parse_song_data(artist, title):
 	
 def build_cache_path(artist, title):
 	folder = gconf.client_get_default().get_string(gconf_keys['folder'])
-	if folder is None:
+	if folder is None or folder == "":
 		folder = os.path.join(rb.user_cache_dir(), "lyrics")
 
 	lyrics_folder = os.path.expanduser (folder)