[rhythmbox] audioscrobbler: update gconf schemas, dist prefs builder file

[Jonathan Matthew <jmatthew src gnome org>]

commit 690d91e113a181600788f7b2aad8077805c89b85
Author: Jamie Nicol <jamie thenicols net>
Date:   Tue Aug 17 15:58:55 2010 +0100

    audioscrobbler: update gconf schemas, dist prefs builder file
    
    Ensures that enabled services selection works properly

 data/rhythmbox.schemas                            |   26 +++++++++++---------
 plugins/audioscrobbler/Makefile.am                |    4 ++-
 plugins/audioscrobbler/rb-audioscrobbler-plugin.c |    2 -
 3 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/data/rhythmbox.schemas b/data/rhythmbox.schemas
index ef3d5c7..802f612 100644
--- a/data/rhythmbox.schemas
+++ b/data/rhythmbox.schemas
@@ -800,25 +800,27 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/rhythmbox/audioscrobbler/password</key>
-        <applyto>/apps/rhythmbox/audioscrobbler/password</applyto>
+        <key>/schemas/apps/rhythmbox/plugins/audioscrobbler/service/enabled</key>
+        <applyto>/apps/rhythmbox/plugins/audioscrobbler/Last.fm/enabled</applyto>
+        <applyto>/apps/rhythmbox/plugins/audioscrobbler/Libre.fm/enabled</applyto>
         <owner>rhythmbox</owner>
-        <type>string</type>
-        <default></default>
+        <type>bool</type>
+        <default>TRUE</default>
         <locale name="C">
-	<short>Password for Last.fm</short>
-	<long>Password for Last.fm</long>
+	<short>True if the audioscrobbler service should be used</short>
+	<long>True if the audioscrobbler service should be used. Last.fm could be true and Libre.fm false, for example.</long>
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/rhythmbox/audioscrobbler/scrobbler_url</key>
-        <applyto>/apps/rhythmbox/audioscrobbler/scrobbler_url</applyto>
+        <key>/schemas/apps/rhythmbox/plugins/audioscrobbler/service/scrobbling_enabled</key>
+        <applyto>/apps/rhythmbox/plugins/audioscrobbler/Last.fm/scrobbling_enabled</applyto>
+        <applyto>/apps/rhythmbox/plugins/audioscrobbler/Libre.fm/scrobbling_enabled</applyto>
         <owner>rhythmbox</owner>
-        <type>string</type>
-        <default>http://post.audioscrobbler.com/</default>
+        <type>bool</type>
+        <default>TRUE</default>
         <locale name="C">
-	<short>URL for last.fm-style track submission</short>
-	<long>URL for last.fm-style track submission.  This can be used to direct track submission to an alternate service such as libre.fm.</long>
+	<short>True if played songs should be submitted to the audioscrobbler service</short>
+	<long>True if played songs should be submitted to the audioscrobbler service</long>
         </locale>
       </schema>
       <schema>
diff --git a/plugins/audioscrobbler/Makefile.am b/plugins/audioscrobbler/Makefile.am
index 8157794..1e97ab5 100644
--- a/plugins/audioscrobbler/Makefile.am
+++ b/plugins/audioscrobbler/Makefile.am
@@ -55,7 +55,9 @@ INCLUDES = 						\
 	-D_XOPEN_SOURCE -D_BSD_SOURCE
 
 gtkbuilderdir = $(plugindir)
-gtkbuilder_DATA = audioscrobbler-profile.ui
+gtkbuilder_DATA =					\
+	audioscrobbler-preferences.ui			\
+	audioscrobbler-profile.ui
 
 uixmldir = $(plugindir)
 uixml_DATA =						\
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-plugin.c b/plugins/audioscrobbler/rb-audioscrobbler-plugin.c
index c2821e0..74128d5 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-plugin.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-plugin.c
@@ -274,8 +274,6 @@ lastfm_enabled_changed_cb (GConfClient *client,
 	} else if (enabled == FALSE && plugin->lastfm_source != NULL) {
 		rb_source_delete_thyself (plugin->lastfm_source);
 		plugin->lastfm_source = NULL;
-	} else {
-		g_assert_not_reached ();
 	}
 }