From 306cdead06aefe55324ec3cc3643a6cd403c94d2 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Wed, 19 May 2010 23:08:14 +0000
Subject: [PATCH] nothing exciting

---
 macosx/InfoPeersViewController.m |  8 ++++----
 macosx/PrefsController.h         |  2 +-
 macosx/PrefsController.m         |  6 +++---
 macosx/en.lproj/PrefsWindow.xib  | 24 ++++++++++--------------
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/macosx/InfoPeersViewController.m b/macosx/InfoPeersViewController.m
index 62ce0d0e4..5b7ade527 100644
--- a/macosx/InfoPeersViewController.m
+++ b/macosx/InfoPeersViewController.m
@@ -135,7 +135,7 @@
     else
         [fWebSeeds removeAllObjects];
     
-    NSUInteger known = 0, connected = 0, tracker = 0, incoming = 0, cache = 0, lds = 0, pex = 0, dht = 0, ltep = 0,
+    NSUInteger known = 0, connected = 0, tracker = 0, incoming = 0, cache = 0, lpd = 0, pex = 0, dht = 0, ltep = 0,
                 toUs = 0, fromUs = 0;
     BOOL anyActive = false;
     for (Torrent * torrent in fTorrents)
@@ -157,7 +157,7 @@
                 tracker += [torrent totalPeersTracker];
                 incoming += [torrent totalPeersIncoming];
                 cache += [torrent totalPeersCache];
-                lds += [torrent totalPeersLocal];
+                lpd += [torrent totalPeersLocal];
                 pex += [torrent totalPeersPex];
                 dht += [torrent totalPeersDHT];
                 ltep += [torrent totalPeersLTEP];
@@ -192,9 +192,9 @@
             if (cache > 0)
                 [fromComponents addObject: [NSString stringWithFormat:
                                         NSLocalizedString(@"%d cache", "Inspector -> Peers tab -> peers"), cache]];
-            if (lds > 0)
+            if (lpd > 0)
                 [fromComponents addObject: [NSString stringWithFormat:
-                                        NSLocalizedString(@"%d local discovery", "Inspector -> Peers tab -> peers"), lds]];
+                                        NSLocalizedString(@"%d local discovery", "Inspector -> Peers tab -> peers"), lpd]];
             if (pex > 0)
                 [fromComponents addObject: [NSString stringWithFormat:
                                         NSLocalizedString(@"%d PEX", "Inspector -> Peers tab -> peers"), pex]];
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index c7ec9951b..255931d0d 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -84,7 +84,7 @@
 
 - (void) setPEX: (id) sender;
 - (void) setDHT: (id) sender;
-- (void) setLDP: (id) sender;
+- (void) setLPD: (id) sender;
 
 - (void) setEncryptionMode: (id) sender;
 
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index a0f0f5586..eee731ae1 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -1155,8 +1155,8 @@ tr_session * fHandle;
     [fDefaults setBool: dht forKey: @"DHTGlobal"];
     
     //dht
-    const BOOL lds = tr_sessionIsLPDEnabled(fHandle);
-    [fDefaults setBool: lds forKey: @"LocalPeerDiscovery"];
+    const BOOL lpd = tr_sessionIsLPDEnabled(fHandle);
+    [fDefaults setBool: lpd forKey: @"LocalPeerDiscovery"];
     
     //auto start
     const BOOL autoStart = !tr_sessionGetPaused(fHandle);
@@ -1240,7 +1240,7 @@ tr_session * fHandle;
         
         //dht handled by bindings
         
-        //lds handled by bindings
+        //lpd handled by bindings
         
         [fPortField setIntValue: port];
         //port forwarding (nat) handled by bindings
diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib
index 68630d574..1bd64a7b3 100644
--- a/macosx/en.lproj/PrefsWindow.xib
+++ b/macosx/en.lproj/PrefsWindow.xib
@@ -4536,10 +4536,6 @@ AAABAAAAAQ</bytes>
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSUserDefaultsController" id="356871564">
-				<object class="NSMutableArray" key="NSDeclaredKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>LocalPeerDiscoveryGlobal</string>
-				</object>
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
 			<object class="NSCustomObject" id="981493640">
@@ -7884,14 +7880,6 @@ AAABAAAAAQ</bytes>
 					</object>
 					<int key="connectionID">1950</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">setLDS:</string>
-						<reference key="source" ref="511492310"/>
-						<reference key="destination" ref="1042006550"/>
-					</object>
-					<int key="connectionID">1955</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: values.LocalPeerDiscoveryGlobal</string>
@@ -7908,6 +7896,14 @@ AAABAAAAAQ</bytes>
 					</object>
 					<int key="connectionID">1956</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setLPD:</string>
+						<reference key="source" ref="511492310"/>
+						<reference key="destination" ref="1042006550"/>
+					</object>
+					<int key="connectionID">1957</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -11965,7 +11961,7 @@ AAABAAAAAQ</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1956</int>
+			<int key="maxID">1957</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -12139,7 +12135,7 @@ AAABAAAAAQ</bytes>
 							<string>setDownloadLocation:</string>
 							<string>setEncryptionMode:</string>
 							<string>setGlobalLimit:</string>
-							<string>setLDS:</string>
+							<string>setLPD:</string>
 							<string>setNat:</string>
 							<string>setPEX:</string>
 							<string>setPeersGlobal:</string>