[Mldonkey-commits] mldonkey distribChangeLog src/gtk/gui/gui_downl...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/12 11:03:23

Modified files:
        distrib        : ChangeLog 
        src/gtk/gui    : gui_downloads.ml 

Log message:
        patch #5175

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.884&r2=1.885
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/gui/gui_downloads.ml?cvsroot=mldonkey&r1=1.10&r2=1.11

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -b -r1.884 -r1.885
--- distrib/ChangeLog   12 Jun 2006 10:02:58 -0000      1.884
+++ distrib/ChangeLog   12 Jun 2006 11:03:23 -0000      1.885
@@ -15,6 +15,7 @@
 =========
 
 2006/06/12
+5175: GTK1 oldgui: Last compile fix for abstract verification bitmaps (pango)
 5174: Abstract verification bitmaps:
       compile fixes for GTK1 GUIs, move generic code to CDK (pango)
 5173: Swarmer: Small fix for merged downloads (WIP7b') (pango)

Index: src/gtk/gui/gui_downloads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/gui/gui_downloads.ml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/gtk/gui/gui_downloads.ml        12 Jun 2006 10:02:58 -0000      1.10
+++ src/gtk/gui/gui_downloads.ml        12 Jun 2006 11:03:23 -0000      1.11
@@ -35,6 +35,7 @@
 module O = Gui_options
 module G = Gui_global
 
+module VB = VerificationBitmap
       
 let preview file () =  Gui_com.send (Preview file.file_num)
 
@@ -517,16 +518,15 @@
             if i < nchunks then VerificationBitmap.get chunks i
            else VerificationBitmap.State_complete
          in
-         let current = get p in
-         for i = p+1 to p+group-1 do
-           current <- (
-              match get i, current with
-             | VB.State_missing, '0' -> '0'
-              | VB.State_partial, _ -> '1'
-              | (VB.State_complete | VB.State_verified), ('2'|'3') -> '2'
-              | _ -> '1')
+         let current = ref 0 in
+         for i = p to p+group-1 do
+           match get i with
+           | VB.State_missing -> ()
+           | VB.State_partial -> if !current = 0 then current := 1
+           | VB.State_complete | VB.State_verified ->
+               current := 2
          done;
-         String.make 1 (char_of_int current)
+         String.make 1 (char_of_int !current)
        in
        let dx = 1 in
        let nchunks = nchunks / group in