[gnome-music/wip/merge: 269/343] grilo: remove duplicating get_album_songs function

[Ignacio Casal Quinteiro <icq src gnome org>]

commit fa002f04742560676a74b29c92f43d823250baf1
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Thu Jul 18 14:13:57 2013 +0200

    grilo: remove duplicating get_album_songs function

 gnomemusic/grilo.py   |    7 +++----
 gnomemusic/widgets.py |    8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py
index 077ef49..303fcee 100644
--- a/gnomemusic/grilo.py
+++ b/gnomemusic/grilo.py
@@ -60,6 +60,9 @@ class Grilo(GObject.GObject):
     def populate_songs(self, offset, callback, count=50):
         self.populate_items(Query.SONGS, offset, callback)
 
+    def populate_album_songs(self, album_id, callback):
+        self.populate_items(Query.album_songs(album_id), 0, callback)
+
     def populate_items(self, query, offset, callback, count=50):
         options = self.options.copy()
         options.set_skip(offset)
@@ -69,10 +72,6 @@ class Grilo(GObject.GObject):
             callback(source, param, item)
         self.tracker.query(query, self.METADATA_KEYS, options, _callback, None)
 
-    def get_album_songs(self, album_id, callback):
-        query = Query.album_songs(album_id)
-        options = self.options.copy()
-        self.tracker.query(query, self.METADATA_KEYS, options, callback, None)
 
     def _search_callback(self):
         print("yeah")
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
index 759a36a..fc2ec07 100644
--- a/gnomemusic/widgets.py
+++ b/gnomemusic/widgets.py
@@ -199,7 +199,7 @@ class AlbumWidget(Gtk.EventBox):
                                        GObject.TYPE_BOOLEAN,
                                        GObject.TYPE_BOOLEAN,
                                        )
-            GLib.idle_add(grilo.get_album_songs, item.get_id(), self._on_get_album_songs)
+            GLib.idle_add(grilo.populate_album_songs, item.get_id(), self._on_populate_album_songs)
         header_bar._selectButton.connect('toggled',
                                          self._on_header_select_button_toggled)
         header_bar._cancelButton.connect('clicked',
@@ -244,7 +244,7 @@ class AlbumWidget(Gtk.EventBox):
             if(self.player.get_playback_status() != 'Stopped'):
                 self.player.eventBox.set_visible(True)
 
-    def _on_get_album_songs(self, source, prefs, track, a, b, c):
+    def _on_populate_album_songs(self, source, prefs, track):
         if track:
             self.tracks.append(track)
             self.duration = self.duration + track.get_duration()
@@ -483,11 +483,11 @@ class ArtistAlbumWidget(Gtk.HBox):
                 "<span color='grey'>(%s)</span>" %
                 str(album.get_creation_date().get_year()))
         self.tracks = []
-        GLib.idle_add(grilo.get_album_songs, album.get_id(), self.get_songs)
+        GLib.idle_add(grilo.populate_album_songs, album.get_id(), self.get_songs)
         self.pack_start(self.ui.get_object("ArtistAlbumWidget"), True, True, 0)
         self.show_all()
 
-    def get_songs(self, source, prefs, track, unknown, data, error):
+    def get_songs(self, source, prefs, track):
         if track:
             self.tracks.append(track)
         else: