--- ./gnect/src/brain.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/brain.c	Fri Jun 21 22:53:49 2002
@@ -549,7 +549,7 @@
 
 		/* best choice is a full column - shouldn't happen */
 
-		ERROR_PRINT("dummy brain tried dropping into a full column\n");
+		ERROR_PRINT1("dummy brain tried dropping into a full column\n");
 		gnect_cleanup(1);
 	}
 
--- ./gnect/src/main.h	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/main.h	Fri Jun 21 22:55:45 2002
@@ -19,15 +19,43 @@
 
 #define APPNAME                 "gnect"
 
-#ifdef GNECT_DEBUG
-#define DEBUG_PRINT(level, args...)  if (debugging & level) g_printerr(APPNAME ": " args)
+#ifndef __GNUC__
+# ifdef GNECT_DEBUG
+#  define DEBUG_PRINT1(level, a1)	if (debugging & level) g_printerr(APPNAME ": " a1)
+#  define DEBUG_PRINT2(level, a1,a2)	if (debugging & level) g_printerr(APPNAME ": " a1, a2)
+#  define DEBUG_PRINT3(level, a1,a2,a3)	if (debugging & level) g_printerr(APPNAME ": " a1, a2, a3)
+# else
+#  define DEBUG_PRINT1(level, a1)
+#  define DEBUG_PRINT2(level, a1,a2)
+#  define DEBUG_PRINT3(level, a1,a2,a3)
+# endif
 #else
-#define DEBUG_PRINT(level, args...)
+# ifdef GNECT_DEBUG
+#  define DEBUG_PRINT(level, args...)  if (debugging & level) g_printerr(APPNAME ": " args)
+# else
+#  define DEBUG_PRINT(level, args...)
+# endif
+# define DEBUG_PRINT1(level, a1)	DEBUG_PRINT(level, a1)
+# define DEBUG_PRINT2(level, a1,a2)	DEBUG_PRINT(level, a1, a2)
+# define DEBUG_PRINT3(level, a1,a2,a3)	DEBUG_PRINT(level, a1, a2, a3)
 #endif
 
 
-#define ERROR_PRINT(args...)    g_printerr(APPNAME ": error: " args)
-#define WARNING_PRINT(args...)  g_printerr(APPNAME ": warning: " args)
+#ifdef __GNUC__
+# define ERROR_PRINT(args...)    	g_printerr(APPNAME ": error: " args)
+# define ERROR_PRINT1(a1)	 	ERROR_PRINT(a1)
+# define ERROR_PRINT2(a1,a2)	 	ERROR_PRINT(a1,a2)
+# define WARNING_PRINT(args...)  	g_printerr(APPNAME ": warning: " args)
+# define WARNING_PRINT1(a1)	 	WARNING_PRINT(a1)
+# define WARNING_PRINT2(a1,a2)	 	WARNING_PRINT(a1,a2)
+# define WARNING_PRINT3(a1,a2,a3)	WARNING_PRINT(a1,a2,a3)
+#else
+# define ERROR_PRINT1(a1)	 	g_printerr(APPNAME ": error: " a1)
+# define ERROR_PRINT2(a1,a2)	 	g_printerr(APPNAME ": error: " a1, a2)
+# define WARNING_PRINT1(a1)	 	g_printerr(APPNAME ": warning: " a1)
+# define WARNING_PRINT2(a1,a2)	 	g_printerr(APPNAME ": warning: " a1, a2)
+# define WARNING_PRINT3(a1,a2,a3)	g_printerr(APPNAME ": warning: " a1, a2, a3)
+#endif
 
 
 #define BASE_PIXMAP_DIR         GNECT_DATA_DIR "pixmaps" G_DIR_SEPARATOR_S
--- ./gnect/src/main.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/main.c	Fri Jun 21 22:53:58 2002
@@ -88,7 +88,7 @@
 
 
 	if (gnome_init_with_popt_table(APPNAME, VERSION, argc, argv, opts, 0, NULL)) {
-		ERROR_PRINT("gnome_init_with_popt_table failed\n");
+		ERROR_PRINT1("gnome_init_with_popt_table failed\n");
 		exit(1);
 	}
 
--- ./gnect/src/gnect.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/gnect.c	Fri Jun 21 22:48:20 2002
@@ -54,7 +54,7 @@
 
 void gnect_cleanup(gint exit_code)
 {
-	DEBUG_PRINT(1, "gnect_cleanup\n");
+	DEBUG_PRINT1(1, "gnect_cleanup\n");
 
 	if (anim.id) gtk_timeout_remove(anim.id);
 
@@ -65,7 +65,7 @@
 	g_free(prefs.fname_theme);
 
 
-	DEBUG_PRINT(1, "exit(%d)\n", exit_code);
+	DEBUG_PRINT2(1, "exit(%d)\n", exit_code);
 	gtk_exit(exit_code);
 }
 
@@ -208,7 +208,7 @@
 
 	}
 
-	DEBUG_PRINT(1, "gnect_whois_player(%d)\n", player);
+	DEBUG_PRINT2(1, "gnect_whois_player(%d)\n", player);
 	gnect_cleanup(1);
 	return(0);
 }
@@ -291,7 +291,7 @@
 
 void gnect_reset_display(void)
 {
-	DEBUG_PRINT(1, "gnect_reset_display\n");
+	DEBUG_PRINT1(1, "gnect_reset_display\n");
 
 	gui_set_status(NULL, STATUS_MSG_CLEAR);
 	gfx_redraw(TRUE);
@@ -306,7 +306,7 @@
 	gint i;
 
 
-	DEBUG_PRINT(1, "gnect_reset_board\n");
+	DEBUG_PRINT1(1, "gnect_reset_board\n");
 
 	/* Gnect's board representation */
 	for(i = 0; i < N_ROWS * N_COLS; i++) {
@@ -324,7 +324,7 @@
 
 void gnect_reset(gboolean with_display)
 {
-	DEBUG_PRINT(1, "gnect_reset\n");
+	DEBUG_PRINT1(1, "gnect_reset\n");
 
 	gnect.over = TRUE;
 
@@ -462,7 +462,7 @@
 		gnect.veleng_str[len_veleng_str - 1] = '1' + col;
 		gnect.veleng_str[len_veleng_str] = '0';
 
-		DEBUG_PRINT(8, "veleng_str: %s\n", gnect.veleng_str);
+		DEBUG_PRINT2(8, "veleng_str: %s\n", gnect.veleng_str);
 
 		/* drop counter */
 		row = gfx_drop_counter(col);
@@ -599,7 +599,7 @@
 	gfx_move_cursor(col);
 	gfx_suck_counter(col, is_wipe);
 
-	DEBUG_PRINT(8, "veleng_str: %s\n", gnect.veleng_str);
+	DEBUG_PRINT2(8, "veleng_str: %s\n", gnect.veleng_str);
 
 	if (gnect_get_n_players() == 1 && gnect_is_player_computer(gnect.current_player)) {
 		gnect_switch_players();
@@ -607,7 +607,7 @@
 		if (col != -1) {
 			gfx_move_cursor(col);
 			gfx_suck_counter(col, is_wipe);
-			DEBUG_PRINT(8, "veleng_str: %s\n", gnect.veleng_str);
+			DEBUG_PRINT2(8, "veleng_str: %s\n", gnect.veleng_str);
 		}
 
 	}
--- ./gnect/src/prefs.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/prefs.c	Fri Jun 21 22:48:40 2002
@@ -109,7 +109,7 @@
 
 void prefs_get(void)
 {
-	DEBUG_PRINT(1, "prefs_get\n");
+	DEBUG_PRINT1(1, "prefs_get\n");
 
 	prefs.changed = FALSE;
 
@@ -140,7 +140,7 @@
 {
 	if (!prefs.changed) return;
 
-	DEBUG_PRINT(1, "prefs_save\n");
+	DEBUG_PRINT1(1, "prefs_save\n");
 
 	gnome_config_set_string("/" APPNAME "/Preferences/Theme",  prefs.fname_theme);
 	gnome_config_set_int("/" APPNAME "/Preferences/Player1",   prefs.player1);
@@ -187,7 +187,7 @@
 	 * and copy them in case user changes something then cancels
 	 */
 
-	DEBUG_PRINT(1, "prefs_dialog_reset\n");
+	DEBUG_PRINT1(1, "prefs_dialog_reset\n");
 
 
 	/* copy prefs */
@@ -246,7 +246,7 @@
 	Theme *theme;
 
 
-	DEBUG_PRINT(1, "prefs_dialog_apply\n");
+	DEBUG_PRINT1(1, "prefs_dialog_apply\n");
 
 
 	prefs.player1        = prefs_tmp.player1;
@@ -345,7 +345,7 @@
 	if ((gint)data != -1 || !prefs_tmp.changed) return;
 
 
-	DEBUG_PRINT(1, "cb_prefs_dialog_apply\n");
+	DEBUG_PRINT1(1, "cb_prefs_dialog_apply\n");
 
 
 	/* changing player selection resets the game - make sure that's okay */
@@ -589,7 +589,7 @@
 	gint i;
 
 
-	DEBUG_PRINT(1, "prefs_dialog_create\n");
+	DEBUG_PRINT1(1, "prefs_dialog_create\n");
 
 	dlg_prefs = gnome_property_box_new();
 	gtk_window_set_title(GTK_WINDOW(dlg_prefs), _("Gnect Preferences"));
--- ./gnect/src/theme.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/theme.c	Fri Jun 21 22:56:24 2002
@@ -162,7 +162,7 @@
 	struct dirent *e;
 
 
-	DEBUG_PRINT(1, "theme_init\n");
+	DEBUG_PRINT1(1, "theme_init\n");
 
 	theme_base = NULL;
 	themes     = NULL;
@@ -179,7 +179,7 @@
 		dir = opendir(dname);
 		if (!dir) {
 
-			if (reading == 2) WARNING_PRINT("opendir failed (%s)\n", dname);
+			if (reading == 2) WARNING_PRINT2("opendir failed (%s)\n", dname);
 
 		}
 		else {
@@ -223,11 +223,11 @@
 
 		if (fname_theme) {
 			if ( !(theme_current = theme_get_ptr_from_fname(fname_theme)) ) {
-				WARNING_PRINT("theme not available (%s)\n", fname_theme);
+				WARNING_PRINT2("theme not available (%s)\n", fname_theme);
 			}
 		}
 		if ( !theme_current && !(theme_current = theme_get_ptr_from_fname(prefs.fname_theme)) ) {
-			WARNING_PRINT("theme not available (%s)\n", prefs.fname_theme);
+			WARNING_PRINT2("theme not available (%s)\n", prefs.fname_theme);
 			theme_current = theme_base;
 		}
 
@@ -244,7 +244,7 @@
 	Theme *next;
 
 
-	DEBUG_PRINT(1, "theme_free\n");
+	DEBUG_PRINT1(1, "theme_free\n");
 	if (theme) {
 
 		while(theme->prev) theme = theme->prev; /* don't use theme_base here */
@@ -251,7 +251,7 @@
 
 		while(theme) {
 
-			DEBUG_PRINT(2, "  %d\t%s\n", theme->id, theme->title);
+			DEBUG_PRINT3(2, "  %d\t%s\n", theme->id, theme->title);
 			g_free(theme->title);
 			g_free(theme->fname);
 			g_free(theme->fname_tileset);
@@ -299,9 +299,9 @@
 	gint theme_id = 0;
 
 
-	DEBUG_PRINT(1, "theme_create_IDs\n");
+	DEBUG_PRINT1(1, "theme_create_IDs\n");
 	while(theme) {
-		DEBUG_PRINT(2, "\t%d\t%s\n", theme_id, theme->title);
+		DEBUG_PRINT3(2, "\t%d\t%s\n", theme_id, theme->title);
 		theme->id = theme_id;
 		theme_id++;
 		theme = theme->next;
@@ -498,12 +498,12 @@
 		break;
 	case THEME_TOKEN_PLAYER_1 :
 		if (!theme_translate_player_description(new_theme, PLAYER_1, g_strstrip(g_strdup(scanner->value.v_string)))) {
-			WARNING_PRINT("illegal value for Player1 in theme file\n");
+			WARNING_PRINT1("illegal value for Player1 in theme file\n");
 		}
 		break;
 	case THEME_TOKEN_PLAYER_2 :
 		if (!theme_translate_player_description(new_theme, PLAYER_2, g_strstrip(g_strdup(scanner->value.v_string)))) {
-			WARNING_PRINT("illegal value for Player1 in theme file\n");
+			WARNING_PRINT1("illegal value for Player1 in theme file\n");
 		}
 		break;
 	case THEME_TOKEN_BACKGROUND :
@@ -620,7 +620,7 @@
 
 	/* open and parse the file, filling in the new theme */
 	if (!theme_file_parse(fname, theme)) {
-		WARNING_PRINT("theme_file_read failed (%s)\n", fname);
+		WARNING_PRINT2("theme_file_read failed (%s)\n", fname);
 		g_free(fname);
 		g_free(user_data_dir);
 		g_free(user_pixmap_dir);
@@ -670,7 +670,7 @@
 		}
 		if (!background_exists) {
 			/* complain, but continue anyway, if we can't get the background image */
-			WARNING_PRINT("background image (%s) for theme (%s) does not exist\n", theme->fname_background, filename);
+			WARNING_PRINT3("background image (%s) for theme (%s) does not exist\n", theme->fname_background, filename);
 			g_free(theme->fname_background);
 			theme->fname_background = NULL;
 		}
@@ -688,10 +688,10 @@
 		!tileset_exists ) {
 
 		if (tileset_exists) {
-			WARNING_PRINT("error in theme (%s) (required item missing?)\n", filename);
+			WARNING_PRINT2("error in theme (%s) (required item missing?)\n", filename);
 		}
 		else {
-			WARNING_PRINT("tile set specified in theme (%s) does not exist\n", filename);
+			WARNING_PRINT2("tile set specified in theme (%s) does not exist\n", filename);
 		}
 
 		/* required items missing - toss this theme */
@@ -720,11 +720,11 @@
 
 	if (!theme) {
 		/* should never happen */
-		ERROR_PRINT("theme_load(NULL)\n");
+		ERROR_PRINT1("theme_load(NULL)\n");
 		return(FALSE);
 	}
 
-	DEBUG_PRINT(1, "theme_load (%s)\n", theme->fname);
+	DEBUG_PRINT2(1, "theme_load (%s)\n", theme->fname);
 
 	if (theme->is_user_theme) {
 
--- ./gnect/src/gfx.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/gfx.c	Fri Jun 21 22:55:57 2002
@@ -95,7 +95,7 @@
 
 void gfx_free(void)
 {
-	DEBUG_PRINT(1, "gfx_free\n");
+	DEBUG_PRINT1(1, "gfx_free\n");
 
 	if (pixbuf_background) {
 		gdk_pixbuf_unref(pixbuf_background);
@@ -177,7 +177,7 @@
 	gint row, col;
 
 
-	DEBUG_PRINT(1, "gfx_draw_all_tiles\n");
+	DEBUG_PRINT1(1, "gfx_draw_all_tiles\n");
 	for (row = 0; row < N_ROWS; row++) {
 		for (col = 0; col < N_COLS; col++) {
 			gfx_draw_tile(row, col, TILE_AT(row, col), FALSE);
@@ -189,7 +189,7 @@
 
 void gfx_redraw(gboolean do_refresh)
 {
-	DEBUG_PRINT(1, "gfx_redraw\n");
+	DEBUG_PRINT1(1, "gfx_redraw\n");
 	gfx_draw_all_tiles();
 	if (do_refresh) gtk_widget_draw(draw_area, NULL);
 }
@@ -624,10 +624,10 @@
 		return;
 	}
 
-	DEBUG_PRINT(1, "gfx_draw_grid (%s)\n", theme->gridRGB);
+	DEBUG_PRINT2(1, "gfx_draw_grid (%s)\n", theme->gridRGB);
 
 	if (!gdk_color_parse(theme->gridRGB, &colour)) {
-		WARNING_PRINT("gfx_draw_grid: bad RGB value (%s)\n", theme->gridRGB);
+		WARNING_PRINT2("gfx_draw_grid: bad RGB value (%s)\n", theme->gridRGB);
 		return;
 	}
 
@@ -677,11 +677,11 @@
 	gint old_height = DRAW_AREA_HEIGHT;
 
 
-	DEBUG_PRINT(1, "gfx_load\n\ttile set:   %s\n\tbackground: %s\n", fname_tileset, fname_background);
+	DEBUG_PRINT3(1, "gfx_load\n\ttile set:   %s\n\tbackground: %s\n", fname_tileset, fname_background);
 
 
 	if ( !(pixbuf_tileset_tmp = gdk_pixbuf_new_from_file(fname_tileset)) ) {
-		WARNING_PRINT("couldn't load tileset image (%s)\n", fname_tileset);
+		WARNING_PRINT2("couldn't load tileset image (%s)\n", fname_tileset);
 		return(FALSE);
 	}
 
@@ -707,7 +707,7 @@
 		/* get background image */
 
 		if ( !(pixbuf_background_tmp = gdk_pixbuf_new_from_file(fname_background)) ) {
-			WARNING_PRINT("couldn't load background image (%s)\n", fname_background);
+			WARNING_PRINT2("couldn't load background image (%s)\n", fname_background);
 		}
 		else {
 
--- ./gnect/src/gui.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/gui.c	Fri Jun 21 22:55:59 2002
@@ -533,7 +533,7 @@
             }
         }
 		else {
-			WARNING_PRINT("could not parse geometry string `%s'\n", geom_str);
+			WARNING_PRINT2("could not parse geometry string `%s'\n", geom_str);
         }
 
     }
@@ -546,7 +546,7 @@
 	GtkWidget *vbox, *hbox;
 
 
-	DEBUG_PRINT(1, "gui_create\n");
+	DEBUG_PRINT1(1, "gui_create\n");
 
 	app = gnome_app_new(APPNAME, "Gnect");
 	gtk_window_set_policy(GTK_WINDOW(app), FALSE, FALSE, TRUE);
@@ -595,7 +595,7 @@
  	GnomeDockItem  *toolbar_gdi;
 
 
-	DEBUG_PRINT(1, "gui_open\n");
+	DEBUG_PRINT1(1, "gui_open\n");
 
 	gui_set_geometry(geom_str);
 
--- ./gnect/src/dialog.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/dialog.c	Fri Jun 21 22:47:33 2002
@@ -75,7 +75,7 @@
 
 	gchar *str;
 
-	DEBUG_PRINT(1, "dialog_score_update\n");
+	DEBUG_PRINT1(1, "dialog_score_update\n");
 
 	if (dlg_score) {
 
--- ./gnect/src/connect4.c	Thu Dec 20 08:24:43 2001
+++ ../gnome-games-1.4.0.4/./gnect/src/connect4.c	Wed Jun 26 14:16:00 2002
@@ -57,7 +57,7 @@
 
 void fatal_error(char *str)
 {
-	ERROR_PRINT("Velena Engine: %s\n", str);
+	ERROR_PRINT2("Velena Engine: %s\n", str);
 	gnect_cleanup(1);
 }
 
@@ -117,11 +117,11 @@
 	long size,len;
 	FILE *h1;
 	short x;
-	char *bookdata = g_strdup("/usr/share/gnect/" WHITE_BOOK); /* FIXME */
+	char *bookdata = g_strdup("/usr/freeware/share/gnect/" WHITE_BOOK); /* FIXME */
 
 
 	if (!gnect_file_exists(bookdata)) {
-		ERROR_PRINT("required file not found (%s)\n", bookdata);
+		ERROR_PRINT2("required file not found (%s)\n", bookdata);
 		gnect_cleanup(1);
 	}
 
@@ -149,7 +149,7 @@
 
 	h1=fopen(bookdata, "rb");
 	if(!h1) {
-		ERROR_PRINT("could not open required file (%s)\n", bookdata);
+		ERROR_PRINT2("could not open required file (%s)\n", bookdata);
 		gnect_cleanup(1);
 	}
 
@@ -401,7 +401,7 @@
 	int x;
 
 
-	DEBUG_PRINT(1, "veleng_free\n");
+	DEBUG_PRINT1(1, "veleng_free\n");
 
 	if (board != NULL) {
 
--- ./xbill/Makefile.in	Fri May 24 23:19:20 2002
+++ ../gnome-games-1.4.0.4/./xbill/Makefile.in	Sat Jun 22 00:53:44 2002
@@ -147,7 +147,7 @@
 gnome_xbill_SOURCES = Bucket.cc Bucket.h Cable.cc Cable.h Computer.cc                       Computer.h Game.cc Game.h Horde.cc Horde.h Library.cc                       Library.h MCursor.cc MCursor.h Monster.cc Monster.h                       Network.cc Network.h Picture.cc Picture.h Spark.cc                       Spark.h Strings.h UI.cc UI.h objects.h x11-gtk.cc x11.h
 
 
-gnome_xbill_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS)
+gnome_xbill_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
 
 EXTRA_DIST = README.Ports xbill.png xbill.desktop
 
--- ./xbill/MCursor.cc	Fri Jul 13 21:47:27 2001
+++ ../gnome-games-1.4.0.4/./xbill/MCursor.cc	Sat Jun 22 00:46:48 2002
@@ -10,7 +10,7 @@
 	file = g_strdup_printf ("%s/%s.xpm", dir, name);
 
 	pixmap = gdk_pixmap_colormap_create_from_xpm(ui.display, ui.colormap,
-						     &bitmap, NULL, file);
+						     &bitmap, (GdkColor*)NULL, file);
 	if (pixmap == NULL) {
 		printf ("cannot open %s\n", file);
 		exit(1);
@@ -21,7 +21,7 @@
 	  file = g_strdup_printf ("%s/%s_mask.xpm", dir, name);
 
 	  pixmap = gdk_pixmap_colormap_create_from_xpm(ui.display, ui.colormap,
-						       &mask, NULL, file);
+						       &mask, (GdkColor*)NULL, file);
 	  if (pixmap == NULL) {
 	    printf("cannot open %s\n", file);
 	    exit(1);
--- ./xbill/UI.cc	Fri Jul 13 21:47:27 2001
+++ ../gnome-games-1.4.0.4/./xbill/UI.cc	Sat Jun 22 00:50:30 2002
@@ -136,10 +136,10 @@
 
 void UI::popup_dialog (int dialog) {
 	GtkWidget *w;
-	switch (dialog) {
-		case game.SCORE: w = scorebox; break;
-		case game.ENDGAME: w = endgamebox; break;
-	}
+	if (dialog == game.SCORE)
+	  w = scorebox;
+	else if (dialog == game.ENDGAME)
+	  w = endgamebox;
 	popup (NULL, &w);
 }
 
@@ -148,16 +148,14 @@
 /*********************/
 
 void UI::set_cursor(int cursor) {
-	switch (cursor) {
-	case game.BUCKETC:
-	        gdk_window_set_cursor(window, bucket.cursor.cursor); break;
-	case game.DOWNC:
-		gdk_window_set_cursor(window, downcursor.cursor); break;
-	case game.DEFAULTC:
-		gdk_window_set_cursor(window, defaultcursor.cursor); break;
-	default:
+	if (cursor == game.BUCKETC)
+		gdk_window_set_cursor(window, bucket.cursor.cursor);
+	else if (cursor == game.DOWNC)
+		gdk_window_set_cursor(window, downcursor.cursor);
+	else if (cursor == game.DEFAULTC)
+		gdk_window_set_cursor(window, defaultcursor.cursor);
+	else
 		gdk_window_set_cursor(window, OS.cursor[cursor].cursor);
-	}
 }
 
 void UI::load_cursors() {
--- ./xbill/Game.cc	Sat Oct 27 22:16:23 2001
+++ ../gnome-games-1.4.0.4/./xbill/Game.cc	Sat Jun 22 00:51:29 2002
@@ -69,10 +69,10 @@
 }
   
 void Game::update_score (int action) {
-	switch (action){
-		case ENDLEVEL: score+=(level*efficiency/iteration); break;
-		default: score+=(action*action*BILLPOINTS);
-	}
+	if (action == ENDLEVEL)
+		score+=(level*efficiency/iteration);
+	else
+		score+=(action*action*BILLPOINTS);
 }
 
 void Game::warp_to_level (int lev) {
--- ./iagno/network.c	Thu Nov 22 13:35:31 2001
+++ ../gnome-games-1.4.0.4/./iagno/network.c	Fri Jun 21 16:40:05 2002
@@ -27,6 +27,14 @@
 /* (('g'<<8)+'n' */
 #define GAME_PORT "26478"
 
+#ifdef __sgi
+#define socklen_t int
+#define HAVE_GETHOSTBYNAME_R 5
+#include "getaddrinfo.h"
+#include "getaddrinfo.c"
+#include "gethostbyname.c"
+#endif
+
 /* Shared with gnothello.c */
 char *game_server = "gnothello.gnome.org";
 
@@ -240,12 +248,16 @@
     {
       int me;
 
-      if(ng->mycolor)
-	return network_set_status(ng, DISCONNECTED, _("Invalid move attempted"));
+      if(ng->mycolor) {
+	network_set_status(ng, DISCONNECTED, _("Invalid move attempted"));
+	return;
+      }
 	
       if(!args || sscanf(args, "%d", &me) != 1
-	 || (me != WHITE_TURN && me != BLACK_TURN))
-	return network_set_status(ng, DISCONNECTED, _("Invalid game data (set_peer)"));
+	 || (me != WHITE_TURN && me != BLACK_TURN)) {
+	network_set_status(ng, DISCONNECTED, _("Invalid game data (set_peer)"));
+	return;
+      }
 
       white_level_cb(NULL, "0");
       black_level_cb(NULL, "0");
@@ -259,8 +271,10 @@
 
       if(!args || sscanf(args, "%d %d %d", &x, &y, &me) != 3
 	 || !me || me != (32-ng->mycolor)
-	 || x >= 8 || y >= 8)
-	return network_set_status(ng, DISCONNECTED, _("Invalid game data (move)"));
+	 || x >= 8 || y >= 8) {
+	network_set_status(ng, DISCONNECTED, _("Invalid game data (move)"));
+	return;
+      }
 
       move(x, y, me);
     }
@@ -320,8 +334,10 @@
   memset(&hints, 0, sizeof(hints));
   hints.ai_socktype = SOCK_STREAM;
   x = getaddrinfo(game_server, GAME_PORT, &hints, &res);
-  if(x)
-    return network_set_status(netgame, DISCONNECTED, gai_strerror(x));
+  if(x) {
+    network_set_status(netgame, DISCONNECTED, gai_strerror(x));
+    return;
+  }
 
   if(netgame->status != DISCONNECTED)
     {
@@ -357,8 +373,10 @@
 {
   network_start();
 
-  if(!game_server)
-    return network_set_status(netgame, DISCONNECTED, _("No game server defined"));
+  if(!game_server) {
+    network_set_status(netgame, DISCONNECTED, _("No game server defined"));
+    return;
+  }
 
   if(netgame->status != CONNECTED)
     network_connect();
--- ./glines/glines.c	Sat Jul  7 01:55:23 2001
+++ ../gnome-games-1.4.0.4/./glines/glines.c	Sat Jun 22 00:52:53 2002
@@ -694,11 +694,11 @@
 game_about_callback (GtkWidget *widget, void *data)
 {
     GtkWidget *about;
-    const gchar *authors[] = {
-		            _("Robert Szokovacs <szo@appaloosacorp.hu>"),
-			    _("Szabolcs Ban <shooby@gnome.hu>"),
-			    NULL
-			    };
+    const gchar *authors[3];
+
+    authors[0] = _("Robert Szokovacs <szo@appaloosacorp.hu>");
+    authors[1] = _("Szabolcs Ban <shooby@gnome.hu>");
+    authors[2] = NULL;
 					        
 	about = gnome_about_new (_("Glines"), VERSION,
 			_("(C) 1997-2000 the Free Software Foundation"),
@@ -705,6 +705,8 @@
 			  (const char **)authors,
 		       _("Gnome port of the once-popular Color Lines game"),
 			"glines.png");
+	gtk_signal_connect (GTK_OBJECT (about), "destroy", 
+			    GTK_SIGNAL_FUNC (gtk_widget_destroyed), &about);
 	gnome_dialog_set_parent(GNOME_DIALOG(about), GTK_WINDOW(app));
 	gtk_widget_show (about);
 	return TRUE;
--- ./ltmain.sh	Fri May 24 23:17:14 2002
+++ ../gnome-games-1.4.0.4/./ltmain.sh	Fri Jun 21 15:21:07 2002
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"