[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/gtk2/gui/configW...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/gtk2/gui/configW... |
|
Date: |
Sat, 03 Nov 2007 22:04:52 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/11/03 22:04:52
Modified files:
distrib : ChangeLog
src/gtk2/gui : configWindow.ml guiCom.ml guiConfig.ml
guiDownloads.ml guiFriends.ml guiGraph.ml
guiGraphBase.ml guiInfoWindow.ml guiMain.ml
guiNetworks.ml guiQueries.ml guiRooms.ml
guiServers.ml guiStarter.ml guiTemplates.ml
guiTools.ml guiUploads.ml
src/networks/direct_connect: dcClients.ml
Log message:
patch #6255
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1332&r2=1.1333
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/configWindow.ml?cvsroot=mldonkey&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiCom.ml?cvsroot=mldonkey&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiConfig.ml?cvsroot=mldonkey&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiDownloads.ml?cvsroot=mldonkey&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiFriends.ml?cvsroot=mldonkey&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiGraph.ml?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiGraphBase.ml?cvsroot=mldonkey&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiInfoWindow.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiMain.ml?cvsroot=mldonkey&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiNetworks.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiQueries.ml?cvsroot=mldonkey&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiRooms.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiServers.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiStarter.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiTemplates.ml?cvsroot=mldonkey&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiTools.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiUploads.ml?cvsroot=mldonkey&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcClients.ml?cvsroot=mldonkey&r1=1.16&r2=1.17
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1332
retrieving revision 1.1333
diff -u -b -r1.1332 -r1.1333
--- distrib/ChangeLog 20 Oct 2007 20:22:50 -0000 1.1332
+++ distrib/ChangeLog 3 Nov 2007 22:04:51 -0000 1.1333
@@ -14,6 +14,9 @@
ChangeLog
=========
+2007/11/03
+6255: Fix compile warnings for GTK2 GUI and DC++ (pango)
+-------------------------------------------------------------------------------
2007/10/20: version 2.9.2 = tag release-2-9-2
6242: Allow deactivation of [telnet|gui|gift]_port by setting it to 0
Index: src/gtk2/gui/configWindow.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/configWindow.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/gtk2/gui/configWindow.ml 30 Sep 2007 11:02:12 -0000 1.3
+++ src/gtk2/gui/configWindow.ml 3 Nov 2007 22:04:51 -0000 1.4
@@ -195,7 +195,7 @@
let label = GMisc.label ~xalign:0. ~markup:(U.simple_utf8_of p.pref_label)
() in
let hbox = GPack.hbox ~homogeneous:false ~spacing:6 () in
let pixbuf = A.get_icon ~icon:M.icon_stock_password ~size:A.SMALL () in
- let image = GMisc.image ~pixbuf ~packing:(hbox#pack ~expand:false
~fill:true) () in
+ let _image = GMisc.image ~pixbuf ~packing:(hbox#pack ~expand:false
~fill:true) () in
let edit =
GEdit.entry ~text:(U.simple_utf8_of p.pref_new_value) ~editable:true
~visibility:false
~packing:(hbox#pack ~expand:true ~fill:true) ()
@@ -255,7 +255,7 @@
~snap_to_ticks:true ~update_policy:`IF_VALID ~value ~wrap:true
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
- let a_box =
+ let _a_box =
GPack.hbox ~homogeneous:false
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
@@ -286,7 +286,7 @@
~snap_to_ticks:true ~update_policy:`IF_VALID ~value ~wrap:true
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
- let a_box =
+ let _a_box =
GPack.hbox ~homogeneous:false
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
@@ -382,7 +382,7 @@
~cont:((<:>) box)
~style:`ICONS
~icon:(A.get_icon ~icon:M.icon_stock_color ~size:A.SMALL ()) ();
- let separator =
+ let _separator =
GMisc.separator `VERTICAL
~packing:(box#pack ~expand:false ~fill:true) ()
in
@@ -408,12 +408,12 @@
in
let col = GDraw.color (`NAME p.pref_new_value) in
set_color (string_of_int_of_col col);
- let sample = GuiTools.add_pixbuf ~cont:((<:>) box) ~pixbuf in
- let separator =
+ let _sample = GuiTools.add_pixbuf ~cont:((<:>) box) ~pixbuf in
+ let _separator =
GMisc.separator `VERTICAL
~packing:(box#pack ~expand:false ~fill:true) ()
in
- let a_box =
+ let _a_box =
GPack.hbox ~homogeneous:false
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
@@ -466,7 +466,7 @@
~cont:((<:>) box)
~style:`ICONS
~icon:(A.get_icon ~icon:M.icon_stock_font ~size:A.SMALL ()) ();
- let separator =
+ let _separator =
GMisc.separator `VERTICAL
~packing:(box#pack ~expand:false ~fill:true) ()
in
@@ -481,11 +481,11 @@
fontv := font
in
set_font p.pref_new_value;
- let separator =
+ let _separator =
GMisc.separator `VERTICAL
~packing:(box#pack ~expand:false ~fill:true) ()
in
- let a_box =
+ let _a_box =
GPack.hbox ~homogeneous:false
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
@@ -622,7 +622,7 @@
~snap_to_ticks:true ~update_policy:`IF_VALID ~wrap:true
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
- let label_day =
+ let _label_day =
GMisc.label ~xalign:0. ~markup:!M.cW_lb_day
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
@@ -632,7 +632,7 @@
~snap_to_ticks:true ~update_policy:`IF_VALID ~wrap:true
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
- let label_hour =
+ let _label_hour =
GMisc.label ~xalign:0. ~markup:!M.cW_lb_hour
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
@@ -642,7 +642,7 @@
~snap_to_ticks:true ~update_policy:`IF_VALID ~wrap:true
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
- let label_minute =
+ let _label_minute =
GMisc.label ~xalign:0. ~markup:!M.cW_lb_minute
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
@@ -652,11 +652,11 @@
~snap_to_ticks:true ~update_policy:`IF_VALID ~wrap:true
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
- let label_second =
+ let _label_second =
GMisc.label ~xalign:0. ~markup:!M.cW_lb_second
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
- let a_box =
+ let _a_box =
GPack.hbox ~homogeneous:false
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
@@ -856,7 +856,7 @@
Printf.sprintf "<span foreground=\"%s\" weight=\"bold\">%s</span>"
!!O.gtk_color_default s
in
- let label =
+ let _label =
GMisc.label ~xalign:0. ~markup
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
@@ -1017,7 +1017,7 @@
GPack.hbox ~homogeneous:false ~spacing:6
~border_width:3 ~packing:frame#add ()
in
- let icon_h =
+ let _icon_h =
GMisc.image ~pixbuf:h_pb
~packing:(h_hbox#pack ~expand:false ~fill:true) ()
in
@@ -1133,7 +1133,7 @@
GList.liste ~selection_mode:`SINGLE
~packing:scroll_menu_box#add_with_viewport ()
in
- let separator =
+ let _separator =
GMisc.separator `HORIZONTAL
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
@@ -1237,7 +1237,7 @@
GPack.notebook ~homogeneous_tabs:true ~scrollable:true
~packing:(vbox#pack ~expand:true ~fill:true) ()
in
- let separator =
+ let _separator =
GMisc.separator `HORIZONTAL
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
@@ -1338,7 +1338,7 @@
~row_spacings:6 ~col_spacings:6 ~border_width:6
~packing:vbox#add ()
in
- let separator =
+ let _separator =
GMisc.separator `HORIZONTAL
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
@@ -1420,7 +1420,7 @@
~row_spacings:6 ~col_spacings:6 ~border_width:6
~packing:vbox#add ()
in
- let separator =
+ let _separator =
GMisc.separator `HORIZONTAL
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
Index: src/gtk2/gui/guiCom.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiCom.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/gtk2/gui/guiCom.ml 29 Jun 2006 15:56:44 -0000 1.5
+++ src/gtk2/gui/guiCom.ml 3 Nov 2007 22:04:51 -0000 1.6
@@ -226,7 +226,7 @@
scan_port next (i+1) max);
let proto = ref 0 in
let nets = ref [] in
- let console = ref "" in
+ let _console = ref "" in
TcpBufferedSocket.set_reader sock (fun sock nread ->
GuiDecoding.gui_cut_messages
(fun opcode s ->
Index: src/gtk2/gui/guiConfig.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiConfig.ml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/gtk2/gui/guiConfig.ml 27 Jun 2006 21:20:28 -0000 1.7
+++ src/gtk2/gui/guiConfig.ml 3 Nov 2007 22:04:51 -0000 1.8
@@ -521,7 +521,7 @@
(set_simple_option O.gui_ini name v; raise Exit)
with Exit ->
(List.iter (fun opt_section ->
- let section = Options.section_name opt_section in
+ let _section = Options.section_name opt_section in
try
List.iter (fun o ->
if o.option_name = name then
@@ -653,7 +653,7 @@
let config_window gui value_reader f =
let use_icons = !!O.gtk_look_use_icons in
let use_avail_bars = !!O.gtk_look_graphical_availability in
- let language = !!O.gtk_client_lang in
+ let _language = !!O.gtk_client_lang in
let saturation = !!O.gtk_look_icon_saturation in
let small_icon = !!O.gtk_look_lists_icon_size in
let medium_icon = !!O.gtk_look_toolbars_icon_size in
Index: src/gtk2/gui/guiDownloads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiDownloads.ml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/gtk2/gui/guiDownloads.ml 8 May 2007 16:33:32 -0000 1.14
+++ src/gtk2/gui/guiDownloads.ml 3 Nov 2007 22:04:51 -0000 1.15
@@ -990,7 +990,7 @@
try
let filename = stat.stats_file_history in
let pixb = GdkPixbuf.from_file filename in
- let razorback_history =
+ let _razorback_history =
GMisc.image ~pixbuf:pixb ~packing:(png_box#pack ~expand:false
~fill:true) ()
in
let label_razorback =
Index: src/gtk2/gui/guiFriends.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiFriends.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/gtk2/gui/guiFriends.ml 30 Sep 2007 11:02:12 -0000 1.5
+++ src/gtk2/gui/guiFriends.ml 3 Nov 2007 22:04:51 -0000 1.6
@@ -497,7 +497,7 @@
let main_evbox = GBin.event_box () in
main_evbox#add chat#coerce;
let hbox = GPack.hbox ~homogeneous:false ~spacing:3 () in
- let wl =
+ let _wl =
GMisc.label ~text:(U.utf8_of s.source_name)
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
@@ -942,7 +942,7 @@
in
folders_evbox#misc#modify_bg [(`NORMAL, (`NAME "#AFAFF4"))];
let markup = GuiTools.create_default_bold_markup !M.qT_lb_directories in
- let folders_label =
+ let _folders_label =
GMisc.label ~xalign:0. ~yalign:0. ~markup
~xpad:3 ~ypad:3 ~packing:folders_evbox#add ()
in
@@ -959,7 +959,7 @@
in
messages_evbox#misc#modify_bg [(`NORMAL, (`NAME "#AFAFF4"))];
let markup = GuiTools.create_default_bold_markup !M.fT_lb_messages in
- let messages_label =
+ let _messages_label =
GMisc.label ~xalign:0. ~yalign:0. ~markup
~xpad:3 ~ypad:3 ~packing:messages_evbox#add ()
in
Index: src/gtk2/gui/guiGraph.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiGraph.ml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/gtk2/gui/guiGraph.ml 16 Aug 2006 19:10:34 -0000 1.2
+++ src/gtk2/gui/guiGraph.ml 3 Nov 2007 22:04:51 -0000 1.3
@@ -482,7 +482,7 @@
(*************************************************************************)
let _ =
- let label =
+ let _label =
GMisc.label ~text:!M.gT_lb_time_range
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
Index: src/gtk2/gui/guiGraphBase.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiGraphBase.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/gtk2/gui/guiGraphBase.ml 16 Aug 2006 19:10:34 -0000 1.3
+++ src/gtk2/gui/guiGraphBase.ml 3 Nov 2007 22:04:51 -0000 1.4
@@ -95,7 +95,7 @@
| _ -> l
let value_to_graph v =
- let t = last_time () in
+ let _t = last_time () in
match v with
Options.Module assocs ->
let get_value name conv = conv (List.assoc name assocs) in
@@ -439,7 +439,7 @@
begin
try
let suid = string_of_uid file_uid in
- let uid = uid_of_string suid in
+ let _uid = uid_of_string suid in
(if !!verbose then lprintf'
"In save_record / Downloads : Adding file %s\n"
suid);
files_graph =:= (file_uid, (dummy_graph (),
dummy_graph ())) :: !!files_graph;
@@ -464,7 +464,7 @@
begin
try
let suid = string_of_uid file_uid in
- let uid = uid_of_string suid in
+ let _uid = uid_of_string suid in
(if !!verbose then lprintf'
"In save_record / Downloads : Adding file %s\n"
suid);
files_graph =:= (file_uid, (dummy_graph (),
dummy_graph ())) :: !!files_graph;
@@ -511,7 +511,7 @@
then begin
try
let suid = string_of_uid file_uid in
- let uid = uid_of_string suid in
+ let _uid = uid_of_string suid in
(if !!verbose then lprintf' "In add_file : Adding file %s\n" suid);
files_graph =:= (file_uid, (dummy_graph (), dummy_graph ())) ::
!!files_graph;
let q = Queue.create () in
Index: src/gtk2/gui/guiInfoWindow.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiInfoWindow.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/gtk2/gui/guiInfoWindow.ml 1 Sep 2006 16:22:14 -0000 1.6
+++ src/gtk2/gui/guiInfoWindow.ml 3 Nov 2007 22:04:51 -0000 1.7
@@ -215,7 +215,7 @@
GPack.hbox ~homogeneous:false
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
- let label =
+ let _label =
GMisc.label ~xalign:0. ~yalign:0. ~markup ~line_wrap:true
~packing:(vbox#pack ~expand:true ~fill:true) ()
in
@@ -235,7 +235,7 @@
let add_group (table : GPack.table) s top =
let hbox = GPack.hbox ~homogeneous:false () in
let markup = GuiTools.create_bold_markup s in
- let label =
+ let _label =
GMisc.label ~xalign:0. ~markup
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
@@ -407,7 +407,7 @@
let add_files_requested (table : GPack.table) s top =
let context = table#misc#pango_context in
let pixels = !wwidth * 3 / 4 in
- let list = ref [] in
+ let _list = ref [] in
match s.source_files_requested with
[] -> insert_data table [] top
| files ->
@@ -438,7 +438,7 @@
let v_pos = add_group table !M.fW_lb_avail_info v_pos in
let v_pos = add_avail_info table f v_pos in
let v_pos = add_group table !M.fW_lb_file_names v_pos in
- let v_pos = add_file_names table f v_pos in
+ let _v_pos = add_file_names table f v_pos in
()
end
| Source (s, _) ->
@@ -449,7 +449,7 @@
let v_pos = add_group table !M.fW_lb_transfer_info v_pos in
let v_pos = add_transfer_info table item v_pos in
let v_pos = add_group table !M.fW_lb_files_requested v_pos in
- let v_pos = add_files_requested table s v_pos in
+ let _v_pos = add_files_requested table s v_pos in
()
end
@@ -500,7 +500,7 @@
~row_spacings:6 ~col_spacings:6 ~border_width:6
~packing:scroll_table_box#add_with_viewport ()
in
- let separator =
+ let _separator =
GMisc.separator `HORIZONTAL
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
Index: src/gtk2/gui/guiMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiMain.ml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/gtk2/gui/guiMain.ml 8 Jan 2007 14:07:55 -0000 1.10
+++ src/gtk2/gui/guiMain.ml 3 Nov 2007 22:04:51 -0000 1.11
@@ -665,8 +665,8 @@
let splash_screen_window gui =
let scrwidth = Gdk.Screen.width () in
- let colormap = Gdk.Color.get_system_colormap () in
- let size = scrwidth / 3 in
+ let _colormap = Gdk.Color.get_system_colormap () in
+ let _size = scrwidth / 3 in
let splash_screen_pb = A.get_icon ~icon:M.icon_splash_screen ~size:A.LARGE
() in
let width = GdkPixbuf.get_width splash_screen_pb in
let height = GdkPixbuf.get_height splash_screen_pb in
@@ -701,7 +701,7 @@
in
status#set_use_markup true;
- let label =
+ let _label =
GMisc.label ~text:(Printf.sprintf "v. %s" Autoconf.current_version)
~xpad:10 ~ypad:10 ~xalign:0. ~yalign:1.
~packing:(vbox#pack ~fill:true ~expand:false) ()
Index: src/gtk2/gui/guiNetworks.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiNetworks.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/gtk2/gui/guiNetworks.ml 26 Nov 2006 13:54:09 -0000 1.4
+++ src/gtk2/gui/guiNetworks.ml 3 Nov 2007 22:04:51 -0000 1.5
@@ -197,7 +197,7 @@
in
let name = Mi.network_full_name n.net_num in
let markup = create_bold_markup name in
- let label =
+ let _label =
GMisc.label ~markup ~xalign:0.
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
Index: src/gtk2/gui/guiQueries.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiQueries.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/gtk2/gui/guiQueries.ml 30 Sep 2007 11:02:13 -0000 1.5
+++ src/gtk2/gui/guiQueries.ml 3 Nov 2007 22:04:51 -0000 1.6
@@ -336,7 +336,7 @@
in
let evbox = GBin.event_box ~packing:(hbox#pack ~expand:false ~fill:false) ()
in
let pixbuf = A.get_icon ~icon:M.icon_stock_close_overlay ~size:A.SMALL () in
- let img = GMisc.image ~pixbuf ~xalign:1.0 ~yalign:0. ~packing:evbox#add () in
+ let _img = GMisc.image ~pixbuf ~xalign:1.0 ~yalign:0. ~packing:evbox#add ()
in
evbox#misc#set_state `ACTIVE;
qr.g_query_label <- Some label;
qr.g_query_waiting_label <- Some query_status;
@@ -504,11 +504,11 @@
begin
let hbox = GPack.hbox ~homogeneous:false ~spacing:3 () in
let markup = GuiTools.create_bold_markup s in
- let label =
+ let _label =
GMisc.label ~markup ~xalign:0. ~yalign:0.5
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
- let sep =
+ let _sep =
GMisc.separator `HORIZONTAL
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
Index: src/gtk2/gui/guiRooms.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiRooms.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/gtk2/gui/guiRooms.ml 9 Nov 2006 21:32:26 -0000 1.4
+++ src/gtk2/gui/guiRooms.ml 3 Nov 2007 22:04:51 -0000 1.5
@@ -563,7 +563,7 @@
(if !!verbose then lprintf' "Removing user to room %d\n" room_num);
try
let ro = Hashtbl.find G.rooms room_num in
- let row = roomstore#find_row (room_key room_num) in
+ let _row = roomstore#find_row (room_key room_num) in
(if List.mem user_num ro.room_users
then ro.room_users <- List.filter (fun n -> n <> user_num)
ro.room_users);
let _ =
@@ -571,7 +571,7 @@
(Some n, RoomOpened) when n = room_num ->
begin
try
- let u = Hashtbl.find G.users user_num in
+ let _u = Hashtbl.find G.users user_num in
userstore#remove_item (GuiUsers.user_key user_num);
update_users_label ();
with _ -> ()
@@ -589,7 +589,7 @@
(if !!verbose then lprintf' "Adding user to room %d\n" room_num);
try
let ro = Hashtbl.find G.rooms room_num in
- let row = roomstore#find_row (room_key room_num) in
+ let _row = roomstore#find_row (room_key room_num) in
(if not (List.mem user_num ro.room_users)
then ro.room_users <- user_num :: ro.room_users);
match (!current_room, ro.room_state) with
@@ -695,7 +695,7 @@
in
chat_evbox#misc#modify_bg [(`NORMAL, (`NAME "#AFAFF4"))];
let markup = GuiTools.create_default_bold_markup !M.rT_lb_chat in
- let chat_label =
+ let _chat_label =
GMisc.label ~xalign:0. ~yalign:0. ~markup
~xpad:3 ~ypad:3 ~packing:chat_evbox#add ()
in
Index: src/gtk2/gui/guiServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiServers.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/gtk2/gui/guiServers.ml 12 Nov 2005 11:16:36 -0000 1.4
+++ src/gtk2/gui/guiServers.ml 3 Nov 2007 22:04:51 -0000 1.5
@@ -734,7 +734,7 @@
let h_server_update_users server_num user =
try
let s = Hashtbl.find G.servers server_num in
- let row = serverstore#find_row (server_key server_num) in
+ let _row = serverstore#find_row (server_key server_num) in
match s.server_users with
None ->
begin
@@ -865,12 +865,12 @@
~spacing:6 ~border_width:6 ()
in
let pixbuf = A.get_icon ~icon:M.icon_stock_add_server ~size:A.SMALL () in
- let img =
+ let _img =
GMisc.image ~pixbuf ~xalign:0.
~packing:(hbox_add_s#pack ~expand:false ~fill:true) ()
in
let markup = create_bold_markup !M.sT_lb_add_server in
- let label =
+ let _label =
GMisc.label ~markup ~xalign:0.
~packing:(hbox_add_s#pack ~expand:false ~fill:true) ()
in
@@ -1003,12 +1003,12 @@
A.get_icon ~size:A.MEDIUM
~icon:(M.icon_stock_all_servers) ()
in
- let img =
+ let _img =
GMisc.image ~pixbuf ~xalign:0.
~packing:(box#pack ~expand:false ~fill:true) ()
in
let markup = create_markup !M.sT_lb_display_all_servers in
- let label =
+ let _label =
GMisc.label ~markup ~xalign:0. ~use_underline:true
~mnemonic_widget:t_button#coerce
~packing:(box#pack ~expand:false ~fill:true) ()
Index: src/gtk2/gui/guiStarter.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiStarter.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/gtk2/gui/guiStarter.ml 6 Nov 2006 18:06:08 -0000 1.4
+++ src/gtk2/gui/guiStarter.ml 3 Nov 2007 22:04:51 -0000 1.5
@@ -42,7 +42,7 @@
in
ignore (window#connect#destroy ~callback:GMain.Main.quit);
let vbox_2 = GPack.vbox ~homogeneous:false ~packing: window#add ()in
- let wl_3 =
+ let _wl_3 =
GMisc.label ~text:(_s "\n Start the GTK gui ? \n\nChange the
'ask_for_gui' option to false to remove this message.\n\n") ~justify:`CENTER
~line_wrap:true
~xalign:0.5 ~yalign:0.5
~packing:(vbox_2#pack ~expand:true ~fill:true) ()
@@ -54,14 +54,14 @@
let wb_5 =
GButton.button ~packing:(hbox_4#pack ~expand:true ~fill:true) ()
in
- let wl_7 =
+ let _wl_7 =
GMisc.label ~text:(_s "YES") ~justify:`CENTER ~line_wrap:true ~xalign:0.5
~yalign:0.5 ~packing:(wb_5#add) ()
in
let wb_6 =
GButton.button ~packing:(hbox_4#pack ~expand:true ~fill:true) ()
in
- let wl_8 =
+ let _wl_8 =
GMisc.label ~text:(_s "NO") ~justify:`CENTER ~line_wrap:true ~xalign:0.5
~yalign:0.5 ~packing:(wb_6#add) ()
in
Index: src/gtk2/gui/guiTemplates.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiTemplates.ml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/gtk2/gui/guiTemplates.ml 16 Nov 2005 10:18:52 -0000 1.7
+++ src/gtk2/gui/guiTemplates.ml 3 Nov 2007 22:04:52 -0000 1.8
@@ -885,7 +885,7 @@
* used for convenience.It should remain empty.
*)
let cols = new GTree.column_list in
- let col = cols#add Gobject.Data.boolean in
+ let _col = cols#add Gobject.Data.boolean in
let store = GTree.list_store cols in
let view = GTree.view ~model:store () in
object (self)
Index: src/gtk2/gui/guiTools.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiTools.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/gtk2/gui/guiTools.ml 12 Nov 2005 11:16:36 -0000 1.6
+++ src/gtk2/gui/guiTools.ml 3 Nov 2007 22:04:52 -0000 1.7
@@ -494,18 +494,18 @@
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
let pixbuf = A.get_icon ~icon:M.icon_stock_warning ~size:A.LARGE () in
- let image =
+ let _image =
GMisc.image ~pixbuf ~xalign:0. ~yalign:0.
~packing:(hbox#pack ~expand:false ~fill:true) ()
in
let markup = create_default_bold_markup warning_message in
- let w_label =
+ let _w_label =
GMisc.label ~xalign:0.5 ~yalign:0.5 ~markup
~packing:(hbox#pack ~expand:true ~fill:true) ()
in
if List.length text > 0
then begin
- let separator =
+ let _separator =
GMisc.separator `HORIZONTAL
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
@@ -532,7 +532,7 @@
incr pos
) text
end;
- let separator =
+ let _separator =
GMisc.separator `HORIZONTAL
~packing:(vbox#pack ~expand:false ~fill:true) ()
in
Index: src/gtk2/gui/guiUploads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiUploads.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/gtk2/gui/guiUploads.ml 12 Nov 2005 11:16:36 -0000 1.5
+++ src/gtk2/gui/guiUploads.ml 3 Nov 2007 22:04:52 -0000 1.6
@@ -1128,7 +1128,7 @@
show_pending := not !show_pending;
uploaderstore#refresh_filter ()
in
- let bShow_pending = wtool#add_button
+ let _bShow_pending = wtool#add_button
~style:`BOTH_HORIZ
~markup
~icon:(A.get_icon ~icon:M.icon_stock_pending_slots ~size:A.SMALL ())
Index: src/networks/direct_connect/dcClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcClients.ml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/networks/direct_connect/dcClients.ml 25 Jul 2007 19:27:09 -0000
1.16
+++ src/networks/direct_connect/dcClients.ml 3 Nov 2007 22:04:52 -0000
1.17
@@ -560,7 +560,7 @@
print_client_error sock "Event: BUFFER_OVERFLOW";
close sock Closed_for_overflow
(*| READ_DONE _ -> lprintf_nl " Event: READ_DONE";*)
- | BASIC_EVENT CLOSED reason ->
+ | BASIC_EVENT (CLOSED reason) ->
(match find_sockets_client sock with
| Some c ->
if !verbose_msg_clients then
@@ -712,8 +712,8 @@
(*if !verbose_msg_clients then lprintf_nl "Received $Direction (%s)"
(clients_username c);*)
(match c.client_state with
| DcDownloadListConnecting (our_level,_,_) (* We are
downloading filelist *)
- | DcConnectionStyle ClientActive Upload our_level (* We are in
passive mode *)
- | DcConnectionStyle MeActive Upload our_level -> (* We are in
active mode, client needs to upload) *)
+ | DcConnectionStyle (ClientActive (Upload our_level)) (* We are in
passive mode *)
+ | DcConnectionStyle (MeActive (Upload our_level)) -> (* We are in
active mode, client needs to upload) *)
(match t.Direction.direction with
| Download _ ->
if !verbose_msg_clients then
@@ -747,9 +747,9 @@
nc.client_state <- DcDownloadListWaiting );
(* we change our
direction *)
(match c.client_state with (* check which
one is the case *)
- | DcConnectionStyle ClientActive Upload _ -> (* if client was
initiating *)
+ | DcConnectionStyle (ClientActive (Upload _)) -> (* if client
was initiating *)
c.client_state <- DcConnectionStyle (ClientActive
(Download 65535)) (* 65535 means to KeyReq that *)
- | DcConnectionStyle MeActive Upload _
(* direction is changed *)
+ | DcConnectionStyle (MeActive (Upload _)) (* direction is
changed *)
| DcDownloadListConnecting _ -> (* if we were
initiating *)
c.client_state <- DcConnectionStyle (MeActive (Download
65535))
| _ -> () );
@@ -762,8 +762,8 @@
lprintf_nl " Stalemate (levels are equal), closing";
close sock (Closed_for_error "Negotiation download:
Stalemate" )
| _ -> () ) (* Upload *)
- | DcConnectionStyle MeActive Download our_level
- | DcConnectionStyle ClientActive Download our_level -> (* connection is
ready for uploading *)
+ | DcConnectionStyle (MeActive (Download our_level))
+ | DcConnectionStyle (ClientActive (Download our_level)) -> (* connection
is ready for uploading *)
(match t.Direction.direction with
| Upload level -> (* Active mode and client
wants to upload too ?? *)
if !verbose_msg_clients then lprintf_nl "We have a conflict, both
want to upload...";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/gtk2/gui/configW...,
mldonkey-commits <=