[Mldonkey-commits] mldonkey/src gtk/gui/gui_friends.ml gtk/gui/gui...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/01/08 14:07:55

Modified files:
        src/gtk/gui    : gui_friends.ml gui_main.ml 
        src/gtk/newgui : gui_friends.ml 
        src/gtk2/gui   : guiMain.ml guiMisc.ml 

Log message:
        patch 5619_gui

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/gui/gui_friends.ml?cvsroot=mldonkey&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/gui/gui_main.ml?cvsroot=mldonkey&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_friends.ml?cvsroot=mldonkey&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiMain.ml?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiMisc.ml?cvsroot=mldonkey&r1=1.23&r2=1.24

Patches:
Index: gtk/gui/gui_friends.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/gui/gui_friends.ml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtk/gui/gui_friends.ml      28 Nov 2006 12:58:10 -0000      1.7
+++ gtk/gui/gui_friends.ml      8 Jan 2007 14:07:55 -0000       1.8
@@ -61,10 +61,7 @@
   | BlackListedHost -> gettext M.black_listed, Some !!O.color_not_connected
       
 let string_color_of_client friend_tab c =
-  match c.client_files with
-    Some _ when friend_tab -> 
-      gettext M.o_col_files_listed, Some !!O.color_downloading 
-  | _ -> string_color_of_state c.client_state
+  string_color_of_state c.client_state
 
 let shorten maxlen s =
   let len = String.length s in
@@ -256,14 +253,7 @@
           Gui_com.send (GuiProto.FindFriend s)
     
     method on_select c =
-      match c.client_files with
-        None -> 
-(*          lprintf "No file for friend %d" c.client_num; lprint_newline (); *)
           Gui_com.send (GuiProto.GetClient_files c.client_num)
-      |        Some tree -> 
-(*          lprintf "%d files for friend %d" (List.length l) c.client_num; 
-          lprint_newline (); *)
-          box_files#update_tree (Some tree)
     
     method on_deselect f =
       box_files#update_tree None
@@ -284,8 +274,6 @@
     method h_update_friend f_new =
       try
         let (row, f) = self#find_client f_new.client_num in
-        if f_new.client_files <> None then 
-          f.client_files <- f_new.client_files;
         f.client_state <- f_new.client_state;
         f.client_type <- f_new.client_type;
         f.client_rating <- f_new.client_rating;
@@ -426,8 +414,6 @@
             self#remove_item row c
           end else
         let _ = () in          
-        if c_new.client_files <> None then
-          c.client_files <- c_new.client_files;
         c.client_state <- c_new.client_state;
         c.client_rating <- c_new.client_rating;
         c.client_name <- c_new.client_name;

Index: gtk/gui/gui_main.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/gui/gui_main.ml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtk/gui/gui_main.ml 27 Jun 2006 10:38:35 -0000      1.14
+++ gtk/gui/gui_main.ml 8 Jan 2007 14:07:55 -0000       1.15
@@ -127,7 +127,6 @@
       if is_in_locations then
         gui#tab_downloads#h_update_location c;
       
-      if c.client_files <> None then  cc.client_files <- c.client_files;
       cc.client_state <- c.client_state;
 
       if c.client_state = RemovedHost then begin
@@ -420,13 +419,11 @@
             try
               let c = Hashtbl.find G.locations num in
               try
-                let tree = match c.client_files with
-                    None -> { file_tree_list = []; file_tree_name = "" }
-                  | Some tree -> { tree with file_tree_list = 
tree.file_tree_list }
-                in
-
+                let tree = { file_tree_list = []; file_tree_name = "" } in
                 add_file tree dirname file;
+(*
                 ignore (canon_client gui { c with client_files = Some tree })
+*)
                 
               with _ ->
 (*                  lprintf "File already there"; lprint_newline (); *)
@@ -519,6 +516,7 @@
 
     | Search s -> ()
     | Version _ -> ()
+    | Stats (_, _) -> ()
 
   with e ->
       lprintf "Exception %s in reader\n" (Printexc2.to_string e)

Index: gtk/newgui/gui_friends.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_friends.ml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtk/newgui/gui_friends.ml   2 Dec 2006 12:35:46 -0000       1.21
+++ gtk/newgui/gui_friends.ml   8 Jan 2007 14:07:55 -0000       1.22
@@ -89,9 +89,7 @@
       | BlackListedHost -> O.gdk_pix M.o_xpm_blacklistedhost
 
 let client_pix c =
-  match c.client_files with
-    Some l -> O.gdk_pix M.o_xpm_files_listed
-  | _ -> state_pix c.client_state
+  state_pix c.client_state
 
 
 let type_pix t =
@@ -427,7 +425,6 @@
         client_type = c.gclient_type;
         client_tags = c.gclient_tags;
         client_name = c.gclient_name;
-        client_files = c.gclient_files;
         client_rating = c.gclient_rating;
         client_chat_port = 0;
         client_connect_time = c.gclient_connect_time;
@@ -441,6 +438,7 @@
         client_session_uploaded = 0L;
         client_upload = c.gclient_upload;
        client_sui_verified = None;
+        client_file_queue = [];
 (*        client_sock_addr = c.gclient_sock_addr;*)
       }
     
@@ -453,7 +451,7 @@
         gclient_type = c.client_type;
         gclient_tags = c.client_tags;
         gclient_name = c.client_name;
-        gclient_files = c.client_files;
+        gclient_files = None;
         gclient_rating = c.client_rating;
         gclient_connect_time = (BasicSocket.last_time () - 
c.client_connect_time);
         gclient_software = c.client_software;
@@ -637,7 +635,6 @@
         client_type = c.gclient_type;
         client_tags = c.gclient_tags;
         client_name = c.gclient_name;
-        client_files = c.gclient_files;
         client_rating = c.gclient_rating;
         client_chat_port = 0;
         client_connect_time = c.gclient_connect_time;
@@ -651,6 +648,7 @@
         client_session_uploaded = 0L;
         client_upload = c.gclient_upload;
        client_sui_verified = None;
+        client_file_queue = [];
 (*        client_sock_addr = string_of_kind c.gclient_kind; *)
       }
 
@@ -663,7 +661,7 @@
         gclient_type = c.client_type;
         gclient_tags = c.client_tags;
         gclient_name = c.client_name;
-        gclient_files = c.client_files;
+        gclient_files = None;
         gclient_rating = c.client_rating;
         gclient_connect_time =  (BasicSocket.last_time () - 
c.client_connect_time);
         gclient_software = c.client_software;

Index: gtk2/gui/guiMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiMain.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtk2/gui/guiMain.ml 29 Jun 2006 15:56:44 -0000      1.9
+++ gtk2/gui/guiMain.ml 8 Jan 2007 14:07:55 -0000       1.10
@@ -456,6 +456,7 @@
     | GiftServerStats _ -> assert false
     | Search s -> ()
     | Version v -> ()
+    | Stats (_, _) -> ()
         
   with e ->
       Printf2.lprintf "Exception %s in reader\n" (Printexc2.to_string e)

Index: gtk2/gui/guiMisc.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiMisc.ml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gtk2/gui/guiMisc.ml 6 Jan 2007 18:15:17 -0000       1.23
+++ gtk2/gui/guiMisc.ml 8 Jan 2007 14:07:55 -0000       1.24
@@ -1057,6 +1057,7 @@
     | Field_Lastseencomplete -> "lastseencompl"
     | Field_Filerating -> "rating"
     | Field_KNOWN s -> U.simple_utf8_of s
+    | Field_UNKNOWN s -> U.simple_utf8_of s
   
 let tags_to_string tags =
   let s = ref "" in