Sync mac client with libtransmission's LDS->LDP changes, maybe

diff --git a/macosx/InfoPeersViewController.m b/macosx/InfoPeersViewController.m
index 7c91c0c0ee3bda8f0b03465a0d7bb7c658dea5eb..2c6b3ea87301eb6665643f04063336d62f924d90 100644 (file)
--- a/macosx/InfoPeersViewController.m
+++ b/macosx/InfoPeersViewController.m
@@ -386,7 +386,7 @@
             case TR_PEER_FROM_RESUME:
                 [components addObject: NSLocalizedString(@"From: cache", "Inspector -> Peers tab -> table row tooltip")];
                 break;
-            case TR_PEER_FROM_LDS:
+            case TR_PEER_FROM_LDP:
                 [components addObject: NSLocalizedString(@"From: local peer discovery", "Inspector -> Peers tab -> table row tooltip")];
                 break;
             case TR_PEER_FROM_PEX:

diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 378016503f58e427c94048ca6ccbce6a2045e723..c7ec9951bcc04e7a4f0c959c46bedca61d213d77 100644 (file)
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -84,7 +84,7 @@
 
 - (void) setPEX: (id) sender;
 - (void) setDHT: (id) sender;
-- (void) setLDS: (id) sender;
+- (void) setLDP: (id) sender;
 
 - (void) setEncryptionMode: (id) sender;
 

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 7b4e7010964af8a77594523fd48513634c5173ce..8ceb5caae5ff81f4cbb1191ba3c206eb8a40d49f 100644 (file)
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -481,9 +481,9 @@ tr_session * fHandle;
     tr_sessionSetDHTEnabled(fHandle, [fDefaults boolForKey: @"DHTGlobal"]);
 }
 
-- (void) setLDS: (id) sender
+- (void) setLDP: (id) sender
 {
-    tr_sessionSetLDSEnabled(fHandle, [fDefaults boolForKey: @"LocalPeerDiscoveryGlobal"]);
+    tr_sessionSetLDPEnabled(fHandle, [fDefaults boolForKey: @"LocalPeerDiscoveryGlobal"]);
 }
 
 - (void) setEncryptionMode: (id) sender
@@ -1155,7 +1155,7 @@ tr_session * fHandle;
     [fDefaults setBool: dht forKey: @"DHTGlobal"];
     
     //dht
-    const BOOL lds = tr_sessionIsLDSEnabled(fHandle);
+    const BOOL lds = tr_sessionIsLDPEnabled(fHandle);
     [fDefaults setBool: lds forKey: @"LocalPeerDiscovery"];
     
     //auto start

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 1bdd7df674a10c61c7c69708ffb15a769dc80c67..c856f32db17e218a06bb508fa7eec7a586c893a3 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1204,7 +1204,7 @@ int trashDataFile(const char * filename)
 
 - (NSInteger) totalPeersLocal
 {
-    return fStat->peersFrom[TR_PEER_FROM_LDS];
+    return fStat->peersFrom[TR_PEER_FROM_LDP];
 }
 
 - (NSInteger) totalPeersLTEP