strip out unfinished product, review and market stuff,

enable _() instead of wxT() in uiproject.fbp so it uses wxGetTranslation for the wxFormBuilder generated part of the UI

1 files changed, 0 insertions, 9 deletions

diff --git a/net.cpp b/net.cpp
index 061f000a73..8e8127d73b 100644
--- a/net.cpp
+++ b/net.cpp
@@ -381,11 +381,6 @@ void CNode::CancelSubscribe(unsigned int nChannel)
             foreach(CNode* pnode, vNodes)

                 if (pnode != this)

                     pnode->PushMessage("sub-cancel", nChannel);

-

-        // Clear memory, no longer subscribed

-        if (nChannel == MSG_PRODUCT)

-            CRITICAL_BLOCK(cs_mapProducts)

-                mapProducts.clear();

     }

 }

 

@@ -497,10 +492,6 @@ void CNode::Cleanup()
     // All of a nodes broadcasts and subscriptions are automatically torn down

     // when it goes down, so a node has to stay up to keep its broadcast going.

 

-    CRITICAL_BLOCK(cs_mapProducts)

-        for (map<uint256, CProduct>::iterator mi = mapProducts.begin(); mi != mapProducts.end();)

-            AdvertRemoveSource(this, MSG_PRODUCT, 0, (*(mi++)).second);

-

     // Cancel subscriptions

     for (unsigned int nChannel = 0; nChannel < vfSubscribe.size(); nChannel++)

         if (vfSubscribe[nChannel])