Changeset bb7d028


Ignore:
Timestamp:
Feb 24, 2011 3:45:18 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d7f5f2c
Parents:
fde783b1
Message:
  • i2psnark:
    • Fix delete and remove buttons for Opera and w3m (thx xiake)
    • Stop torrent if no valid trackers
    • Fix war build dependencies
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/build.xml

    rfde783b1 rbb7d028  
    8787    <target name="warUpToDate">
    8888        <uptodate property="war.uptodate" targetfile="../i2psnark.war" >
    89             <srcfiles dir= "." includes="build/obj/web/**/*.class ../_icons/* ../web.xml" />
     89            <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../_icons/* ../web.xml" />
    9090        </uptodate>
    9191    </target>
  • apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java

    rfde783b1 rbb7d028  
    186186
    187187    if (trackers.isEmpty()) {
    188         // FIXME really need to get this message to the gui
    189188        stop = true;
    190         _log.error("No valid trackers for infoHash: " + infoHash);
     189        // FIXME translate
     190        SnarkManager.instance().addMessage("No valid trackers for " + this.snark.getBaseName() + " - enable opentrackers?");
     191        _log.error("No valid trackers for " + this.snark.getBaseName());
    191192        // FIXME keep going if DHT enabled
     193        this.snark.stopTorrent();
    192194        return;
    193195    }
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    rfde783b1 rbb7d028  
    349349
    350350        // Opera and text-mode browsers: no &thinsp; and no input type=image values submitted
     351        // Using a unique name fixes Opera, except for the buttons with js confirms, see below
    351352        String ua = req.getHeader("User-Agent");
    352         boolean isDegraded = ua != null && (ua.startsWith("Lynx") ||
     353        boolean isDegraded = ua != null && (ua.startsWith("Lynx") || ua.startsWith("w3m") ||
    353354                                            ua.startsWith("ELinks") || ua.startsWith("Dillo"));
    354355
     
    961962                out.write("</a>");
    962963        } else {
    963                 if (isDegraded)
     964                // This works in Opera but it's displayed a little differently, so use noThinsp here too so all 3 icons are consistent
     965                if (noThinsp)
    964966                    out.write("<a href=\"/i2psnark/?action=Start_" + b64 + "&amp;nonce=" + _nonce + "\"><img title=\"");
    965967                else
     
    973975
    974976            if (isValid) {
    975                 if (isDegraded)
     977                // Doesnt work with Opera so use noThinsp instead of isDegraded
     978                if (noThinsp)
    976979                    out.write("<a href=\"/i2psnark/?action=Remove_" + b64 + "&amp;nonce=" + _nonce + "\"><img title=\"");
    977980                else
     
    991994            }
    992995
    993             if (isDegraded)
     996            // Doesnt work with Opera so use noThinsp instead of isDegraded
     997            if (noThinsp)
    994998                out.write("<a href=\"/i2psnark/?action=Delete_" + b64 + "&amp;nonce=" + _nonce + "\"><img title=\"");
    995999            else
  • history.txt

    rfde783b1 rbb7d028  
     12011-02-24 zzz
     2    * i2psnark:
     3      - Fix delete and remove buttons for Opera and w3m
     4      - Stop torrent if no valid trackers
     5      - Fix war build dependencies
     6
    172011-02-23 zzz
    28    * BuildHandler:
  • router/java/src/net/i2p/router/RouterVersion.java

    rfde783b1 rbb7d028  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 19;
     21    public final static long BUILD = 20;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.