commit ca9e7851f3f499e3640fbb4633178b81973f7a04
Author: Alberto Garcia <berto@igalia.com>
Date:   Tue Nov 15 15:07:23 2016 +0200

    grilo: unregister sources before deleting them
    
    https://bugzilla.gnome.org/show_bug.cgi?id=770486

diff --git a/plugins/grilo/rb-grilo-plugin.c b/plugins/grilo/rb-grilo-plugin.c
index 5b9287d..085c2ac 100644
--- a/plugins/grilo/rb-grilo-plugin.c
+++ b/plugins/grilo/rb-grilo-plugin.c
@@ -236,10 +236,12 @@ _delete_cb (GrlSource *grilo_source,
 	    RBSource *source,
 	    RBGriloPlugin *plugin)
 {
-	/* block the source deleted handler so we don't modify the hash table
+	/* block the removed and deleted handlers so we don't modify the hash table
 	 * while iterating it.
 	 */
+	g_signal_handlers_block_by_func (plugin->registry, grilo_source_removed_cb, plugin);
 	g_signal_handlers_block_by_func (source, rb_grilo_plugin_source_deleted, plugin);
+	grl_registry_unregister_source (plugin->registry, grilo_source, NULL);
 	rb_display_page_delete_thyself (RB_DISPLAY_PAGE (source));
 }
 
