[rhythmbox] rhythmdb: use correct entry types when retrying after plugin install



commit 402b2db8a80e2ba1cba85fc4516c9c76b29cafec
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Jun 17 15:46:29 2010 +1000

    rhythmdb: use correct entry types when retrying after plugin install
    
    The entry types from the original metadata load event are still in the
    event structure, so we should use them rather than defaulting to 'song'
    type.  If the plugin install was triggered by scanning files on a
    media player device, we don't want to import the file into the library.

 rhythmdb/rhythmdb.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rhythmdb/rhythmdb.c b/rhythmdb/rhythmdb.c
index 6f403b8..206a002 100644
--- a/rhythmdb/rhythmdb.c
+++ b/rhythmdb/rhythmdb.c
@@ -2568,9 +2568,9 @@ rhythmdb_missing_plugins_cb (gpointer duh, gboolean should_retry, RhythmDBEvent
 		load_action = g_slice_new0 (RhythmDBAction);
 		load_action->type = RHYTHMDB_ACTION_LOAD;
 		load_action->uri = rb_refstring_ref (event->real_uri);
-		load_action->data.types.entry_type = RHYTHMDB_ENTRY_TYPE_INVALID;
-		load_action->data.types.ignore_type = RHYTHMDB_ENTRY_TYPE_INVALID;
-		load_action->data.types.error_type = RHYTHMDB_ENTRY_TYPE_INVALID;
+		load_action->data.types.entry_type = event->entry_type;
+		load_action->data.types.ignore_type = event->ignore_type;
+		load_action->data.types.error_type = event->error_type;
 		g_async_queue_push (event->db->priv->action_queue, load_action);
 	} else {
 		/* plugin installation failed or was cancelled, so add an import error for the file */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]