[gnome-music/wip/merge: 227/343] artists: don't crash on load more

[Ignacio Casal Quinteiro <icq src gnome org>]

commit c6f5817c5c0378d629c443b3c6c18eedea7de34b
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Wed Jul 17 16:51:11 2013 +0200

    artists: don't crash on load more

 gnomemusic/albumArtCache.py |    8 ++++----
 gnomemusic/widgets.py       |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gnomemusic/albumArtCache.py b/gnomemusic/albumArtCache.py
index 325d355..489c9e6 100644
--- a/gnomemusic/albumArtCache.py
+++ b/gnomemusic/albumArtCache.py
@@ -274,7 +274,7 @@ class AlbumArtCache:
             self.requested_uris[uri].push([callback, width, height])
             return
 
-        key = self._keybuilder_funcs[0].call(self, artist, album)
+        key = self._keybuilder_funcs[0].__call__(artist, album)
         f = Gio.File.new_for_uri(uri)
 
         def read_async_ready(outstream, res, error):
@@ -315,14 +315,14 @@ class AlbumArtCache:
 
                     outstream.splice_async(stream,
                                            Gio.IOStreamSpliceFlags.NONE,
-                                           300, None, None)
+                                           300, None, None, None)
 
                 newFile = Gio.File.new_for_path(path)
                 newFile.replace_async(None, False,
                                       Gio.FileCreateFlags.REPLACE_DESTINATION,
-                                      300, None, replace_async_ready)
+                                      300, None, replace_async_ready, None)
 
             except Exception as e:
                 print(e)
 
-        f.read_async(300, None, read_async_ready)
+        f.read_async(300, None, read_async_ready, None)
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
index 67f9ef0..7648289 100644
--- a/gnomemusic/widgets.py
+++ b/gnomemusic/widgets.py
@@ -446,7 +446,7 @@ class AllArtistsAlbums(ArtistAlbums):
             end = False
         self._load_more.set_block(not end)
 
-    def _populate(self):
+    def _populate(self, data=None):
         if grilo.tracker is not None:
             grilo.populate_albums(self._offset, self.add_item, 5)