From 6544e135b2fbf241211ebecf8042b26390a3c8f8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 17 Nov 2010 16:23:40 +0000
Subject: [PATCH] add red clock

---
 apps/i2psnark/_icons/book.png                 | Bin 593 -> 0 bytes
 apps/i2psnark/_icons/clock_red.png            | Bin 0 -> 889 bytes
 .../org/klomp/snark/web/I2PSnarkServlet.java  |  10 +++++--
 history.txt                                   |  25 ++++++++++++++++++
 .../src/net/i2p/router/RouterVersion.java     |   2 +-
 5 files changed, 34 insertions(+), 3 deletions(-)
 delete mode 100644 apps/i2psnark/_icons/book.png
 create mode 100644 apps/i2psnark/_icons/clock_red.png

diff --git a/apps/i2psnark/_icons/book.png b/apps/i2psnark/_icons/book.png
deleted file mode 100644
index b0f4dd7928cc5714e002fd2a6e8f2faac0073f00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 593
zcmV-X0<QguP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz<4Ht8R5;6Z
zlfP<JK@i4&=j7g-5E~UmERvuoNa9VWf`Z@+C_aIOAa*{052J{c+9-&Eg|QQ~77J0d
zj79!{$=ThR`7HKCW4w1^8CZ6H^L@KBjU=w$d$1zusbB+fSqKS`s6l^rc%h`NZ|@%6
zKMgRTUbrJTH(p+B)_-mx?Il5l1q#^Q`o(S%p}{HoRRM5yyu8p{TU}uB<QP=~p{P}(
zRzH4tp82@}S8m+p9{|#k@yZgfK7L_iV+Tb55PK>l6k>CGhc0FIuigU9U^L+D`6bSr
zIEp(+L4<G@9)X3}?FvtxtxW<5_u%{bHlub(*L9SXv8d<941?i_V~1u5X#xNU56lZG
zC2n3kQ{`86NaEq!&y=|#2lD?aC?0q*%v&C>eIgaZT(|{B!*DbrTYc1t0J9*MLJm+n
zOEVloE20S^g6s|1rvjjuW1W$TV;&TbK2|slm=91)Q{X{Kg;c!Saglq7xo8`(>{A}G
zw@`8gScq(adr(4@;>^%e<~7+uNMv&?8L0#%0yj~@DW&fPImKeyFHkRKuNERO3(SOB
z?S)niZbFEN`0<|w+LjBKR#DU7F3d&rQGGY&Y)Fv0w002i=Jm_>x9jBX>wg3XCKK`E
f>xbvJ_5i;DeEQXvyE?}U00000NkvXXu0mjfKqCEw

diff --git a/apps/i2psnark/_icons/clock_red.png b/apps/i2psnark/_icons/clock_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..2842cc3386709236ba7608965c716054c08ecfe0
GIT binary patch
literal 889
zcmV-<1BU#GP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#3rR#lR5;6B
zlUqm>Q5?pHNP6ih=t5yPA=98JOh~fJLk|&ANKv*VsNrUUhFJuyu9hv;ma*PeD|1sb
z>Y+6B(ON1k?Ls1ni`{d>-PzgMnb~o6oZ0z0Gv!$Q;deOv&;R@2e1}5;prXCh96}{w
zm@q_`r}zJc^cMd)A0#Bt^eOfsl|Z->eQlYT4n2kVDmx(DT>U~VF7hfxg^Xe?V5al)
zynOxgXX2ZJ(A21nA@hTTM8hC(k2=Q<9`(zUz2IM1*zk>|g6OOU-+UcxM-$j~H@L>D
z;4hRR<X#{~-`hmt{iz_)y(J`2KRi@9KWt;dUJDy&Sf+5d>%ez)LUuWzl@>xPK8D!k
za&Y(WfN467V8_O|^!>g%*_GlW+GOfeGnM(-o#2~rEfTrgwGbb85N*GO*u-}z@-)<#
z4C&if2(B84Ep?b|IE0Djq}b=Wx$lTJ`FB94jyR)EJNQR;5p8LNUaG2srfJNS7LS8-
zTtuY(CPJmTV7G6%Xk?%-YEhw=YpOxaQI4sPUrbSJYb#_~HuimeePG`WLpqTU#!&?>
zEyHUX=t;9}ZfJSgh)*k~f!%ILcXu}`Dk?BEGz5WRq3y^3?Y@r4hIGa>AkW0GcN(D`
z+6P678DdG2;B-0-@yN)C(c>m*XqjmUHj)=g-85?;=j3=JwU-eqIgaq#VPjZP6buXu
zKoA5olfaXHNQbjPSJ@C=vwrppvFsz2eEC^0ogT1f$`DuM_`mcXW3}REYYRfTxnNeM
zR+<LVfrDvN`?EfTYp)>ex@MR}N5`OPnn85Thj3{Lf|nei9p{NS<wGcOO`2(-BktL2
z4V0Y`X_pf}J3Nr`v!U(IfVL|gk|hg2JRbP#UGN{Uh(v5P|H90M+;^uQ)?nWgHB?fJ
zP_-Swh8hFfZiBz%Bwjv$t_}3}Yh-rYKL$NLJqroK`1m+_A3tUy>07HJ>o<G#q)Au|
zvwEGES+TZ~obf)N4`fy$B$)<nZEf=jV+5J7?*Fem136nsh!FgQC3^1{?+fiA{q-v6
P00000NkvXXu0mjf0C|}w

literal 0
HcmV?d00001

diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 636ea0c37..e1fb7837f 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -1426,8 +1426,14 @@ public class I2PSnarkServlet extends Default {
                                 complete = true;
                                 status = toImg("tick") + _("Complete");
                             } else {
-                                status =
-                                         (snark.storage.getPriority(f.getCanonicalPath()) < 0 ? toImg("cancel") : toImg("clock")) +
+                                int priority = snark.storage.getPriority(f.getCanonicalPath());
+                                if (priority < 0)
+                                    status = toImg("cancel");
+                                else if (priority == 0)
+                                    status = toImg("clock");
+                                else
+                                    status = toImg("clock_red");
+                                status +=
                                          (100 * (length - remaining) / length) + "% " + _("complete") +
                                          " (" + DataHelper.formatSize2(remaining) + _("bytes remaining") + ")";
                             }
diff --git a/history.txt b/history.txt
index c00359274..7a903a749 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,28 @@
+2010-11-17 zzz
+    * Addressbook: Try to save files safely
+    * Console: Display durations with new tagged formatDuration2()
+    * DataStructures:
+      - Shim in 3 new abstract classes
+        SimpleDataStructure, KeysAndCert, and DatabaseEntry
+    * I2CP:
+      - Send DisconnectMessage at router shutdown
+      - Add username/password authorization
+    * I2PTunnel:
+      - Improve messages when starting and stopping tunnels
+      - Index page outproxy display cleanup
+    * I2PTunnel HTTP and Connect clients:
+      - Shim in a new abstract superclass I2PTunnelHTTPClientBase for common code
+      - Add local proxy username/password authorization
+      - Add outproxy username/password authorization
+      - Filter hop-by-hop Proxy headers appropriately
+    * I2PTunnel SOCKS and SOCKS IRC clients:
+      - Add local proxy username/password authorization
+      - Add SOCKS 5 outproxy support, with username/password authorization
+    * logs.jsp: Format multiline messages better
+    * Stats: Improve Frequency, enable coalescing; cleanup and javadocs
+    * stats.jsp: Cleanup, more tagging, hide obscure stuff unless ?f=1
+    * Streaming: Fix bug causing read() to incorrectly return EOF
+
 * 2010-11-15  0.8.1 released
 
 2010-11-08 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 87e5bffca..282c18b42 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 1;
+    public final static long BUILD = 2;
 
     /** for example "-test" */
     public final static String EXTRA = "";