Index: Slim/Web/Setup.pm
===================================================================
--- Slim/Web/Setup.pm	(revision 12421)
+++ Slim/Web/Setup.pm	(working copy)
@@ -1103,9 +1103,9 @@
 									my ($client,$changeref,$paramref,$pageref) = @_;
 									return if (!defined($client));
 									if ($changeref->{'synchronize'}{'new'} eq -1) {
-										Slim::Player::Sync::unsync($client);
+										$client->execute( ['sync', '-'] );
 									} else {
-										Slim::Player::Sync::sync($client,Slim::Player::Client::getClient($changeref->{'synchronize'}{'new'}));
+										Slim::Player::Client::getClient($changeref->{'synchronize'}{'new'})->execute( ['sync', $client->id()] );
 									}
 								}
 						}
Index: Slim/Buttons/Synchronize.pm
===================================================================
--- Slim/Buttons/Synchronize.pm	(revision 12421)
+++ Slim/Buttons/Synchronize.pm	(working copy)
@@ -141,9 +141,9 @@
 		my @oldlines = $client->curLines();
 	
 		if (Slim::Player::Sync::isSyncedWith($client, $selectedClient) || ($client eq $selectedClient)) {
-			Slim::Player::Sync::unsync($client);
+			$client->execute( ['sync', '-'] );
 		} else {
-			Slim::Player::Sync::sync($client, $selectedClient);
+			$selectedClient->execute( ['sync', $client->id()] );
 		}
 
 		$client->pushLeft(\@oldlines, $client->curLines());
Index: Slim/Player/Sync.pm
===================================================================
--- Slim/Player/Sync.pm	(revision 12421)
+++ Slim/Player/Sync.pm	(working copy)
@@ -256,7 +256,7 @@
 			if ($othermasterID && ($othermasterID eq $masterID)) {
 				$client->syncgroupid($masterID);
 				$other->syncgroupid($masterID);
-				sync($client, $other);
+				$other->execute( ['sync', $client->id() ] );
 				last;
 			}