# # # patch "Makefile" # from [dfd12cb4e23bab838c7ccfad430038fefea99d4e] # to [fff25b38e8a1936ee02a9ffbaf81b98d6a009b90] # # patch "subprocess.ml" # from [b1d4d0f67fe01838a729f90c585d62ce12dbb0d4] # to [e1f23ae41fa3d03977419f2f102646e0ad32d546] # # patch "ui.ml" # from [394a85648f8edc3d3a024d038cdc8b7b5b07e82c] # to [149a93e54cb48f3458c6c937dc22d024240286e8] # # patch "view.ml" # from [b67946a0cdb1cf53ffb20dc5cdb85d2f38dc6cdc] # to [1af9c977ea1aae11eb6c1cd1eac98fbaa19cb1ff] # ============================================================ --- Makefile dfd12cb4e23bab838c7ccfad430038fefea99d4e +++ Makefile fff25b38e8a1936ee02a9ffbaf81b98d6a009b90 @@ -99,6 +99,7 @@ endif crypto/ocaml-openssl.o : CINCDIRS = -ccopt "$(CRYPTO_CFLAGS)" gnomecanvas_hack.o : CINCDIRS = -ccopt "$(GNOMECANVAS_CFLAGS)" +$(EXTLIB)/unzip.% : MLFLAGS += -w y REVISION_FILE := $(shell test -r MT/revision && echo MT/revision) REVISION_ID = $(if $(REVISION_FILE),$(shell cat $(REVISION_FILE))) ============================================================ --- subprocess.ml b1d4d0f67fe01838a729f90c585d62ce12dbb0d4 +++ subprocess.ml e1f23ae41fa3d03977419f2f102646e0ad32d546 @@ -192,15 +192,15 @@ end ; let pid = some child_info.Gspawn.pid in - let pid_id = pid_watch pid - (fun s -> - state.status <- s ; - begin - try reap_callback () - with _ -> () - end ; - Gspawn.close_pid pid ; - all_done ()) in + ignore (pid_watch pid + (fun s -> + state.status <- s ; + begin + try reap_callback () + with _ -> () + end ; + Gspawn.close_pid pid ; + all_done ())) ; state ============================================================ --- ui.ml 394a85648f8edc3d3a024d038cdc8b7b5b07e82c +++ ui.ml 149a93e54cb48f3458c6c937dc22d024240286e8 @@ -109,7 +109,6 @@ let make_factory () = - let id = "mviz-query" in let set = GtkStock.Icon_factory.lookup_default "gtk-execute" in let add id label = GtkStock.Item.add ============================================================ --- view.ml b67946a0cdb1cf53ffb20dc5cdb85d2f38dc6cdc +++ view.ml 1af9c977ea1aae11eb6c1cd1eac98fbaa19cb1ff @@ -1035,7 +1035,6 @@ c.canvas#misc#pango_context#get_metrics ~desc () let zoom c ctrl dir () = - let old_ppu = c.ppu in begin match dir with | `IN -> c.ppu <- c.ppu *. sqrt 2. @@ -1176,7 +1175,6 @@ let font = prefs.Viz_style.font in let font_size = get_font_size font in - let font_desc = Pango.Font.from_string font in let match_style = Viz_style.match_style prefs graph db in