rhythmbox r5664 - in trunk: . shell

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Apr  3 10:11:44 2008
New Revision: 5664
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5664&view=rev

Log:
2008-04-03  Jonathan Matthew  <jonathan d14n org>

	* shell/rb-playlist-manager.c: (rb_playlist_manager_parse_file):
	Remove the playlist-ended callback.  It was causing crashes (the
	'metadata' parameter doesn't really exist), and doesn't do anything
	useful.  Fixes #525901.


Modified:
   trunk/ChangeLog
   trunk/shell/rb-playlist-manager.c

Modified: trunk/shell/rb-playlist-manager.c
==============================================================================
--- trunk/shell/rb-playlist-manager.c	(original)
+++ trunk/shell/rb-playlist-manager.c	Thu Apr  3 10:11:44 2008
@@ -566,21 +566,6 @@
 			RB_STATIC_PLAYLIST_SOURCE (rb_playlist_manager_new_playlist (mgr, title, FALSE));
 }
 
-static void
-playlist_load_ended_cb (TotemPlParser *parser, const char *uri, GHashTable *metadata, RBPlaylistManager *mgr)
-{
-	const char *title;
-
-	rb_debug ("finished loading playlist %s", uri);
-
-	title = g_hash_table_lookup (metadata, TOTEM_PL_PARSER_FIELD_TITLE);
-
-	if (title) {
-		g_object_set (mgr->priv->loading_playlist, "name", title, NULL);
-		mgr->priv->loading_playlist = NULL;
-	}
-}
-
 /**
  * rb_playlist_manager_parse_file:
  * @mgr: the #RBPlaylistManager
@@ -611,10 +596,6 @@
 					 G_CALLBACK (playlist_load_started_cb),
 					 mgr, 0);
 
-		g_signal_connect_object (parser, "playlist-ended",
-					 G_CALLBACK (playlist_load_ended_cb),
-					 mgr, 0);
-
 		if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse"))
 			g_object_set (parser, "recurse", FALSE, NULL);
 
@@ -626,6 +607,7 @@
 				     _("The playlist file may be in an unknown format or corrupted."));
 			return FALSE;
 		}
+
 		if (mgr->priv->loading_playlist != NULL) {
 			char *name = NULL;