]> granicus.if.org Git - transmission/commitdiff
(clutch) fix error with setting the incoming port via clutch preferences. reported...
authorCharles Kerr <charles@transmissionbt.com>
Wed, 16 Jul 2008 20:06:28 +0000 (20:06 +0000)
committerCharles Kerr <charles@transmissionbt.com>
Wed, 16 Jul 2008 20:06:28 +0000 (20:06 +0000)
libtransmission/rpc.c
web/javascript/transmission.js
web/javascript/transmission.remote.js

index 2b39edd3c64088660dabf9ac0c755f5f2842e682..f9c060046fa6c102df2f8ee3ea671d3404dd8a01 100644 (file)
@@ -559,7 +559,7 @@ static const char*
 sessionGet( tr_handle * h, tr_benc * args_in UNUSED, tr_benc * args_out )
 {
     const char * str;
-    tr_benc * d = tr_bencDictAddDict( args_out, "session", 10 );
+    tr_benc * d = args_out;
 
     tr_bencDictAddStr( d, "download-dir",
                           tr_sessionGetDownloadDir( h ) );
@@ -586,8 +586,6 @@ sessionGet( tr_handle * h, tr_benc * args_in UNUSED, tr_benc * args_out )
     }
     tr_bencDictAddStr( d, "encryption", str );
 
-
-    
     return NULL;
 }
 
index 49f225bd1d68ebda440f99763cf739d2c66f81c6..be0847fa46ca1a7bd284c13d85d05daedbaf43f4 100644 (file)
@@ -524,10 +524,10 @@ Transmission.prototype =
                
                // pass the new prefs upstream to the RPC server
                var o = { };
+               o[RPC._PeerPort]         = parseInt( $('#prefs_form #port')[0].value );
                o[RPC._UpSpeedLimit]     = parseInt( $('#prefs_form #upload_rate')[0].value );
                o[RPC._DownSpeedLimit]   = parseInt( $('#prefs_form #download_rate')[0].value );
                o[RPC._DownloadDir]      = $('#prefs_form #download_location')[0].value;
-               o[RPC._PeerPort]         = $('#prefs_form #port')[0].value;
                o[RPC._UpSpeedLimited]   = $('#prefs_form #limit_upload')[0].checked;
                o[RPC._DownSpeedLimited] = $('#prefs_form #limit_download')[0].checked;
                o[RPC._Encryption]       = $('#prefs_form #encryption')[0].checked
index 459a93c3ca334afcae7df30615081656979e602f..4ddb03ee1235391ff52f0115e7b9d0e2d5370280 100644 (file)
@@ -91,7 +91,7 @@ TransmissionRemote.prototype =
                var o = { };
                o.method = 'session-get';
                this.sendRequest( RPC._Root, $.toJSON(o), function(data) {
-                       var o = data.arguments.session;
+                       var o = data.arguments;
                        Prefs.getClutchPrefs( o );
                        tr.updatePrefs( o );
                }, "json" );