[rhythmbox/gobject-introspection: 31/34] fix some stuff in the lyrics plugin, now it crashes

[Jonathan Matthew <jmatthew src gnome org>]

commit abbb9222e08f46856ad48fb98b150bd31aaddfb7
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Jul 14 13:43:09 2010 +1000

    fix some stuff in the lyrics plugin, now it crashes

 plugins/lyrics/lyrics/LyricsParse.py |    2 +-
 plugins/lyrics/lyrics/__init__.py    |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/plugins/lyrics/lyrics/LyricsParse.py b/plugins/lyrics/lyrics/LyricsParse.py
index 637517b..bdc6dda 100644
--- a/plugins/lyrics/lyrics/LyricsParse.py
+++ b/plugins/lyrics/lyrics/LyricsParse.py
@@ -40,7 +40,7 @@ class Parser (object):
 
 		try:
 			gconf = GConf.Client.get_default()
-			self.engines = gconf.get_list(gconf_keys['engines'], gconf.VALUE_STRING)
+			self.engines = gconf.get_list(gconf_keys['engines'], GConf.ValueType.STRING)
 			if self.engines is None:
 				self.engines = []
 		except gobject.GError, e:
diff --git a/plugins/lyrics/lyrics/__init__.py b/plugins/lyrics/lyrics/__init__.py
index 11746fb..c83fdd7 100644
--- a/plugins/lyrics/lyrics/__init__.py
+++ b/plugins/lyrics/lyrics/__init__.py
@@ -68,7 +68,7 @@ def create_lyrics_view():
 	sw.set_shadow_type(Gtk.ShadowType.IN)
 
 	vbox = Gtk.VBox(spacing=12)
-	vbox.pack_start(sw, expand=True)
+	vbox.pack_start(sw, True, True, 0)
 	
 	return (vbox, tview.get_buffer(), tview)
 
@@ -106,8 +106,8 @@ def get_artist_and_title(db, entry):
 	if stream_song_title is not None:
 		(artist, title) = extract_artist_and_title(stream_song_title)
 	else:
-		artist = db.entry_get_string(entry, RhythmDB.PropType.ARTIST)
-		title = db.entry_get_string(entry, RhythmDB.PropType.TITLE)
+		artist = entry.get_string(RhythmDB.PropType.ARTIST)
+		title = entry.get_string(RhythmDB.PropType.TITLE)
 	return (artist, title)
 
 def extract_artist_and_title(stream_song_title):
@@ -228,7 +228,7 @@ class LyricPane(object):
 		self.edit.connect('toggled', edit_callback)
 		self.discard = Gtk.Button(label=_("_Search again"))
 		self.discard.connect('clicked', discard_callback)
-		self.clear = Gtk.Button(stock=Gtk.STOCK_CLEAR)
+		self.clear = Gtk.Button.new_from_stock(Gtk.STOCK_CLEAR)
 		self.clear.connect('clicked', clear_callback)
 		self.hbox = Gtk.HButtonBox()
 		self.hbox.set_spacing (6)
@@ -240,7 +240,7 @@ class LyricPane(object):
 
 		(self.view, self.buffer, self.tview) = create_lyrics_view()
 
-		self.view.pack_start(self.hbox, expand=False, fill=False, padding=6)
+		self.view.pack_start(self.hbox, False, False, 6)
 		self.view.set_spacing(2)
 	
 		self.view.show_all()
@@ -296,15 +296,15 @@ class LyricWindow (Gtk.Window):
 		self.shell = shell
 		self.set_border_width(12)
 
-		close = Gtk.Button(stock=Gtk.STOCK_CLOSE)
+		close = Gtk.Button.new_from_stock(Gtk.STOCK_CLOSE)
 		close.connect('clicked', lambda w: self.destroy())
 	
 		(lyrics_view, buffer, tview) = create_lyrics_view()
 		self.buffer = buffer
 		bbox = Gtk.HButtonBox()
 		bbox.set_layout(Gtk.ButtonBoxStyle.END)
-		bbox.pack_start(close)
-		lyrics_view.pack_start(bbox, expand=False)
+		bbox.pack_start(close, True, True, 0)
+		lyrics_view.pack_start(bbox, False, False, 0)
 
 		sp = shell.get_player ()
 		self.ppc_id = sp.connect('playing-song-property-changed', self.playing_property_changed)