From 1901c44bf098f8e81da7e02c61dc512c163cdf3e Mon Sep 17 00:00:00 2001
From: Kevin Glowacz <kevin@glowacz.info>
Date: Tue, 28 Jul 2009 04:53:04 +0000
Subject: [PATCH] (trunk web) remote shouldn't know the internals of
 transmission

---
 web/javascript/transmission.js        | 11 ++++++++++-
 web/javascript/transmission.remote.js | 10 +++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js
index 51c50520a..4999bf5a5 100644
--- a/web/javascript/transmission.js
+++ b/web/javascript/transmission.js
@@ -113,12 +113,21 @@ Transmission.prototype =
 		
 		// Get preferences & torrents from the daemon
 		var tr = this;
-		this.remote.loadDaemonPrefs( );
+		this.loadDaemonPrefs( );
 		this.initalizeAllTorrents();
 
 		this.togglePeriodicRefresh( true );
 	},
 
+	loadDaemonPrefs: function(){
+		var tr = this;
+		this.remote.loadDaemonPrefs( function(data){
+			var o = data.arguments;
+			Prefs.getClutchPrefs( o );
+			tr.updatePrefs( o );
+		});
+	},
+
 	preloadImages: function() {
 		if (iPhone) {
 			this.loadImages(
diff --git a/web/javascript/transmission.remote.js b/web/javascript/transmission.remote.js
index 8a33d232e..dc3bbf290 100644
--- a/web/javascript/transmission.remote.js
+++ b/web/javascript/transmission.remote.js
@@ -87,14 +87,10 @@ TransmissionRemote.prototype =
 		} );
 	},
 
-	loadDaemonPrefs: function() {
+	loadDaemonPrefs: function( callback ) {
 		var tr = this._controller;
 		var o = { method: 'session-get' };
-		this.sendRequest( o, function(data) {
-			var o = data.arguments;
-			Prefs.getClutchPrefs( o );
-			tr.updatePrefs( o );
-		} );
+		this.sendRequest( o, callback );
 	},
 
 	getInitialDataFor: function(torrent_ids, callback) {
@@ -224,7 +220,7 @@ TransmissionRemote.prototype =
 			arguments: args
 		};
 		this.sendRequest( o, function() {
-			remote.loadDaemonPrefs();
+			remote._controller.loadDaemonPrefs();
 		} );
 	}
 };