[rhythmbox] Fixed syncing problem (bug #650919, #650920)

[Jonathan Matthew <jmatthew src gnome org>]

commit 2e2def1e1739daeea29784faaf627aa86ac86e8b
Author: Adam Dingle <adam yorba org>
Date:   Tue May 24 16:52:20 2011 -0700

    Fixed syncing problem (bug #650919, #650920)
    
    When syncing an entire category (all music or all podcasts), Rhythmbox erroneously
    believed that no audio files previously existed on the target device.

 sources/sync/rb-sync-state.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/sources/sync/rb-sync-state.c b/sources/sync/rb-sync-state.c
index 4c5f0c2..fc9ff23 100644
--- a/sources/sync/rb-sync-state.c
+++ b/sources/sync/rb-sync-state.c
@@ -344,7 +344,8 @@ build_device_state (RBSyncState *state)
 	rb_media_player_source_get_entries (state->priv->source, SYNC_CATEGORY_MUSIC, entries);
 	/*klass->impl_get_entries (source, SYNC_CATEGORY_MUSIC, entries);*/
 	state->total_music_size = _sum_entry_size (entries);
-	if (rb_sync_settings_has_enabled_groups (state->priv->sync_settings, SYNC_CATEGORY_MUSIC)) {
+	if (rb_sync_settings_sync_category (state->priv->sync_settings, SYNC_CATEGORY_MUSIC) ||
+	    rb_sync_settings_has_enabled_groups (state->priv->sync_settings, SYNC_CATEGORY_MUSIC)) {
 		_g_hash_table_transfer_all (device, entries);
 	}
 	g_hash_table_destroy (entries);
@@ -355,7 +356,8 @@ build_device_state (RBSyncState *state)
 	rb_media_player_source_get_entries (state->priv->source, SYNC_CATEGORY_PODCAST, entries);
 	/*klass->impl_get_entries (source, SYNC_CATEGORY_PODCAST, entries);*/
 	state->total_podcast_size = _sum_entry_size (entries);
-	if (rb_sync_settings_has_enabled_groups (state->priv->sync_settings, SYNC_CATEGORY_PODCAST)) {
+	if (rb_sync_settings_sync_category (state->priv->sync_settings, SYNC_CATEGORY_PODCAST) ||
+	    rb_sync_settings_has_enabled_groups (state->priv->sync_settings, SYNC_CATEGORY_PODCAST)) {
 		_g_hash_table_transfer_all (device, entries);
 	}
 	g_hash_table_destroy (entries);