[rhythmbox/gobject-introspection: 34/34] hack out the rest of the lyrics plugin engine list config

[Jonathan Matthew <jmatthew src gnome org>]

commit 6f1daf543d7affbdb6a137339a793b7e1dd10bf5
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Jul 14 15:39:55 2010 +1000

    hack out the rest of the lyrics plugin engine list config

 plugins/lyrics/lyrics/LyricsConfigureDialog.py |   13 +++++++------
 plugins/lyrics/lyrics/__init__.py              |    7 +++----
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/plugins/lyrics/lyrics/LyricsConfigureDialog.py b/plugins/lyrics/lyrics/LyricsConfigureDialog.py
index 332a715..2b67300 100644
--- a/plugins/lyrics/lyrics/LyricsConfigureDialog.py
+++ b/plugins/lyrics/lyrics/LyricsConfigureDialog.py
@@ -40,7 +40,7 @@ class LyricsConfigureDialog (object):
 
 		builder = Gtk.Builder()
 		builder.add_from_file(builder_file)
-			
+
 		self.dialog = builder.get_object("preferences_dialog")
 
 		self.choose_button = builder.get_object("choose_button")
@@ -63,7 +63,7 @@ class LyricsConfigureDialog (object):
 			checkbutton = Gtk.CheckButton(label = s['name'])
 			checkbutton.set_active(s['id'] in engines)
 			self.site_checks[site_id] = checkbutton
-			site_box.pack_start(checkbutton)
+			site_box.pack_start(checkbutton, True, True, 0)
 
 		site_box.show_all()
 
@@ -90,7 +90,7 @@ class LyricsConfigureDialog (object):
 		if len(self.path_display.get_text()) is not 0:
 			self.folder = self.path_display.get_text()
 
-		self.gconf.set_list(self.gconf_keys['engines'], GConf.ValueType.STRING, engines)
+		# self.gconf.set_list(self.gconf_keys['engines'], GConf.ValueType.STRING, engines)
 		self.gconf.set_string(self.gconf_keys['folder'], self.folder)
 
 	def choose_callback(self, widget):
@@ -118,9 +118,10 @@ class LyricsConfigureDialog (object):
 	
 	def get_prefs (self):
 		try:
-			engines = GConf.Client.get_default().get_list(self.gconf_keys['engines'], GConf.ValueType.STRING)
-			if engines is None:
-				engines = []
+			#engines = GConf.Client.get_default().get_list(self.gconf_keys['engines'], GConf.ValueType.STRING)
+			#if engines is None:
+			#	engines = []
+			engines = ["leoslyrics.com", "astraweb.com"]
 		except gobject.GError, e:
 			print e
 			engines = []
diff --git a/plugins/lyrics/lyrics/__init__.py b/plugins/lyrics/lyrics/__init__.py
index fa670ee..0cbe35c 100644
--- a/plugins/lyrics/lyrics/__init__.py
+++ b/plugins/lyrics/lyrics/__init__.py
@@ -384,10 +384,9 @@ class LyricsDisplayPlugin(RB.Plugin):
 			self.window.destroy ()
 			self.window = None
 
-	def create_configure_dialog(self, dialog=None):
-		if not dialog:
-			builder_file = self.find_file("lyrics-prefs.ui")
-			dialog = LyricsConfigureDialog (builder_file, gconf_keys).get_dialog()
+	def create_configure_dialog(self):
+		builder_file = self.find_file("lyrics-prefs.ui")
+		dialog = LyricsConfigureDialog (builder_file, gconf_keys).get_dialog()
 		dialog.present()
 		return dialog