rhythmbox r5973 - in trunk: . podcast

[jmatthew svn gnome org]

Author: jmatthew
Date: Mon Oct  6 10:57:01 2008
New Revision: 5973
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5973&view=rev

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

	* podcast/rb-podcast-manager.c: (rb_podcast_manager_insert_feed):
	Fix detection of podcast episodes that are no longer available to work
	with the new(ish) location/mountpoint scheme.


Modified:
   trunk/ChangeLog
   trunk/podcast/rb-podcast-manager.c

Modified: trunk/podcast/rb-podcast-manager.c
==============================================================================
--- trunk/podcast/rb-podcast-manager.c	(original)
+++ trunk/podcast/rb-podcast-manager.c	Mon Oct  6 10:57:01 2008
@@ -1908,10 +1908,24 @@
 		RhythmDBEntry *post_entry;
 
 		if (existing_entries != NULL) {
-			post_entry = rhythmdb_entry_lookup_by_location (db, (char *)item->url);
-			if (post_entry != NULL) {
+			GtkTreeIter iter;
+			RhythmDBEntry *entry = NULL;
+
+			/* look for an existing entry with this remote location */
+			if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (existing_entries), &iter)) {
+				do {
+					entry = rhythmdb_query_model_iter_to_entry (existing_entries, &iter);
+					if (strcmp (get_remote_location (entry), item->url) == 0) {
+						break;
+					}
+					entry = NULL;
+
+				} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (existing_entries), &iter));
+			}
+
+			if (entry != NULL) {
 				/* mark this entry as still being available */
-				rhythmdb_query_model_remove_entry (existing_entries, post_entry);
+				rhythmdb_query_model_remove_entry (existing_entries, entry);
 			}
 		}