diff -x .git -Naupr babychess-16/dep.make babychess/dep.make
--- babychess-16/dep.make	2005-03-19 13:25:45.000000000 +0100
+++ babychess/dep.make	2009-01-06 23:39:22.000000000 +0100
@@ -1,78 +1,70 @@
+DEP_CFLAGS = -D __STDC_FORMAT_MACROS -D __STDC_CONSTANT_MACROS $(CXXFLAGS)
+GTK2_CFLAGS = `pkg-config --cflags gtk+-2.0`
+GTK2_LIBS = `pkg-config --libs gtk+-2.0`
+
 all: bin/babychess-book
-bin/babychess-book:    dep/babychess-book.cc  src/babychess-book.cc           src/arg_main.hh  src/book.hh  src/game.hh  src/dynamic.hh                                                                                                                                      src/generator.hh  src/position.hh  src/square.hh           src/inline.hh  src/piece.hh  src/move.hh  src/inttypes.hh                       src/pointer.hh  src/moveable.hh  src/material.hh            src/legal.hh  src/vector.hh  src/object.hh              src/verbose.hh                                                                              src/main.hh  config.hh  src/string.hh           src/constant.hh  config.hh  src/move_name.hh  src/simple_notation.hh           src/hash_table.hh  src/game_info.hh  src/variation.hh  src/notation.hh           config.hh  src/gettext.hh   src/dump_book.hh           src/stream_file.hh  src/format.hh  src/game_stream.hh  src/fatal.hh           src/pgn.hh  src/raw_pgn.hh  src/parser.hh            src/error.hh  src/book_scores.hh  src/arg_main.cc  src/arg.hh           src/install_dir.hh  src/filename.hh                        src/book.cc  src/fen.hh  src/parse_fen.hh           src/strnlen.hh  config.hh  src/tmp_dir.hh                        src/book_scores.cc  src/constant.cc  src/dump_book.cc  src/error.cc                                            src/fatal.cc   src/format.cc  src/game.cc           src/parse_move.hh  src/nag.hh  src/game_info.cc  src/time.hh                       src/game_stream.cc  src/generator.cc           src/hash_table.cc                                                src/legal.cc           src/moves.hh  src/main.cc  src/move.cc  src/moveable.cc  src/notation.cc           src/parser.cc  src/pgn.cc  src/read_line.hh  src/stdio.hh  config.hh           src/line_reader.hh  config.hh  src/pointer.cc  src/position.cc           src/raw_pgn.cc  src/simple_notation.cc  src/stream_file.cc  src/string.cc           src/variation.cc  src/vector.cc  src/verbose.cc  src/arg.cc           src/version_number.hh  config.hh  config.hh             src/fen.cc  src/filename.cc  src/strdupa.hh           config.hh  src/install_dir.cc  src/home.hh  config.hh                                                                src/line_reader.cc  src/moves.cc  src/nag.cc  src/parse_fen.cc           src/printify_char.hh  src/parse_move.cc  src/read_line.cc  src/stream.hh           src/time.cc  src/tmp_dir.cc  src/home.cc            src/printify_char.cc  src/stream.cc  src/version_number.cc  
-	@echo $(CXX) ... dep/babychess-book.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-book.cc -o $@
+bin/babychess-book:    dep/babychess-book.cc  src/babychess-book.cc           src/arg_main.hh  src/book.hh  src/game.hh  src/dynamic.hh                                                                                                                                      src/generator.hh  src/position.hh  src/square.hh           src/inline.hh  src/piece.hh  src/move.hh src/pointer.hh  src/moveable.hh  src/material.hh            src/legal.hh  src/vector.hh  src/object.hh              src/verbose.hh                                                                              src/main.hh  config.hh  src/string.hh           src/constant.hh  config.hh  src/move_name.hh  src/simple_notation.hh           src/hash_table.hh  src/game_info.hh  src/variation.hh  src/notation.hh           config.hh  src/gettext.hh   src/dump_book.hh           src/stream_file.hh  src/format.hh  src/game_stream.hh  src/fatal.hh           src/pgn.hh  src/raw_pgn.hh  src/parser.hh            src/error.hh  src/book_scores.hh  src/arg_main.cc  src/arg.hh           src/install_dir.hh  src/filename.hh                        src/book.cc  src/fen.hh  src/parse_fen.hh           src/strnlen.hh  config.hh  src/tmp_dir.hh                        src/book_scores.cc  src/constant.cc  src/dump_book.cc  src/error.cc                                            src/fatal.cc   src/format.cc  src/game.cc           src/parse_move.hh  src/nag.hh  src/game_info.cc  src/time.hh                       src/game_stream.cc  src/generator.cc           src/hash_table.cc                                                src/legal.cc           src/moves.hh  src/main.cc  src/move.cc  src/moveable.cc  src/notation.cc           src/parser.cc  src/pgn.cc  src/read_line.hh  src/stdio.hh  config.hh           src/line_reader.hh  config.hh  src/pointer.cc  src/position.cc           src/raw_pgn.cc  src/simple_notation.cc  src/stream_file.cc  src/string.cc           src/variation.cc  src/vector.cc  src/verbose.cc  src/arg.cc           src/version_number.hh  config.hh  config.hh             src/fen.cc  src/filename.cc  src/strdupa.hh           config.hh  src/install_dir.cc  src/home.hh  config.hh                                                                src/line_reader.cc  src/moves.cc  src/nag.cc  src/parse_fen.cc           src/printify_char.hh  src/parse_move.cc  src/read_line.cc  src/stream.hh           src/time.cc  src/tmp_dir.cc  src/home.cc            src/printify_char.cc  src/stream.cc  src/version_number.cc  
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-book.cc -o $@
 
 ifndef build_without_gui
 all: bin/babychess
-bin/babychess:    dep/babychess.cc  src/babychess.cc  src/arg_main.hh           src/start_window.hh  src/packer.hh  src/widget.hh  src/vector.hh           src/object.hh                                                                                                                                        src/moveable.hh  src/inline.hh            src/pointer.hh  src/verbose.hh                                                                               src/main.hh  config.hh  src/string.hh           src/constant.hh  config.hh            src/message_receiver.hh                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      src/text_button.hh                                src/process_open_info.hh           src/bevel.hh  src/window.hh  src/game_editor.hh  src/document_editor.hh           src/file_dialog.hh  src/ask_dialog.hh                                          src/stream_file.hh           src/menubar.hh  src/menu_callback.hh            src/toolbar.hh           src/dynamic.hh  src/editor_window.hh                                                                                                                                                                                                                                                                                                                                                     src/document.hh           src/game.hh  src/generator.hh  src/position.hh  src/square.hh  src/piece.hh           src/move.hh  src/inttypes.hh             src/material.hh  src/legal.hh  src/move_name.hh           src/simple_notation.hh  src/hash_table.hh  src/game_info.hh           src/variation.hh  src/notation.hh  src/board.hh  src/pixmap.hh           src/canvas.hh  src/rgb.hh  src/scaled_board_image.hh  src/alpha_pixmap.hh           src/context_menu.hh                      src/board_settings_editor.hh  src/board_settings.hh           src/board_settings_stream.hh  src/check_box.hh  src/color_chooser.hh           src/owned_color_editor.hh  src/label.hh  src/color_widget.hh           src/drawing_area.hh  src/buttoned.hh  src/button.hh  src/containing.hh           src/gettext.hh  src/configuration_editor.hh  src/conf_menu.hh  src/list.hh           src/scrolled.hh  src/scroll_widget.hh                                                                                                      src/entry.hh                                                                                                                          src/conf.hh           src/dir.hh             src/install_dir.hh  src/filename.hh  src/settings.hh  src/object_editor.hh           src/dialog.hh  src/preferences.hh  src/owned_editor.hh  src/stream.hh           src/bit_board.hh  dep/strings.hh  src/status_bar.hh           src/position_editor.hh  src/position_stream.hh  src/radio_group.hh           src/format.hh  src/framed.hh  src/frame.hh            src/legal_move_list.hh           src/notation_editor.hh  src/labeled_entry_table.hh           src/notation_stream.hh  src/legal_info_widget.hh  src/option_menu.hh                     src/labeled_spin_button.hh  src/spin_button.hh            src/evaluator_widget.hh           src/evaluator_settings_editor.hh  src/evaluator_settings.hh           src/evaluator.hh  src/input_reader.hh  src/io_child_process.hh           src/child_process.hh  src/process.hh  src/process_usage.hh  src/timer.hh           src/engine.hh  src/knots.hh  src/time.hh              src/busy.hh           src/clock.hh  src/engine_editor.hh  src/engine_stream.hh           src/engine_widget.hh  src/labeled_entry.hh  src/opening_book.hh           src/book.hh  config.hh  src/piece_widget.hh  dep/strings.hh           src/game_stream.hh  src/material_widget.hh  src/image_widget.hh           src/game_info_editor.hh  src/promotion_chooser.hh           src/piece_radio_button.hh  src/paned.hh  src/text_view.hh           src/chess_info_widget.hh  src/opening_widget.hh  src/opening_settings.hh           src/opening_settings_editor.hh  src/opening_settings_stream.hh           dep/strings.hh  src/game_list.hh  src/game_archive_editor.hh           src/game_archive.hh  src/raw_pgn.hh  src/game_archive_stream.hh           src/match_window.hh  src/match_player.hh  src/xboard_server.hh           src/player.hh  src/players_editor.hh  src/players.hh  src/player_widget.hh           src/engine_menu.hh  src/players_display.hh  src/internet_window.hh           src/internet.hh  src/socket.hh  src/internet_account_editor.hh           src/internet_account.hh  src/internet_interaction_window.hh  src/error.hh           src/inform.hh  config.hh                                 src/alpha_pixmap.cc  src/alpha_image.hh  src/image.hh           src/arg_main.cc  src/arg.hh             src/ask_dialog.cc  src/ask.hh  src/icon.hh                               src/bevel.cc                       src/board.cc           src/board_image.hh  src/image_stream.hh  src/png.hh           src/board_settings_reset.hh  src/squares_touched.hh           src/board_settings_editor.cc  src/board_settings_stream.cc  src/magic.hh           src/book.cc  src/fen.hh  src/parse_fen.hh  src/strnlen.hh  config.hh           src/tmp_dir.hh               src/busy.cc           src/button.cc  src/canvas.cc  src/check_box.cc                               src/chess_info_widget.cc  src/child_process.cc                                                        src/clock.cc                                              src/color_chooser.cc  src/color_widget.cc           src/conf.cc  src/read_line.hh  src/home.hh  src/conf_menu.cc            src/constant.cc           src/context_menu.cc                       src/dialog.cc            src/dir.cc  src/document.cc           src/document_editor.cc  src/gui_execute.hh  dep/strings.hh            src/drawing_area.cc            src/editor_window.cc           src/engine.cc  config.hh  src/engine_editor.cc  src/engine_menu.cc           src/engine_stream.cc  src/engine_widget.cc  src/entry.cc  src/error.cc           src/evaluator.cc  src/parse_move.hh  src/parser.hh  src/score.hh           src/evaluator_settings.cc  src/evaluator_settings_editor.cc           src/evaluator_widget.cc  src/format_time.hh  src/printf_sep.hh           config.hh  src/version_number.hh  config.hh  src/file_dialog.cc           src/filename.cc  src/strdupa.hh  config.hh  src/format.cc  src/frame.cc           src/game.cc  src/nag.hh  src/game_archive.cc  src/pgn.hh  src/strverscmp.hh           config.hh  src/game_archive_editor.cc  src/help_menu.hh  src/about.hh           dep/strings.hh                      dep/strings.hh           src/game_archive_stream.cc  src/game_editor.cc  src/truncate.hh           src/notation_reset.hh  dep/strings.hh            src/game_info.cc           src/game_info_editor.cc  src/game_list.cc  src/game_stream.cc           src/generator.cc  src/hash_table.cc  src/image_widget.cc  src/inform.cc           src/input_reader.cc  src/install_dir.cc  config.hh  src/internet.cc           src/internet_account_editor.cc  src/internet_interaction_window.cc           src/internet_window.cc  src/internet_account_stream.hh  dep/strings.hh           src/io_child_process.cc  src/label.cc  src/labeled_entry.cc           src/labeled_entry_table.cc  src/labeled_spin_button.cc  src/legal.cc           src/moves.hh  src/legal_info_widget.cc  src/legal_move_list.cc           src/list.cc             src/main.cc           src/match_player.cc  src/match_window.cc  dep/strings.hh           src/material_widget.cc  src/menubar.cc            src/menu_callback.cc           dep/strings.hh  src/message_receiver.cc  src/move.cc  src/moveable.cc           src/notation.cc  src/notation_editor.cc  src/notation_stream.cc           src/opening_book.cc  src/randomize.hh  src/opening_settings_editor.cc           src/opening_widget.cc  src/option_menu.cc  src/owned_color_editor.cc                                src/packer.cc            src/paned.cc                      src/piece_radio_button.cc            src/piece_widget.cc           src/pixmap.cc  src/player.cc  src/players_display.cc           src/players_editor.cc  src/player_widget.cc  src/pointer.cc           src/position.cc  src/position_editor.cc  src/piece_name.hh           dep/strings.hh  src/position_stream.cc  src/stdio.hh  config.hh           src/process.cc  src/process_usage.cc  src/promotion_chooser.cc           src/radio_group.cc  src/raw_pgn.cc  src/scaled_board_image.cc           src/pixmap_stream.hh  src/scroll_widget.cc  src/settings.cc           src/simple_notation.cc  src/socket.cc  src/spin_button.cc           src/start_window.cc            src/status_bar.cc            src/stream.cc  src/stream_file.cc  src/string.cc  src/text_button.cc           src/text_view.cc                                                                                   src/time.cc  src/toolbar.cc                                          src/variation.cc           src/vector.cc  src/verbose.cc  src/widget.cc  src/gtk_timer.hh           src/window.cc  src/xboard_server.cc  src/about.cc  src/line_reader.hh           config.hh            src/alpha_image.cc  src/arg.cc  config.hh  src/board_image.cc           src/board_settings_reset.cc  src/fen.cc  src/format_time.cc           src/gtk_timer.cc  src/gui_execute.cc  src/execute.hh  src/home.cc            src/icon.cc  src/image.cc           src/internet_account_stream.cc  src/magic.cc  src/moves.cc  src/nag.cc           src/notation_reset.cc  src/parse_fen.cc  src/printify_char.hh           src/parse_move.cc  src/parser.cc  src/pgn.cc  src/piece_name.cc           src/pixmap_stream.cc  src/png.cc                          src/randomize.cc  src/read_line.cc           src/score.cc  src/squares_touched.cc  src/tmp_dir.cc  src/truncate.cc           src/version_number.cc  src/execute.cc  src/line_reader.cc           src/printify_char.cc  
-	@echo $(CXX) ... dep/babychess.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess.cc -Wl,--export-dynamic -pthread -L/opt/gnome/lib -L/usr/X11R6/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lxml2 -lpthread -lz -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lpangoft2-1.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lbonobo-2 -lgconf-2 -lgnomevfs-2 -lbonobo-activation -lORBit-2 -lm -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0 -lpng -o $@
+bin/babychess:    dep/babychess.cc  src/babychess.cc  src/arg_main.hh           src/start_window.hh  src/packer.hh  src/widget.hh  src/vector.hh           src/object.hh                                                                                                                                        src/moveable.hh  src/inline.hh            src/pointer.hh  src/verbose.hh                                                                               src/main.hh  config.hh  src/string.hh           src/constant.hh  config.hh            src/message_receiver.hh                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      src/text_button.hh                                src/process_open_info.hh           src/bevel.hh  src/window.hh  src/game_editor.hh  src/document_editor.hh           src/file_dialog.hh  src/ask_dialog.hh                                          src/stream_file.hh           src/menubar.hh  src/menu_callback.hh            src/toolbar.hh           src/dynamic.hh  src/editor_window.hh                                                                                                                                                                                                                                                                                                                                                     src/document.hh           src/game.hh  src/generator.hh  src/position.hh  src/square.hh  src/piece.hh           src/move.hh src/material.hh  src/legal.hh  src/move_name.hh           src/simple_notation.hh  src/hash_table.hh  src/game_info.hh           src/variation.hh  src/notation.hh  src/board.hh  src/pixmap.hh           src/canvas.hh  src/rgb.hh  src/scaled_board_image.hh  src/alpha_pixmap.hh           src/context_menu.hh                      src/board_settings_editor.hh  src/board_settings.hh           src/board_settings_stream.hh  src/check_box.hh  src/color_chooser.hh           src/owned_color_editor.hh  src/label.hh  src/color_widget.hh           src/drawing_area.hh  src/buttoned.hh  src/button.hh  src/containing.hh           src/gettext.hh  src/configuration_editor.hh  src/conf_menu.hh  src/list.hh           src/scrolled.hh  src/scroll_widget.hh                                                                                                      src/entry.hh                                                                                                                          src/conf.hh           src/dir.hh             src/install_dir.hh  src/filename.hh  src/settings.hh  src/object_editor.hh           src/dialog.hh  src/preferences.hh  src/owned_editor.hh  src/stream.hh           src/bit_board.hh  dep/strings.hh  src/status_bar.hh           src/position_editor.hh  src/position_stream.hh  src/radio_group.hh           src/format.hh  src/framed.hh  src/frame.hh            src/legal_move_list.hh           src/notation_editor.hh  src/labeled_entry_table.hh           src/notation_stream.hh  src/legal_info_widget.hh  src/option_menu.hh                     src/labeled_spin_button.hh  src/spin_button.hh            src/evaluator_widget.hh           src/evaluator_settings_editor.hh  src/evaluator_settings.hh           src/evaluator.hh  src/input_reader.hh  src/io_child_process.hh           src/child_process.hh  src/process.hh  src/process_usage.hh  src/timer.hh           src/engine.hh  src/knots.hh  src/time.hh              src/busy.hh           src/clock.hh  src/engine_editor.hh  src/engine_stream.hh           src/engine_widget.hh  src/labeled_entry.hh  src/opening_book.hh           src/book.hh  config.hh  src/piece_widget.hh  dep/strings.hh           src/game_stream.hh  src/material_widget.hh  src/image_widget.hh           src/game_info_editor.hh  src/promotion_chooser.hh           src/piece_radio_button.hh  src/paned.hh  src/text_view.hh           src/chess_info_widget.hh  src/opening_widget.hh  src/opening_settings.hh           src/opening_settings_editor.hh  src/opening_settings_stream.hh           dep/strings.hh  src/game_list.hh  src/game_archive_editor.hh           src/game_archive.hh  src/raw_pgn.hh  src/game_archive_stream.hh           src/match_window.hh  src/match_player.hh  src/xboard_server.hh           src/player.hh  src/players_editor.hh  src/players.hh  src/player_widget.hh           src/engine_menu.hh  src/players_display.hh  src/internet_window.hh           src/internet.hh  src/socket.hh  src/internet_account_editor.hh           src/internet_account.hh  src/internet_interaction_window.hh  src/error.hh           src/inform.hh  config.hh                                 src/alpha_pixmap.cc  src/alpha_image.hh  src/image.hh           src/arg_main.cc  src/arg.hh             src/ask_dialog.cc  src/ask.hh  src/icon.hh                               src/bevel.cc                       src/board.cc           src/board_image.hh  src/image_stream.hh  src/png.hh           src/board_settings_reset.hh  src/squares_touched.hh           src/board_settings_editor.cc  src/board_settings_stream.cc  src/magic.hh           src/book.cc  src/fen.hh  src/parse_fen.hh  src/strnlen.hh  config.hh           src/tmp_dir.hh               src/busy.cc           src/button.cc  src/canvas.cc  src/check_box.cc                               src/chess_info_widget.cc  src/child_process.cc                                                        src/clock.cc                                              src/color_chooser.cc  src/color_widget.cc           src/conf.cc  src/read_line.hh  src/home.hh  src/conf_menu.cc            src/constant.cc           src/context_menu.cc                       src/dialog.cc            src/dir.cc  src/document.cc           src/document_editor.cc  src/gui_execute.hh  dep/strings.hh            src/drawing_area.cc            src/editor_window.cc           src/engine.cc  config.hh  src/engine_editor.cc  src/engine_menu.cc           src/engine_stream.cc  src/engine_widget.cc  src/entry.cc  src/error.cc           src/evaluator.cc  src/parse_move.hh  src/parser.hh  src/score.hh           src/evaluator_settings.cc  src/evaluator_settings_editor.cc           src/evaluator_widget.cc  src/format_time.hh  src/printf_sep.hh           config.hh  src/version_number.hh  config.hh  src/file_dialog.cc           src/filename.cc  src/strdupa.hh  config.hh  src/format.cc  src/frame.cc           src/game.cc  src/nag.hh  src/game_archive.cc  src/pgn.hh  src/strverscmp.hh           config.hh  src/game_archive_editor.cc  src/help_menu.hh  src/about.hh           dep/strings.hh                      dep/strings.hh           src/game_archive_stream.cc  src/game_editor.cc  src/truncate.hh           src/notation_reset.hh  dep/strings.hh            src/game_info.cc           src/game_info_editor.cc  src/game_list.cc  src/game_stream.cc           src/generator.cc  src/hash_table.cc  src/image_widget.cc  src/inform.cc           src/input_reader.cc  src/install_dir.cc  config.hh  src/internet.cc           src/internet_account_editor.cc  src/internet_interaction_window.cc           src/internet_window.cc  src/internet_account_stream.hh  dep/strings.hh           src/io_child_process.cc  src/label.cc  src/labeled_entry.cc           src/labeled_entry_table.cc  src/labeled_spin_button.cc  src/legal.cc           src/moves.hh  src/legal_info_widget.cc  src/legal_move_list.cc           src/list.cc             src/main.cc           src/match_player.cc  src/match_window.cc  dep/strings.hh           src/material_widget.cc  src/menubar.cc            src/menu_callback.cc           dep/strings.hh  src/message_receiver.cc  src/move.cc  src/moveable.cc           src/notation.cc  src/notation_editor.cc  src/notation_stream.cc           src/opening_book.cc  src/randomize.hh  src/opening_settings_editor.cc           src/opening_widget.cc  src/option_menu.cc  src/owned_color_editor.cc                                src/packer.cc            src/paned.cc                      src/piece_radio_button.cc            src/piece_widget.cc           src/pixmap.cc  src/player.cc  src/players_display.cc           src/players_editor.cc  src/player_widget.cc  src/pointer.cc           src/position.cc  src/position_editor.cc  src/piece_name.hh           dep/strings.hh  src/position_stream.cc  src/stdio.hh  config.hh           src/process.cc  src/process_usage.cc  src/promotion_chooser.cc           src/radio_group.cc  src/raw_pgn.cc  src/scaled_board_image.cc           src/pixmap_stream.hh  src/scroll_widget.cc  src/settings.cc           src/simple_notation.cc  src/socket.cc  src/spin_button.cc           src/start_window.cc            src/status_bar.cc            src/stream.cc  src/stream_file.cc  src/string.cc  src/text_button.cc           src/text_view.cc                                                                                   src/time.cc  src/toolbar.cc                                          src/variation.cc           src/vector.cc  src/verbose.cc  src/widget.cc  src/gtk_timer.hh           src/window.cc  src/xboard_server.cc  src/about.cc  src/line_reader.hh           config.hh            src/alpha_image.cc  src/arg.cc  config.hh  src/board_image.cc           src/board_settings_reset.cc  src/fen.cc  src/format_time.cc           src/gtk_timer.cc  src/gui_execute.cc  src/execute.hh  src/home.cc            src/icon.cc  src/image.cc           src/internet_account_stream.cc  src/magic.cc  src/moves.cc  src/nag.cc           src/notation_reset.cc  src/parse_fen.cc  src/printify_char.hh           src/parse_move.cc  src/parser.cc  src/pgn.cc  src/piece_name.cc           src/pixmap_stream.cc  src/png.cc                          src/randomize.cc  src/read_line.cc           src/score.cc  src/squares_touched.cc  src/tmp_dir.cc  src/truncate.cc           src/version_number.cc  src/execute.cc  src/line_reader.cc           src/printify_char.cc  
+	$(CXX) dep/babychess.cc $(DEP_CFLAGS) $(GTK2_CFLAGS) $(GTK2_LIBS) -o $@
 
 endif
 ifndef build_without_test
 all: bin/babychess-dbg-leak
 bin/babychess-dbg-leak:    dep/babychess-dbg-leak.cc  src/babychess-dbg-leak.cc           src/main.hh  config.hh  src/string.hh  src/pointer.hh  src/moveable.hh           src/inline.hh                                                                                                                             src/constant.hh           config.hh  src/object.hh                        src/vector.hh  src/verbose.hh                                                                               src/read_line.hh            src/constant.cc  src/main.cc  src/moveable.cc  src/pointer.cc           src/read_line.cc  src/stream.hh  src/stdio.hh  config.hh  src/string.cc                                                         src/vector.cc           src/verbose.cc  src/stream.cc  
-	@echo $(CXX) ... dep/babychess-dbg-leak.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-dbg-leak.cc -o $@
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-dbg-leak.cc -o $@
 
 endif
 ifndef build_without_test
 all: bin/babychess-dbg-test
 bin/babychess-dbg-test:    dep/babychess-dbg-test.cc  src/babychess-dbg-test.cc           src/main.hh  config.hh  src/string.hh  src/pointer.hh  src/moveable.hh           src/inline.hh                                                                                                                             src/constant.hh           config.hh  src/object.hh                        src/dynamic.hh                                                                               src/constant.cc  src/main.cc  src/verbose.hh  src/moveable.cc           src/pointer.cc  src/string.cc                                                         src/verbose.cc   
-	@echo $(CXX) ... dep/babychess-dbg-test.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-dbg-test.cc -o $@
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-dbg-test.cc -o $@
 
 endif
 all: bin/babychess-engine
-bin/babychess-engine:    dep/babychess-engine.cc  src/babychess-engine.cc           src/arg_main.hh  src/xboard_client.hh  src/input_reader.hh  src/vector.hh           src/object.hh                                                                                                                                        src/moveable.hh  src/inline.hh            src/pointer.hh  src/verbose.hh                                                                               src/main.hh  config.hh  src/string.hh           src/constant.hh  config.hh   src/default_timer.hh           src/timer.hh  src/dynamic.hh  src/evaluator.hh  src/io_child_process.hh           src/child_process.hh  src/process.hh  src/process_usage.hh  src/stream.hh           src/position.hh  src/square.hh  src/piece.hh  src/move.hh  src/inttypes.hh             src/material.hh           src/generator.hh  src/legal.hh  src/move_name.hh  src/simple_notation.hh           src/evaluator_settings.hh  src/engine.hh  src/gettext.hh            src/format.hh  src/knots.hh  src/time.hh                       src/game.hh  src/hash_table.hh           src/game_info.hh  src/variation.hh  src/notation.hh  src/opening_book.hh           src/book.hh  config.hh                                                         src/arg_main.cc  src/arg.hh           src/install_dir.hh  src/filename.hh                        src/book.cc  src/error.hh  src/fen.hh           src/parse_fen.hh  src/strnlen.hh  config.hh  src/tmp_dir.hh                        src/child_process.cc            src/constant.cc  src/default_timer.cc  src/engine.cc  config.hh           src/evaluator.cc  src/parse_move.hh  src/parser.hh            src/score.hh                                              src/evaluator_settings.cc  src/format.cc  src/game.cc  src/nag.hh           src/game_info.cc  src/generator.cc  src/hash_table.cc  src/input_reader.cc           src/io_child_process.cc  src/read_line.hh                                   src/legal.cc  src/moves.hh           src/main.cc  src/move.cc  src/moveable.cc  src/notation.cc           src/opening_book.cc  src/opening_settings.hh  src/randomize.hh           src/pointer.cc  src/position.cc  src/process.cc                                                                 src/process_usage.cc  src/dir.hh             src/simple_notation.cc           src/stream.cc  src/string.cc  src/time.cc  src/variation.cc  src/vector.cc           src/verbose.cc  src/xboard_client.cc  src/simple_poll.hh           src/write_text_position.hh  src/arg.cc  src/version_number.hh           config.hh  config.hh             src/dir.cc  src/error.cc  src/fen.cc           src/filename.cc  src/strdupa.hh  config.hh  src/install_dir.cc           src/home.hh  config.hh  src/moves.cc  src/nag.cc  src/parse_fen.cc           src/printify_char.hh  src/parse_move.cc  src/parser.cc  src/randomize.cc           src/read_line.cc  src/stdio.hh  config.hh  src/score.cc           src/simple_poll.cc  src/tmp_dir.cc  src/write_text_position.cc           src/home.cc   src/printify_char.cc           src/version_number.cc  
-	@echo $(CXX) ... dep/babychess-engine.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-engine.cc -o $@
+bin/babychess-engine:    dep/babychess-engine.cc  src/babychess-engine.cc           src/arg_main.hh  src/xboard_client.hh  src/input_reader.hh  src/vector.hh           src/object.hh                                                                                                                                        src/moveable.hh  src/inline.hh            src/pointer.hh  src/verbose.hh                                                                               src/main.hh  config.hh  src/string.hh           src/constant.hh  config.hh   src/default_timer.hh           src/timer.hh  src/dynamic.hh  src/evaluator.hh  src/io_child_process.hh           src/child_process.hh  src/process.hh  src/process_usage.hh  src/stream.hh           src/position.hh  src/square.hh  src/piece.hh  src/move.hh src/material.hh           src/generator.hh  src/legal.hh  src/move_name.hh  src/simple_notation.hh           src/evaluator_settings.hh  src/engine.hh  src/gettext.hh            src/format.hh  src/knots.hh  src/time.hh                       src/game.hh  src/hash_table.hh           src/game_info.hh  src/variation.hh  src/notation.hh  src/opening_book.hh           src/book.hh  config.hh                                                         src/arg_main.cc  src/arg.hh           src/install_dir.hh  src/filename.hh                        src/book.cc  src/error.hh  src/fen.hh           src/parse_fen.hh  src/strnlen.hh  config.hh  src/tmp_dir.hh                        src/child_process.cc            src/constant.cc  src/default_timer.cc  src/engine.cc  config.hh           src/evaluator.cc  src/parse_move.hh  src/parser.hh            src/score.hh                                              src/evaluator_settings.cc  src/format.cc  src/game.cc  src/nag.hh           src/game_info.cc  src/generator.cc  src/hash_table.cc  src/input_reader.cc           src/io_child_process.cc  src/read_line.hh                                   src/legal.cc  src/moves.hh           src/main.cc  src/move.cc  src/moveable.cc  src/notation.cc           src/opening_book.cc  src/opening_settings.hh  src/randomize.hh           src/pointer.cc  src/position.cc  src/process.cc                                                                 src/process_usage.cc  src/dir.hh             src/simple_notation.cc           src/stream.cc  src/string.cc  src/time.cc  src/variation.cc  src/vector.cc           src/verbose.cc  src/xboard_client.cc  src/simple_poll.hh           src/write_text_position.hh  src/arg.cc  src/version_number.hh           config.hh  config.hh             src/dir.cc  src/error.cc  src/fen.cc           src/filename.cc  src/strdupa.hh  config.hh  src/install_dir.cc           src/home.hh  config.hh  src/moves.cc  src/nag.cc  src/parse_fen.cc           src/printify_char.hh  src/parse_move.cc  src/parser.cc  src/randomize.cc           src/read_line.cc  src/stdio.hh  config.hh  src/score.cc           src/simple_poll.cc  src/tmp_dir.cc  src/write_text_position.cc           src/home.cc   src/printify_char.cc           src/version_number.cc  
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-engine.cc -o $@
 
 all: bin/babychess-evaluator
-bin/babychess-evaluator:    dep/babychess-evaluator.cc           src/babychess-evaluator.cc  src/string.hh  src/pointer.hh  src/moveable.hh           src/inline.hh                                                                                                                             src/constant.hh           config.hh  src/object.hh                        src/position.hh  src/square.hh  src/piece.hh           src/move.hh  src/inttypes.hh              src/material.hh           src/score.hh  src/generator.hh  src/legal.hh  src/vector.hh  src/verbose.hh                                                                              src/main.hh  config.hh  src/move_name.hh           src/simple_notation.hh  src/error.hh  src/time.hh                       src/read_line.hh  src/square_value.hh  src/parse_fen.hh           src/score_position.hh  src/move_score.hh  src/gettext.hh            src/knots.hh  src/arg_main.hh                                                                                                                       src/arg_main.cc  src/arg.hh  src/install_dir.hh  src/format.hh           src/filename.hh               src/constant.cc           src/error.cc                                   src/generator.cc  src/legal.cc  src/moves.hh  src/main.cc  src/move.cc           src/moveable.cc  src/move_score.cc  src/piece_score.hh           src/square_score.hh  src/parse_fen.cc  src/parser.hh            src/notation.hh  src/printify_char.hh  src/pointer.cc  src/position.cc           src/read_line.cc  src/stream.hh  src/stdio.hh  config.hh  src/score.cc           src/score_position.cc  src/position_score.hh  src/game_type.hh           src/simple_notation.cc  src/square_value.cc  src/string.cc  src/time.cc           src/vector.cc  src/verbose.cc  src/arg.cc  src/version_number.hh           config.hh  config.hh             src/filename.cc  src/strdupa.hh  config.hh            src/format.cc  src/game_type.cc  src/install_dir.cc           src/home.hh  config.hh  src/moves.cc  src/notation.cc  src/parser.cc           src/piece_score.cc  src/piece_value.hh  src/position_score.cc           src/printify_char.cc  src/square_score.cc  src/stream.cc  src/home.cc            src/version_number.cc  
-	@echo $(CXX) ... dep/babychess-evaluator.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-evaluator.cc -o $@
+bin/babychess-evaluator:    dep/babychess-evaluator.cc           src/babychess-evaluator.cc  src/string.hh  src/pointer.hh  src/moveable.hh           src/inline.hh                                                                                                                             src/constant.hh           config.hh  src/object.hh                        src/position.hh  src/square.hh  src/piece.hh           src/move.hh src/material.hh           src/score.hh  src/generator.hh  src/legal.hh  src/vector.hh  src/verbose.hh                                                                              src/main.hh  config.hh  src/move_name.hh           src/simple_notation.hh  src/error.hh  src/time.hh                       src/read_line.hh  src/square_value.hh  src/parse_fen.hh           src/score_position.hh  src/move_score.hh  src/gettext.hh            src/knots.hh  src/arg_main.hh                                                                                                                       src/arg_main.cc  src/arg.hh  src/install_dir.hh  src/format.hh           src/filename.hh               src/constant.cc           src/error.cc                                   src/generator.cc  src/legal.cc  src/moves.hh  src/main.cc  src/move.cc           src/moveable.cc  src/move_score.cc  src/piece_score.hh           src/square_score.hh  src/parse_fen.cc  src/parser.hh            src/notation.hh  src/printify_char.hh  src/pointer.cc  src/position.cc           src/read_line.cc  src/stream.hh  src/stdio.hh  config.hh  src/score.cc           src/score_position.cc  src/position_score.hh  src/game_type.hh           src/simple_notation.cc  src/square_value.cc  src/string.cc  src/time.cc           src/vector.cc  src/verbose.cc  src/arg.cc  src/version_number.hh           config.hh  config.hh             src/filename.cc  src/strdupa.hh  config.hh            src/format.cc  src/game_type.cc  src/install_dir.cc           src/home.hh  config.hh  src/moves.cc  src/notation.cc  src/parser.cc           src/piece_score.cc  src/piece_value.hh  src/position_score.cc           src/printify_char.cc  src/square_score.cc  src/stream.cc  src/home.cc            src/version_number.cc  
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-evaluator.cc -o $@
 
 ifndef build_without_test
 all: bin/babychess-test-format
 bin/babychess-test-format:    dep/babychess-test-format.cc           src/babychess-test-format.cc  src/main.hh  config.hh  src/string.hh           src/pointer.hh  src/moveable.hh  src/inline.hh                                                                                                                                      src/constant.hh           config.hh  src/object.hh                        src/format.hh  src/constant.cc  src/format.cc           src/verbose.hh                                                                               src/main.cc  src/moveable.cc  src/pointer.cc           src/string.cc                                                         src/verbose.cc   
-	@echo $(CXX) ... dep/babychess-test-format.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-test-format.cc -o $@
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-test-format.cc -o $@
 
 endif
 ifndef build_without_test
 all: bin/babychess-test-line-reader
 bin/babychess-test-line-reader:    dep/babychess-test-line-reader.cc           src/babychess-test-line-reader.cc  src/main.hh  config.hh           src/string.hh  src/pointer.hh  src/moveable.hh  src/inline.hh                                                                                                                                      src/constant.hh           config.hh  src/object.hh                        src/line_reader.hh  config.hh                                                        src/constant.cc  src/line_reader.cc  src/main.cc  src/verbose.hh                                  src/moveable.cc  src/pointer.cc  src/string.cc                                                                  src/verbose.cc   
-	@echo $(CXX) ... dep/babychess-test-line-reader.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-test-line-reader.cc -o $@
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-test-line-reader.cc -o $@
 
 endif
 ifndef build_without_test
 all: bin/babychess-test-parser
 bin/babychess-test-parser:    dep/babychess-test-parser.cc           src/babychess-test-parser.cc  src/main.hh  config.hh  src/string.hh           src/pointer.hh  src/moveable.hh  src/inline.hh                                                                                                                                      src/constant.hh           config.hh  src/object.hh                        src/parser.hh            src/constant.cc  src/main.cc  src/verbose.hh                                                                               src/moveable.cc  src/parser.cc  src/pointer.cc           src/string.cc                                                         src/verbose.cc  
-	@echo $(CXX) ... dep/babychess-test-parser.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-test-parser.cc -o $@
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-test-parser.cc -o $@
 
 endif
 ifndef build_without_test
 all: bin/babychess-test-position
-bin/babychess-test-position:    dep/babychess-test-position.cc           src/babychess-test-position.cc  src/main.hh  config.hh  src/string.hh           src/pointer.hh  src/moveable.hh  src/inline.hh                                                                                                                                      src/constant.hh           config.hh  src/object.hh                        src/stream.hh                                                        src/read_line.hh  src/position.hh  src/square.hh  src/piece.hh  src/move.hh           src/inttypes.hh             src/material.hh  src/parse_fen.hh  src/generator.hh  src/legal.hh           src/vector.hh  src/verbose.hh                         src/move_name.hh           src/simple_notation.hh  src/notation.hh  src/fen.hh  src/error.hh           src/constant.cc  src/error.cc  src/gettext.hh            src/format.hh                                   src/fen.cc  src/generator.cc  src/legal.cc  src/moves.hh  src/main.cc           src/move.cc  src/moveable.cc  src/notation.cc  src/parse_fen.cc           src/parser.hh   src/printify_char.hh  src/pointer.cc           src/position.cc  src/read_line.cc  src/stdio.hh  config.hh           src/simple_notation.cc  src/stream.cc  src/string.cc                                                         src/vector.cc           src/verbose.cc  src/format.cc  src/moves.cc  src/parser.cc           src/printify_char.cc  
-	@echo $(CXX) ... dep/babychess-test-position.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-test-position.cc -o $@
+bin/babychess-test-position:    dep/babychess-test-position.cc           src/babychess-test-position.cc  src/main.hh  config.hh  src/string.hh           src/pointer.hh  src/moveable.hh  src/inline.hh                                                                                                                                      src/constant.hh           config.hh  src/object.hh                        src/stream.hh                                                        src/read_line.hh  src/position.hh  src/square.hh  src/piece.hh  src/move.hh src/material.hh  src/parse_fen.hh  src/generator.hh  src/legal.hh           src/vector.hh  src/verbose.hh                         src/move_name.hh           src/simple_notation.hh  src/notation.hh  src/fen.hh  src/error.hh           src/constant.cc  src/error.cc  src/gettext.hh            src/format.hh                                   src/fen.cc  src/generator.cc  src/legal.cc  src/moves.hh  src/main.cc           src/move.cc  src/moveable.cc  src/notation.cc  src/parse_fen.cc           src/parser.hh   src/printify_char.hh  src/pointer.cc           src/position.cc  src/read_line.cc  src/stdio.hh  config.hh           src/simple_notation.cc  src/stream.cc  src/string.cc                                                         src/vector.cc           src/verbose.cc  src/format.cc  src/moves.cc  src/parser.cc           src/printify_char.cc  
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-test-position.cc -o $@
 
 endif
 ifndef build_without_test
 all: bin/babychess-test-strnlen
 bin/babychess-test-strnlen:    dep/babychess-test-strnlen.cc           src/babychess-test-strnlen.cc  src/main.hh  config.hh  src/string.hh           src/pointer.hh  src/moveable.hh  src/inline.hh                                                                                                                                      src/constant.hh           config.hh  src/object.hh                        src/strnlen.hh  config.hh  src/verbose.hh                                                                               src/constant.cc  src/main.cc  src/moveable.cc           src/pointer.cc  src/string.cc                                                         src/verbose.cc   
-	@echo $(CXX) ... dep/babychess-test-strnlen.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-test-strnlen.cc -o $@
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-test-strnlen.cc -o $@
 
 endif
 all: bin/babychess-xboard-evaluator
-bin/babychess-xboard-evaluator:    dep/babychess-xboard-evaluator.cc           src/babychess-xboard-evaluator.cc  src/arg_main.hh  src/gettext.hh                                             src/inline.hh   src/main.hh           config.hh  src/string.hh  src/pointer.hh  src/moveable.hh                                                                                                     src/constant.hh           config.hh  src/object.hh                       src/evaluator_xboard_server.hh  src/xboard_server.hh           src/io_child_process.hh  src/child_process.hh  src/process.hh           src/vector.hh  src/verbose.hh                                                                               src/process_usage.hh  src/stream.hh  src/format.hh           src/input_reader.hh  src/knots.hh  src/inttypes.hh             src/error.hh  src/fatal.hh                                                                  src/arg_main.cc  src/arg.hh  src/install_dir.hh  src/filename.hh                        src/child_process.cc                       src/constant.cc  src/error.cc                                            src/evaluator_xboard_server.cc  src/simple_poll.hh  src/fatal.cc            src/format.cc  src/input_reader.cc           src/io_child_process.cc  src/read_line.hh             src/main.cc  src/moveable.cc  src/pointer.cc           src/process.cc                                                       src/process_usage.cc  src/dir.hh              src/stream.cc           src/string.cc  src/vector.cc  src/verbose.cc            src/xboard_server.cc  src/position.hh  src/square.hh  src/piece.hh           src/move.hh  src/material.hh  src/parse_fen.hh  src/parser.hh  src/arg.cc           src/version_number.hh  config.hh  config.hh             src/dir.cc  src/filename.cc  src/strdupa.hh           config.hh  src/install_dir.cc  src/home.hh  config.hh  src/move.cc           src/parse_fen.cc  src/notation.hh  src/move_name.hh  src/printify_char.hh           src/parser.cc  src/position.cc  src/moves.hh  src/read_line.cc           src/stdio.hh  config.hh  src/simple_poll.cc  src/default_timer.hh           src/timer.hh  src/dynamic.hh  src/time.hh  src/default_timer.cc           src/home.cc   src/moves.cc  src/notation.cc           src/printify_char.cc  src/time.cc  src/version_number.cc  
-	@echo $(CXX) ... dep/babychess-xboard-evaluator.cc -o $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) dep/babychess-xboard-evaluator.cc -o $@
+bin/babychess-xboard-evaluator:    dep/babychess-xboard-evaluator.cc           src/babychess-xboard-evaluator.cc  src/arg_main.hh  src/gettext.hh                                             src/inline.hh   src/main.hh           config.hh  src/string.hh  src/pointer.hh  src/moveable.hh                                                                                                     src/constant.hh           config.hh  src/object.hh                       src/evaluator_xboard_server.hh  src/xboard_server.hh           src/io_child_process.hh  src/child_process.hh  src/process.hh           src/vector.hh  src/verbose.hh                                                                               src/process_usage.hh  src/stream.hh  src/format.hh           src/input_reader.hh  src/knots.hh src/error.hh  src/fatal.hh                                                                  src/arg_main.cc  src/arg.hh  src/install_dir.hh  src/filename.hh                        src/child_process.cc                       src/constant.cc  src/error.cc                                            src/evaluator_xboard_server.cc  src/simple_poll.hh  src/fatal.cc            src/format.cc  src/input_reader.cc           src/io_child_process.cc  src/read_line.hh             src/main.cc  src/moveable.cc  src/pointer.cc           src/process.cc                                                       src/process_usage.cc  src/dir.hh              src/stream.cc           src/string.cc  src/vector.cc  src/verbose.cc            src/xboard_server.cc  src/position.hh  src/square.hh  src/piece.hh           src/move.hh  src/material.hh  src/parse_fen.hh  src/parser.hh  src/arg.cc           src/version_number.hh  config.hh  config.hh             src/dir.cc  src/filename.cc  src/strdupa.hh           config.hh  src/install_dir.cc  src/home.hh  config.hh  src/move.cc           src/parse_fen.cc  src/notation.hh  src/move_name.hh  src/printify_char.hh           src/parser.cc  src/position.cc  src/moves.hh  src/read_line.cc           src/stdio.hh  config.hh  src/simple_poll.cc  src/default_timer.hh           src/timer.hh  src/dynamic.hh  src/time.hh  src/default_timer.cc           src/home.cc   src/moves.cc  src/notation.cc           src/printify_char.cc  src/time.cc  src/version_number.cc  
+	$(CXX) $(DEP_CFLAGS) $(LDFLAGS) dep/babychess-xboard-evaluator.cc -o $@
 
 all: po/de/LC_MESSAGES/babychess.mo
 po/de/LC_MESSAGES/babychess.mo: po/de.po
diff -x .git -Naupr babychess-16/sh/base-conf.sh babychess/sh/base-conf.sh
--- babychess-16/sh/base-conf.sh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/sh/base-conf.sh	2009-01-06 21:25:35.000000000 +0100
@@ -1,4 +1,4 @@
 if [ -z "$base_conf_sh" ] ; then
 CXX=${CXX:-g++}
-MANDATORY_CXXFLAGS="`pkg-config --cflags gtk+-2.0 libgnomeui-2.0`"
+MANDATORY_CXXFLAGS="`pkg-config --cflags gtk+-2.0`"
 fi
diff -x .git -Naupr babychess-16/sh/write-dep babychess/sh/write-dep
--- babychess-16/sh/write-dep	2004-12-23 01:19:29.000000000 +0100
+++ babychess/sh/write-dep	2009-01-06 21:25:58.000000000 +0100
@@ -102,7 +102,7 @@ do
     ## Additional flags for the GUI program
     if [ $program = chess ]
     then
-	ld_flags="`pkg-config --libs libgnomeui-2.0` -lpng"
+	ld_flags="`pkg-config --libs libgtk+-2.0`"
     else 
 	ld_flags=
     fi
diff -x .git -Naupr babychess-16/src/about.cc babychess/src/about.cc
--- babychess-16/src/about.cc	2005-03-19 13:22:07.000000000 +0100
+++ babychess/src/about.cc	2009-01-06 22:32:33.000000000 +0100
@@ -10,8 +10,6 @@
 #include "line_reader.hh"
 #include "format.hh"
 
-#include <libgnomeui/gnome-about.h>
-
 void About()
 {
 	static Vector <const char *> authors;
@@ -58,19 +56,12 @@ void About()
 
 	String comments= Format(_("A chess application\nfrom %s"), Version_Date());
 				
-
-	GtkWidget *about= gnome_about_new
-		("BabyChess",
-		 VERSION_NUMBER,
-		 COPYRIGHT_LINE,
-		 comments(),
-		 authors(),
-		 NULL,
-		 translation,
-		 image);
-	if (!about)  return; 
-	Set_Icon(GTK_WINDOW(about));
-	gtk_widget_show(about); 
+        gtk_show_about_dialog(NULL, "version", VERSION_NUMBER,
+                              "copyright", COPYRIGHT_LINE,
+                              "comments", comments(),
+                              "authors", authors(),
+                              "translator-credits", translation,
+                              "logo", image, NULL);
 }
 
 String About_Get_Image_Filename()
diff -x .git -Naupr babychess-16/src/ask_dialog.cc babychess/src/ask_dialog.cc
--- babychess-16/src/ask_dialog.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/ask_dialog.cc	2009-01-07 01:59:33.000000000 +0100
@@ -4,7 +4,6 @@
 #include "format.hh"
 #include "icon.hh"
 
-#include <libgnomeui/gnome-messagebox.h>
 #include <gtk/gtksignal.h>
 
 void Ask_Dialog::Open(String question,
@@ -25,32 +24,19 @@ void Ask_Dialog::Open(String question,
 
 	choice= -1;
 
-#if 1-1
-	question= Format("<strong>%s</strong>", question());
-	/* Markup as described by the HIG should be used, but
-	 * GnomeMessageBox apparently doesn't use markup. 
-	 */
-#endif
+	widget = gtk_message_dialog_new(GTK_WINDOW(parent), GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+                                        question());
+        gtk_dialog_add_buttons(GTK_DIALOG(widget), a, 0, b, 1, c, 2, NULL);
+        gtk_dialog_set_default_response(GTK_DIALOG(widget), 2);
 
-	widget= gnome_message_box_new(question(),
-				      GNOME_MESSAGE_BOX_QUESTION,
-				      a, b, c, NULL);
+	g_signal_connect(G_OBJECT(widget), "clicked", 
+                         G_CALLBACK(Signal_Clicked), this);
 
+	g_signal_connect(G_OBJECT(widget), "close", 
+			 G_CALLBACK(Signal_Close), this);
 
-	gnome_dialog_set_default(GNOME_DIALOG(widget), 2); 
-
-	gtk_signal_connect(GTK_OBJECT(widget), "clicked", 
-			   GTK_SIGNAL_FUNC(& Signal_Clicked), this);
-
-	gtk_signal_connect(GTK_OBJECT(widget), "close", 
-			   GTK_SIGNAL_FUNC(& Signal_Close), this);
-
-
-	gtk_window_set_transient_for(GTK_WINDOW(widget), GTK_WINDOW(parent));
-	gnome_dialog_grab_focus(GNOME_DIALOG(widget), 0);
 	Set_Icon(GTK_WINDOW(widget));
-	gnome_dialog_set_default(GNOME_DIALOG(widget), 2); 
-	gnome_dialog_grab_focus(GNOME_DIALOG(widget), 2); 
 	gtk_widget_show(widget); 
 }
 
diff -x .git -Naupr babychess-16/src/babychess-book.cc babychess/src/babychess-book.cc
--- babychess-16/src/babychess-book.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/babychess-book.cc	2009-01-06 21:14:12.000000000 +0100
@@ -2,13 +2,13 @@
 #include "book.hh"
 #include "gettext.hh"
 #include "dump_book.hh"
-#include "stream_file.hh"
 #include "format.hh"
 #include "game_stream.hh"
 #include "fatal.hh"
 #include "pgn.hh"
 #include "error.hh"
 #include "book_scores.hh"
+#include "stream_file.hh"
 
 #include <unistd.h>
 
diff -x .git -Naupr babychess-16/src/babychess.cc babychess/src/babychess.cc
--- babychess-16/src/babychess.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/babychess.cc	2009-01-07 02:04:21.000000000 +0100
@@ -1,5 +1,15 @@
 #include "arg_main.hh"
 #include "start_window.hh"
+#include "game_stream.hh"
+#include "game_archive_stream.hh"
+#include "engine_stream.hh"
+#include "position_stream.hh"
+#include "notation_stream.hh"
+#include "board_settings_stream.hh"
+#include "opening_settings_stream.hh"
+#include "pixmap_stream.hh"
+#include "alpha_pixmap.hh"
+#include "internet_account_stream.hh"
 #include "game_editor.hh"
 #include "game_archive_editor.hh"
 #include "position_editor.hh"
@@ -10,7 +20,6 @@
 #include "../config.hh"
 
 #include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-ui-init.h>
 
 template <class Type>
 int Gui_Main(int argc, char **argv)
@@ -24,8 +33,8 @@ int Gui_Main(int argc, char **argv)
 	{
 		gtk_widget_show(main_window.Get()); 
 
-		gtk_signal_connect(GTK_OBJECT(main_window.Get()), "destroy",
-				   GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+		g_signal_connect(G_OBJECT(main_window.Get()), "destroy",
+				 G_CALLBACK(gtk_main_quit), NULL);
 		gtk_main(); 
 	}
 	else
@@ -56,8 +65,8 @@ int Gui_Main(int argc, char **argv)
 
 		if (inform_last != NULL)
 		{
-			gtk_signal_connect(GTK_OBJECT(inform_last), "destroy",
-					   GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+			g_signal_connect(G_OBJECT(inform_last), "destroy",
+                                         G_CALLBACK(gtk_main_quit), NULL);
 			gtk_main(); 
 		}
 	}
@@ -68,11 +77,6 @@ int Gui_Main(int argc, char **argv)
 int Arg_Main(int argc, char **argv)		
 {						
 	gtk_init(&argc, &argv);
-	gnome_program_init("BabyChess", 
-			   VERSION_NUMBER, 
-			   LIBGNOMEUI_MODULE,
-			   argc, argv, 
-			   NULL);
 
 	/* We want gettext() to always return strings in UTF-8 because GTK+
 	 * always needs strings in UTF-8, even if the local encoding is
diff -x .git -Naupr babychess-16/src/bit_board.hh babychess/src/bit_board.hh
--- babychess-16/src/bit_board.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/bit_board.hh	2009-01-06 23:37:12.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef BIT_BOARD_HH
 #define BIT_BOARD_HH
 
-#include "inttypes.hh"
+#include <inttypes.h>
 
 class Bit_Board
 {
diff -x .git -Naupr babychess-16/src/board.cc babychess/src/board.cc
--- babychess-16/src/board.cc	2005-01-05 20:31:03.000000000 +0100
+++ babychess/src/board.cc	2009-01-07 02:03:43.000000000 +0100
@@ -246,18 +246,18 @@ bool Board::Open(Pointer <Widget> parent
 			      GDK_BUTTON_RELEASE_MASK      |
 			      GDK_FOCUS_CHANGE_MASK);
 
-	gtk_signal_connect(GTK_OBJECT(Get()), "motion-notify-event",
-			   GTK_SIGNAL_FUNC(Signal_Motion_Notify), this); 
-	gtk_signal_connect(GTK_OBJECT(Get()), "button-press-event",
-			   GTK_SIGNAL_FUNC(Signal_Button_Press), this); 
-	gtk_signal_connect(GTK_OBJECT(Get()), "button-release-event",
-			   GTK_SIGNAL_FUNC(Signal_Button_Release), this); 
-	gtk_signal_connect(GTK_OBJECT(Get()), "focus-in-event",
-			   GTK_SIGNAL_FUNC(Signal_Focus), this);
-	gtk_signal_connect(GTK_OBJECT(Get()), "focus-out-event",
-			   GTK_SIGNAL_FUNC(Signal_Focus), this);
-	gtk_signal_connect(GTK_OBJECT(Get()), "scroll_event",
-			   GTK_SIGNAL_FUNC(Signal_Scroll), this);
+	g_signal_connect(G_OBJECT(Get()), "motion-notify-event",
+			 G_CALLBACK(Signal_Motion_Notify), this); 
+	g_signal_connect(G_OBJECT(Get()), "button-press-event",
+                         G_CALLBACK(Signal_Button_Press), this); 
+	g_signal_connect(G_OBJECT(Get()), "button-release-event",
+			 G_CALLBACK(Signal_Button_Release), this); 
+	g_signal_connect(G_OBJECT(Get()), "focus-in-event",
+			 G_CALLBACK(Signal_Focus), this);
+	g_signal_connect(G_OBJECT(Get()), "focus-out-event",
+			 G_CALLBACK(Signal_Focus), this);
+	g_signal_connect(G_OBJECT(Get()), "scroll_event",
+			 G_CALLBACK(Signal_Scroll), this);
 	
 
 	if (frame_width < 0)
diff -x .git -Naupr babychess-16/src/board_image.cc babychess/src/board_image.cc
--- babychess-16/src/board_image.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/board_image.cc	2009-01-06 23:42:28.000000000 +0100
@@ -4,7 +4,6 @@
  * as "freeware". 
  */
 
-#include "stream_file.hh"
 #include "alpha_pixmap.hh"
 #include "filename.hh"
 #include "install_dir.hh"
diff -x .git -Naupr babychess-16/src/board_settings_editor.cc babychess/src/board_settings_editor.cc
--- babychess-16/src/board_settings_editor.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/board_settings_editor.cc	2009-01-06 23:43:35.000000000 +0100
@@ -1,6 +1,4 @@
 #include "board_settings_editor.hh"
-
-#include "stream_file.hh"
 #include "board_settings_reset.hh"
 
 bool Board_Settings_Editor::CE_Open(Pointer <Widget> parent,
diff -x .git -Naupr babychess-16/src/board_settings_reset.cc babychess/src/board_settings_reset.cc
--- babychess-16/src/board_settings_reset.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/board_settings_reset.cc	2009-01-06 23:44:13.000000000 +0100
@@ -1,9 +1,8 @@
 #include "board_settings_reset.hh"
-
 #include "install_dir.hh"
-#include "stream_file.hh"
 #include "filename.hh"
 #include "board_settings_stream.hh"
+#include "stream_file.hh"
 
 void Board_Settings::Reset()
 {
diff -x .git -Naupr babychess-16/src/book.cc babychess/src/book.cc
--- babychess-16/src/book.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/book.cc	2009-01-06 21:16:53.000000000 +0100
@@ -31,7 +31,7 @@ bool Book::Open_New(const char *filename
 	Set_Sizes();
 	prot= PROT_READ|PROT_WRITE;
 	entries= (Entry*)mmap(NULL, page_size, prot, MAP_SHARED, fd, 0);
-	if ((int)entries == -1)  
+	if (entries == (void *) -1)  
 	{
 		entries= NULL; 
 		close(fd);
@@ -90,7 +90,7 @@ bool Book::Open_Anonymous()
 
 #endif /* ! HAVE_MREMAP */
 
-	if ((int)entries == -1)  
+	if (entries == (void *) -1)  
 	{
 #if ! HAVE_MREMAP
 		close(fd); 
@@ -417,7 +417,7 @@ bool Book::Open_Read(const char *filenam
 	prot= PROT_READ;
 	entries= (Entry*)mmap(NULL, pages << page_shift, prot, MAP_SHARED, fd, 0);
 
-	if ((int)entries == -1)  
+	if (entries == (void *) -1)  
 	{
 
 		entries= NULL; 
diff -x .git -Naupr babychess-16/src/book.hh babychess/src/book.hh
--- babychess-16/src/book.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/book.hh	2009-01-06 23:37:56.000000000 +0100
@@ -4,8 +4,9 @@
 /* A memory mapped BabyChess book.  See etc/BOOK. 
  */
 
+#include <inttypes.h>
+
 #include "game.hh"
-#include "inttypes.hh"
 #include "../config.hh"
 
 enum {bo_position= (1 << 0),   /* entry types */ 
diff -x .git -Naupr babychess-16/src/button.cc babychess/src/button.cc
--- babychess-16/src/button.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/button.cc	2009-01-07 02:04:39.000000000 +0100
@@ -16,9 +16,7 @@ bool Button::Open(Pointer <Widget> paren
 	if (! Widget::Open(parent, gtk_button_new()))
 		return false;
 
-	gtk_signal_connect(GTK_OBJECT(Get()), 
-			   "clicked",
-			   GTK_SIGNAL_FUNC(Signal_Clicked), 
-			   this);
+	g_signal_connect(G_OBJECT(Get()), "clicked",
+                         G_CALLBACK(Signal_Clicked), this);
 	return true; 
 }
diff -x .git -Naupr babychess-16/src/check_box.cc babychess/src/check_box.cc
--- babychess-16/src/check_box.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/check_box.cc	2009-01-07 02:05:59.000000000 +0100
@@ -14,10 +14,8 @@ bool Check_Box::Open(Pointer <Widget> pa
 
 	msg_clicked= new_msg_clicked; 
 
-	gtk_signal_connect(GTK_OBJECT(Get()), 
-			   "clicked",
-			   GTK_SIGNAL_FUNC(Signal_Clicked), 
-			   this);
+	g_signal_connect(G_OBJECT(Get()), "clicked",
+			 G_CALLBACK(Signal_Clicked), this);
 	
 	Set_Checked(checked); 
 
diff -x .git -Naupr babychess-16/src/clock.hh babychess/src/clock.hh
--- babychess-16/src/clock.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/clock.hh	2009-01-06 22:26:19.000000000 +0100
@@ -1,8 +1,6 @@
 #ifndef CLOCK_HH
 #define CLOCK_HH
 
-/* GnomeUI should really have a clock.  */
-
 #include "drawing_area.hh"
 
 class Clock
diff -x .git -Naupr babychess-16/src/configuration_editor.hh babychess/src/configuration_editor.hh
--- babychess-16/src/configuration_editor.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/configuration_editor.hh	2009-01-07 00:36:16.000000000 +0100
@@ -3,7 +3,6 @@
 
 #include "conf_menu.hh"
 #include "object_editor.hh"
-#include "stream_file.hh"
 #include "packer.hh"
 
 template <class Type>
diff -x .git -Naupr babychess-16/src/context_menu.hh babychess/src/context_menu.hh
--- babychess-16/src/context_menu.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/context_menu.hh	2009-01-06 23:10:03.000000000 +0100
@@ -3,8 +3,7 @@
 
 #include "context_menu.hh"
 
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 class Widget;
 
diff -x .git -Naupr babychess-16/src/dialog.cc babychess/src/dialog.cc
--- babychess-16/src/dialog.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/dialog.cc	2009-01-07 02:04:51.000000000 +0100
@@ -46,8 +46,8 @@ bool Dialog::Dialog_Open(bool new_hide_a
 			       NULL);
 	if (! Widget::Open(NULL, dialog, true))
 		return false;
-	gtk_signal_connect(GTK_OBJECT(Get()), "response",
-			   GTK_SIGNAL_FUNC(Signal_Response), this);
+	g_signal_connect(G_OBJECT(Get()), "response",
+			 G_CALLBACK(Signal_Response), this);
 
 	Set_Icon(GTK_WINDOW(Get()));
 
diff -x .git -Naupr babychess-16/src/drawing_area.cc babychess/src/drawing_area.cc
--- babychess-16/src/drawing_area.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/drawing_area.cc	2009-01-07 02:07:04.000000000 +0100
@@ -9,12 +9,12 @@ bool Drawing_Area::Open(Pointer <Widget>
 
 	if (gtkwidget == NULL) return false;
 
-	gtk_signal_connect(GTK_OBJECT(gtkwidget), "expose-event",
-			   GTK_SIGNAL_FUNC(Signal_Expose), this); 
-	gtk_signal_connect(GTK_OBJECT(gtkwidget), "size-allocate",
-			   GTK_SIGNAL_FUNC(Signal_Size_Allocate), this); 
-	gtk_signal_connect(GTK_OBJECT(gtkwidget), "size-request",
-			   GTK_SIGNAL_FUNC(Signal_Size_Request), this); 
+	g_signal_connect(G_OBJECT(gtkwidget), "expose-event",
+                         G_CALLBACK(Signal_Expose), this); 
+	g_signal_connect(G_OBJECT(gtkwidget), "size-allocate",
+			 G_CALLBACK(Signal_Size_Allocate), this); 
+	g_signal_connect(G_OBJECT(gtkwidget), "size-request",
+			 G_CALLBACK(Signal_Size_Request), this); 
 
 	if (!  Widget::Open(parent, gtkwidget))
 		return false;
diff -x .git -Naupr babychess-16/src/file_dialog.cc babychess/src/file_dialog.cc
--- babychess-16/src/file_dialog.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/file_dialog.cc	2009-01-07 02:05:39.000000000 +0100
@@ -45,19 +45,15 @@ void File_Dialog::Open(Type new_type,
 	
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(widget),
 					filename());
-
                            
-	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(widget)->ok_button),
-			    "clicked", GTK_SIGNAL_FUNC(& Signal_OK),
-			    this);
-
-	gtk_signal_connect
-		(GTK_OBJECT (GTK_FILE_SELECTION(widget)->cancel_button),
-		 "clicked", GTK_SIGNAL_FUNC(& Signal_Cancel),
-		 this);
+	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(widget)->ok_button),
+                         "clicked", G_CALLBACK(& Signal_OK), this);
+
+	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION(widget)->cancel_button),
+                         "clicked", G_CALLBACK(& Signal_Cancel), this);
+	g_signal_connect(G_OBJECT(widget), "destroy",
+			 G_CALLBACK(Signal_Destroy), this);
 
-	gtk_signal_connect(GTK_OBJECT(widget), "destroy",
-			   GTK_SIGNAL_FUNC(Signal_Destroy), this);
 	gtk_widget_show(widget); 
 }
 
diff -x .git -Naupr babychess-16/src/game_archive_editor.cc babychess/src/game_archive_editor.cc
--- babychess-16/src/game_archive_editor.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/game_archive_editor.cc	2009-01-07 02:07:22.000000000 +0100
@@ -73,10 +73,8 @@ bool Game_Archive_Editor::Document_Edito
 	game_list->Set_Column_Right_Aligned(0);
 	game_list->Set_Column_Right_Aligned(5);
 	game_list->Set_Column_Right_Aligned(6);
-	gtk_signal_connect(GTK_OBJECT(game_list().Get()),
-			   "click-column",
-			   GTK_SIGNAL_FUNC(& Signal_Click_Column),
-			   this);
+	g_signal_connect(G_OBJECT(game_list().Get()), "click-column",
+			 G_CALLBACK(& Signal_Click_Column), this);
 	
 
 	if (! status_bar.Open(parent(), 2))
diff -x .git -Naupr babychess-16/src/game.cc babychess/src/game.cc
--- babychess-16/src/game.cc	2004-12-28 21:38:52.000000000 +0100
+++ babychess/src/game.cc	2009-01-06 23:46:26.000000000 +0100
@@ -2,7 +2,6 @@
 
 #include "parse_move.hh"
 #include "fen.hh"
-//#include "stream_file.hh"
 #include "parse_fen.hh"
 #include "nag.hh"
 #include "format.hh"
diff -x .git -Naupr babychess-16/src/help_menu.hh babychess/src/help_menu.hh
--- babychess-16/src/help_menu.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/help_menu.hh	2009-01-06 22:23:19.000000000 +0100
@@ -4,12 +4,10 @@
 #include "about.hh"
 #include "../dep/strings.hh"
 
-#include <libgnomeui/gnome-stock-icons.h>
-
 #define HELP_MENU \
   { N_("/_Help"),            NULL,         \
     NULL,           0,                  "<Branch>",    0},\
   { N_("/Help/_About"),                      NULL,        \
-    &About,  str_about,    "<StockItem>", GNOME_STOCK_ABOUT},
+    &About,  str_about,    "<StockItem>", GTK_STOCK_ABOUT},
 
 #endif /* ! HELP_MENU_HH */
diff -x .git -Naupr babychess-16/src/inform.cc babychess/src/inform.cc
--- babychess-16/src/inform.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/inform.cc	2009-01-06 22:38:58.000000000 +0100
@@ -6,26 +6,18 @@
 
 #include <gtk/gtkstock.h>
 #include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-messagebox.h>
 
 GtkWidget *inform_last;
 
 void Inform(String text,
-	    const gchar *message_box_type,
+	    GtkMessageType type,
 	    Pointer <Widget> transient_for)
 {
 	Verbose_Function(); 
 
-	inform_last= gnome_message_box_new
-		(text(),
-		 message_box_type,
-		 GTK_STOCK_OK, NULL);
-	if (inform_last == NULL)  return;
-
-	if (transient_for)
-		gtk_window_set_transient_for
-			(GTK_WINDOW(inform_last), 
-			 GTK_WINDOW(transient_for->Root().Get()));
+        inform_last = gtk_message_dialog_new(GTK_WINDOW(transient_for->Get()),
+                                             GTK_DIALOG_MODAL, type,
+                                             GTK_BUTTONS_OK, text());
 	gtk_widget_show(inform_last);
 }
 
@@ -33,6 +25,5 @@ void Inform_Error(String what,
 		  Pointer <Widget> widget)
 {
 	Inform(Format("%s%s  %s",  what(), _(":"), Error::Get()()),
-	       GNOME_MESSAGE_BOX_ERROR,
-	       widget);
+	       GTK_MESSAGE_ERROR, widget);
 }
diff -x .git -Naupr babychess-16/src/+inform_error.cc+ babychess/src/+inform_error.cc+
--- babychess-16/src/+inform_error.cc+	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/+inform_error.cc+	2009-01-06 22:27:43.000000000 +0100
@@ -6,7 +6,6 @@
 #include "gettext.hh"
 
 #include <libintl.h>
-#include <libgnomeui/gnome-messagebox.h>
 
 void Inform_Error(String what,
 		  Pointer <Widget> widget)
@@ -14,10 +13,6 @@ void Inform_Error(String what,
 	Verbose("Inform_Error(\"%s\")",
 		what());
 
-	Inform(Format("%s%s  %s", 
-		      what(),
-		      _(":"),
-		      Error::Get()()),
-	       GNOME_MESSAGE_BOX_ERROR,
-	       widget);
+	Inform(Format("%s%s  %s", what(), _(":"), Error::Get()()),
+	       GTK_MESSAGE_ERROR, widget);
 }
diff -x .git -Naupr babychess-16/src/inttypes.hh babychess/src/inttypes.hh
--- babychess-16/src/inttypes.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/inttypes.hh	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#ifndef INTTYPES_HH
-#define INTTYPES_HH
-
-#define __STDC_FORMAT_MACROS
-#define __STDC_CONSTANT_MACROS
-#include <inttypes.h>
-
-#endif /* ! INTTYPES_HH */ 
diff -x .git -Naupr babychess-16/src/knots.hh babychess/src/knots.hh
--- babychess-16/src/knots.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/knots.hh	2009-01-06 23:37:21.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef KNOTS_HH
 #define KNOTS_HH
 
-#include "inttypes.hh"
+#include <inttypes.h>
 
 typedef uint64_t knots_t;
 
diff -x .git -Naupr babychess-16/src/list.cc babychess/src/list.cc
--- babychess-16/src/list.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/list.cc	2009-01-07 02:06:18.000000000 +0100
@@ -46,10 +46,8 @@ bool List_Content::Open(Pointer <Widget>
 	msg_clicked= new_msg_clicked; 
 	frozen= false;
 
-	gtk_signal_connect(GTK_OBJECT(Get()),
-			   "select-row",
-			   GTK_SIGNAL_FUNC(& Signal_Select_Row),
-			   this);
+	g_signal_connect(G_OBJECT(Get()), "select-row",
+			 G_CALLBACK(& Signal_Select_Row), this);
 
 	return true;
 }
diff -x .git -Naupr babychess-16/src/menubar.hh babychess/src/menubar.hh
--- babychess-16/src/menubar.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/menubar.hh	2009-01-06 23:10:11.000000000 +0100
@@ -4,7 +4,7 @@
 #include "widget.hh"
 #include "menu_callback.hh"
 
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
 
 class Menubar
 	:  public Widget
diff -x .git -Naupr babychess-16/src/move.hh babychess/src/move.hh
--- babychess-16/src/move.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/move.hh	2009-01-06 23:37:35.000000000 +0100
@@ -4,9 +4,10 @@
 /* Information necessary to play the move on the board, and to take it back 
  */
 
+#include <inttypes.h>
+
 #include "square.hh"
 #include "piece.hh"
-#include "inttypes.hh"
 #include "pointer.hh"
 
 enum {wO_O=   4, 
diff -x .git -Naupr babychess-16/src/notation_editor.cc babychess/src/notation_editor.cc
--- babychess-16/src/notation_editor.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/notation_editor.cc	2009-01-06 23:46:40.000000000 +0100
@@ -1,10 +1,10 @@
 #include "notation_editor.hh"
 
 #include "verbose.hh"
-#include "stream_file.hh"
 #include "notation_stream.hh"
 #include "notation_reset.hh"
 #include "gettext.hh"
+#include "stream_file.hh"
 
 bool Notation_Editor::CE_Open(Pointer <Widget> parent,
 			      const Notation &notation)
diff -x .git -Naupr babychess-16/src/option_menu.cc babychess/src/option_menu.cc
--- babychess-16/src/option_menu.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/option_menu.cc	2009-01-07 02:07:40.000000000 +0100
@@ -18,10 +18,8 @@ bool Option_Menu::Open(Pointer <Widget> 
 		Close();
 		return false;
 	}
-	gtk_signal_connect(GTK_OBJECT(Get()),
-			   "changed",
-			   GTK_SIGNAL_FUNC(& Signal_Changed),
-			   this);
+	g_signal_connect(G_OBJECT(Get()), "changed",
+                         G_CALLBACK(& Signal_Changed), this);
 	return true;
 }
 
diff -x .git -Naupr babychess-16/src/owned_color_editor.cc babychess/src/owned_color_editor.cc
--- babychess-16/src/owned_color_editor.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/owned_color_editor.cc	2009-01-07 02:02:51.000000000 +0100
@@ -31,14 +31,10 @@ void Owned_Color_Editor::Open(String new
 	gtk_color_selection_set_color
 		(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(widget)->colorsel),
 		 d);
-	gtk_signal_connect (GTK_OBJECT (GTK_COLOR_SELECTION_DIALOG(widget)->ok_button),
-			    "clicked", GTK_SIGNAL_FUNC(& Signal_OK),
-			    this);
-
-	gtk_signal_connect
-		(GTK_OBJECT (GTK_COLOR_SELECTION_DIALOG(widget)->cancel_button),
-		 "clicked", GTK_SIGNAL_FUNC(& Signal_Cancel),
-		 this);
+	g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(widget)->ok_button),
+                         "clicked", G_CALLBACK(Signal_OK), this);
+	g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(widget)->cancel_button),
+                         "clicked", G_CALLBACK(& Signal_Cancel), this);
 
 	gtk_widget_show(widget);
 	
diff -x .git -Naupr babychess-16/src/piece_radio_button.cc babychess/src/piece_radio_button.cc
--- babychess-16/src/piece_radio_button.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/piece_radio_button.cc	2009-01-07 02:07:58.000000000 +0100
@@ -21,10 +21,8 @@ bool Piece_Radio_Button::Open(Pointer <W
 	
 	if (! piece.Open(this, p, unit * 3 / 2))  goto close;
 	
-	gtk_signal_connect(GTK_OBJECT(Get()), 
-			   "clicked",
-			   GTK_SIGNAL_FUNC(Signal_Clicked), 
-			   this);
+	g_signal_connect(G_OBJECT(Get()), "clicked",
+                         G_CALLBACK(Signal_Clicked), this);
 
 	msg_changed= new_msg_changed; 
 	
diff -x .git -Naupr babychess-16/src/pixmap_stream.hh babychess/src/pixmap_stream.hh
--- babychess-16/src/pixmap_stream.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/pixmap_stream.hh	2009-01-07 01:40:37.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef PIXMAP_STREAM_HH
-#define PIXMAP_STREAM_HH
+/*#ifndef PIXMAP_STREAM_HH
+#define PIXMAP_STREAM_HH*/
 
 #include "pixmap.hh"
 #include "image_stream.hh"
@@ -7,4 +7,4 @@
 bool Write_Stream(FILE *, const Pixmap *);
 bool Read_Stream(FILE *, Pixmap *);
 
-#endif /* ! PIXMAP_STREAM_HH */
+//#endif /* ! PIXMAP_STREAM_HH */
diff -x .git -Naupr babychess-16/src/pointer.hh babychess/src/pointer.hh
--- babychess-16/src/pointer.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/pointer.hh	2009-01-06 21:28:34.000000000 +0100
@@ -94,7 +94,7 @@ int Pointer_Size()
 
 	pointer_check= false;
 
-	return (int)real_end - (int)type_begin;
+	return (unsigned char *)real_end - (unsigned char *)type_begin;
 }
 
 
diff -x .git -Naupr babychess-16/src/radio_group.cc babychess/src/radio_group.cc
--- babychess-16/src/radio_group.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/radio_group.cc	2009-01-07 02:01:40.000000000 +0100
@@ -24,10 +24,8 @@ bool Text_Radio_Button::Open(Pointer <Wi
 
 	if (! Widget::Open(parent, w))  return false;
 
-	gtk_signal_connect(GTK_OBJECT(Get()), 
-			   "clicked",
-			   GTK_SIGNAL_FUNC(Signal_Clicked), 
-			   this);
+	g_signal_connect(GTK_OBJECT(Get()), "clicked",
+                         G_CALLBACK(Signal_Clicked), this);
 
 	msg_changed= new_msg_changed; 
 
diff -x .git -Naupr babychess-16/src/scaled_board_image.cc babychess/src/scaled_board_image.cc
--- babychess-16/src/scaled_board_image.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/scaled_board_image.cc	2009-01-07 01:44:46.000000000 +0100
@@ -3,11 +3,11 @@
 #include "board_image.hh"
 #include "format.hh"
 #include "filename.hh"
-#include "stream_file.hh"
 #include "pixmap_stream.hh"
 #include "image.hh"
 #include "dir.hh"
 #include "piece.hh"
+#include "stream_file.hh"
 
 #include <unistd.h>
 #include <sys/stat.h>
diff -x .git -Naupr babychess-16/src/settings.hh babychess/src/settings.hh
--- babychess-16/src/settings.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/settings.hh	2009-01-07 00:36:16.000000000 +0100
@@ -6,7 +6,6 @@
 #include "filename.hh"
 #include "inline.hh"
 #include "dir.hh"
-#include "stream_file.hh"
 
 #include <glib/gutils.h>
 
diff -x .git -Naupr babychess-16/src/spin_button.cc babychess/src/spin_button.cc
--- babychess-16/src/spin_button.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/spin_button.cc	2009-01-07 02:06:34.000000000 +0100
@@ -25,10 +25,8 @@ bool Spin_Button::Open(Pointer <Widget> 
 	msg_changed= open_info.msg_changed;
 
 	in= true;
-	gtk_signal_connect(GTK_OBJECT(Get()), 
-			   "changed",
-			   GTK_SIGNAL_FUNC(Signal_Changed), 
-			   this);
+	g_signal_connect(G_OBJECT(Get()), "changed",
+			 G_CALLBACK(Signal_Changed), this);
 	in= false;
 	return true;
 }
diff -x .git -Naupr babychess-16/src/stream_file.hh babychess/src/stream_file.hh
--- babychess-16/src/stream_file.hh	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/stream_file.hh	2009-01-07 00:29:03.000000000 +0100
@@ -5,120 +5,40 @@
  * module are used.  Return FALSE on error.  
  */
 
-//#include "stream.hh"
-#include "string.hh"
-
 #include <stdio.h>
 
+typedef bool (*ReadStreamFunc) (FILE *, void *);
+typedef bool (*WriteStreamFunc) (FILE *, const void *);
+
 bool Read_From_File_Helper(const char *filename,
-			   void *object,
-			   bool (*) (FILE *, void *));
+			   void *object, ReadStreamFunc);
+bool Write_To_File_Helper(const char *filename,
+			  const void *object, WriteStreamFunc);
+String Write_To_Tmp_File_Helper(const void *object, WriteStreamFunc);
+
 
 template <class Type> 
 bool Read_From_File(const char *filename,
 		    Type &object)
 {
-	typedef bool (*exact_type) (FILE *, Type *);
-	exact_type p= &Read_Stream;
-	return Read_From_File_Helper
-		(filename,
-		 &object,
-		 (bool (*) (FILE *, void *)) p);
-
-#if 0
-	Stream stream;
-	
-	if (! stream.Open(filename, "rb"))
-		return false;
-
-
-	if (! Read_Stream(stream(), &object))
-	{
-		stream.Close(); 
-		return false;
-	}
-
-	if (! stream.Close())
-		return false;
-
-	return true;
-#endif /* 0 */ 
+	bool (*p) (FILE *, Type *) = Read_Stream;
+	return Read_From_File_Helper(filename, &object, (ReadStreamFunc) p);
 }
 
-bool Write_To_File_Helper(const char *filename,
-			  const void *object,
-			  bool (*) (FILE *, const void *));
-
 template <class Type>
 bool Write_To_File(const char *filename,
 		   const Type &object)
 {
-	typedef bool (*exact_type) (FILE *, const Type *);
-	exact_type p= &Write_Stream;
-	return Write_To_File_Helper
-		(filename, &object, (bool (*) (FILE *, const void *)) p);
-
-#if 0
-	Stream stream;
-
-	String tmp_name= filename;
-	tmp_name += ".backup";
-
-	if (! stream.Open(tmp_name(), "wb"))
-		return false;
-	if (! Write_Stream(stream(), &object))
-	{
-		stream.Close(); 
-		goto remove_tmp;
-	}
-	if (! stream.Close())
-		goto remove_tmp;
-	if (0 > rename(tmp_name(), filename))  return false;
-
-
-
-	return true;
-
- remove_tmp:
-	unlink(tmp_name());
-	return false;
-#endif /* 0 */ 
+	bool (*p) (FILE *, const Type *) = Write_Stream;
+	return Write_To_File_Helper(filename, &object, (WriteStreamFunc) p);
 }
 
-String Write_To_Tmp_File_Helper
-(const void *object, 
- bool (*) (FILE *, const void *));
 
 template <class Type>
 String Write_To_Tmp_File(const Type &object)
 {
-	typedef bool (*exact_type) (FILE *, const Type *);
-	exact_type p= &Write_Stream;
-	return Write_To_Tmp_File_Helper
-		(&object, (bool (*) (FILE *, const void *)) p);
-#if 0
-	String filename= Format("%s/babychess.stream_file.XXXXXX", Tmp_Dir());
-	int fd= mkstemp(filename.c());
-	if (fd < 0)  return "";
-	Stream stream;
-	if (! stream.Open_FD(fd, "w"))
-		goto close_fd;
-	if (! Write_Stream(stream(), &object))
-	{
-		stream.Close(); 
-		goto unlink;
-	}
-	if (! stream.Close())
-		goto unlink;
-
-	return filename();
-	
- close_fd:
-	close(fd);
- unlink:
-	unlink(filename());
-	return "";
-#endif /* 0 */ 
+	bool (*p) (FILE *, const Type *) = Write_Stream;
+	return Write_To_Tmp_File_Helper(&object, (WriteStreamFunc) p);
 }
 
 #endif /* ! STREAM_FILE_HH */
diff -x .git -Naupr babychess-16/src/text_button.cc babychess/src/text_button.cc
--- babychess-16/src/text_button.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/text_button.cc	2009-01-07 02:01:26.000000000 +0100
@@ -20,10 +20,8 @@ bool Text_Button::Open(Pointer <Widget> 
 	     : gtk_button_new_with_mnemonic(open_info.text())))
 		return false;
 	gtk_widget_set_sensitive(Get(), open_info.sensitive);
-	gtk_signal_connect(GTK_OBJECT(Get()), 
-			   "clicked",
-			   GTK_SIGNAL_FUNC(Signal_Clicked), 
-			   this);
+	g_signal_connect(G_OBJECT(Get()), "clicked",
+                         G_CALLBACK(Signal_Clicked), this);
 			
 	return true; 
 }
diff -x .git -Naupr babychess-16/src/toolbar.cc babychess/src/toolbar.cc
--- babychess-16/src/toolbar.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/toolbar.cc	2009-01-07 02:01:08.000000000 +0100
@@ -78,10 +78,8 @@ GtkWidget *Toolbar::Append_Image(const c
 				  button,
 				  tooltip,
 				  "private-help");
-	gtk_signal_connect(GTK_OBJECT(button), 
-			   "clicked",
-			   (GtkSignalFunc) & Callback::Call,
-			   New_Callback(message));
+	g_signal_connect(G_OBJECT(button), "clicked",
+			 G_CALLBACK(Callback::Call), New_Callback(message));
 	return button; 
 }
 
diff -x .git -Naupr babychess-16/src/widget.cc babychess/src/widget.cc
--- babychess-16/src/widget.cc	2004-12-23 01:14:44.000000000 +0100
+++ babychess/src/widget.cc	2009-01-07 02:00:25.000000000 +0100
@@ -27,10 +27,10 @@ bool Widget::Open(Pointer <Widget> new_p
 
 	gtkwidget= new_gtkwidget;
 
-	gtk_signal_connect(GTK_OBJECT(gtkwidget), "delete-event",
-			   GTK_SIGNAL_FUNC(Signal_Delete), this);
-	gtk_signal_connect(GTK_OBJECT(gtkwidget), "destroy",
-			   G_CALLBACK(Signal_Destroy), this);
+	g_signal_connect(G_OBJECT(gtkwidget), "delete-event",
+                         G_CALLBACK(Signal_Delete), this);
+	g_signal_connect(G_OBJECT(gtkwidget), "destroy",
+                         G_CALLBACK(Signal_Destroy), this);
 
 	if (new_parent.Is())
 	{
@@ -182,8 +182,8 @@ void Widget::Connect_Key_Signals(GtkWidg
 {
 	gtk_widget_add_events(widget, GDK_KEY_PRESS); 
 
-	gtk_signal_connect(GTK_OBJECT(gtkwidget), "key-press-event",
-			   GTK_SIGNAL_FUNC(Signal_Key_Press_Event), this);
+	g_signal_connect(G_OBJECT(gtkwidget), "key-press-event",
+			 G_CALLBACK(Signal_Key_Press_Event), this);
 }
 
 gint Widget::Signal_Key_Press_Event(GtkWidget *,
