rhythmbox r5980 - in trunk: . sources

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Oct 14 11:06:22 2008
New Revision: 5980
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5980&view=rev

Log:
2008-10-14  Jonathan Matthew  <jonathan d14n org>

	* sources/rb-auto-playlist-source.c:
	(rb_auto_playlist_source_query_complete_cb),
	(rb_auto_playlist_source_do_query),
	(rb_auto_playlist_source_set_query):
	Revert auto playlist changes from the previous commit, they cause
	crashes with limited playlists.


Modified:
   trunk/ChangeLog
   trunk/sources/rb-auto-playlist-source.c

Modified: trunk/sources/rb-auto-playlist-source.c
==============================================================================
--- trunk/sources/rb-auto-playlist-source.c	(original)
+++ trunk/sources/rb-auto-playlist-source.c	Tue Oct 14 11:06:22 2008
@@ -723,8 +723,6 @@
 {
 	RBAutoPlaylistSourcePrivate *priv = RB_AUTO_PLAYLIST_SOURCE_GET_PRIVATE (source);
 
-	rb_library_browser_set_model (priv->browser, model, TRUE);
-
 	priv->query_active = FALSE;
 	if (priv->search_on_completion) {
 		priv->search_on_completion = FALSE;
@@ -774,6 +772,7 @@
 					    "limit-value", priv->limit_value,
 					    NULL);
 		rhythmdb_query_model_chain (query_model, priv->cached_all_query, FALSE);
+		rb_library_browser_set_model (priv->browser, query_model, TRUE);
 
 		priv->query_active = TRUE;
 		priv->search_on_completion = FALSE;
@@ -789,14 +788,6 @@
 	rhythmdb_query_free (query);
 }
 
-static void
-cached_all_query_complete_cb (RhythmDBQueryModel *model,
-			      RBAutoPlaylistSource *source)
-{
-	RBAutoPlaylistSourcePrivate *priv = RB_AUTO_PLAYLIST_SOURCE_GET_PRIVATE (source);
-	rb_library_browser_set_model (priv->browser, model, TRUE);
-}
-
 /**
  * rb_auto_playlist_source_set_query:
  * @source: the #RBAutoPlaylistSource
@@ -847,10 +838,7 @@
 					       "limit-type", priv->limit_type,
 					       "limit-value", priv->limit_value,
 					       NULL);
-	g_signal_connect_object (priv->cached_all_query,
-				 "complete",
-				 G_CALLBACK (cached_all_query_complete_cb),
-				 source, 0);
+	rb_library_browser_set_model (priv->browser, priv->cached_all_query, TRUE);
 	rhythmdb_do_full_query_async_parsed (db,
 					     RHYTHMDB_QUERY_RESULTS (priv->cached_all_query),
 					     priv->query);