use a clientfixes value that actually works

[jarrg-ian.git] / src / com / tedpearson / ypp / market / MarketUploader.java

diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 6a355ff94abafe439b55c2406138b51b4241dfda..d46125b42a13b832082e6db4d44ddf4473c90b27 100644 (file)
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -20,7 +20,6 @@ import com.myjavatools.web.ClientHttpRequest;
 import java.util.regex.*;
 import java.util.prefs.Preferences;
 import java.beans.*;
-import com.tedpearson.util.update.*;
 
 /**
 *      MarketUploader is a class that handles the uploading of market
@@ -46,8 +45,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
        // Yarrg protocol parameters
        private final static String YARRG_CLIENTNAME = "jpctb greenend";
-       private final static String YARRG_CLIENTVERSION = "0.1";
-       private final static String YARRG_CLIENTFIXES = "";
+       private final static String YARRG_CLIENTVERSION =
+           com.tedpearson.ypp.market.Version.version;
+       private final static String YARRG_CLIENTFIXES = "bug-094";
        private final static String YARRG_LIVE_URL = "http://upload.yarrg.chiark.net/commod-update-receiver";
        private final static String YARRG_TEST_URL = "http://upload.yarrg.chiark.net/test/commod-update-receiver";
        private String YARRG_URL;
@@ -220,10 +220,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        public MarketUploader() {
                // check if we've been turned off in the control panel
                Preferences prefs = Preferences.userNodeForPackage(getClass());
-               boolean launch = prefs.getBoolean("launchAtStartup", true);
-               if(!launch) {
-                       return;
-               }
 
                if (prefs.getBoolean("useLiveServers", false)) {
                        YARRG_URL = YARRG_LIVE_URL;
@@ -439,7 +435,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                //System.out.println(sells);
                //System.out.println("\n\n\n"+buys);
 
-               if (uploadToPCTB) {
+               if (false) { // uploadToPCTB
                        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
                        pm.setProgress(60);
                        pm.setNote("Sending data");