diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/control.c freeciv/client/control.c
--- FreecivCVS/client/control.c	Sun Apr  2 13:27:30 2000
+++ freeciv/client/control.c	Tue Apr  4 15:11:18 2000
@@ -270,6 +270,32 @@
 /**************************************************************************
 ...
 **************************************************************************/
+void blink_active_unit(void)
+{
+  static int is_shown;
+  struct unit *punit;
+  
+  if((punit=get_unit_in_focus())) {
+    struct tile *ptile;
+    ptile=map_get_tile(punit->x, punit->y);
+
+    if(is_shown) {
+      struct unit_list units;
+      units=ptile->units;
+      unit_list_init(&ptile->units);
+      refresh_tile_mapcanvas(punit->x, punit->y, 1);
+      ptile->units=units;
+    } else {
+      refresh_tile_mapcanvas(punit->x, punit->y, 1);
+    }
+    
+    is_shown=!is_shown;
+  }
+}
+
+/**************************************************************************
+...
+**************************************************************************/
 void request_unit_goto(void)
 {
   struct unit *punit=get_unit_in_focus();
@@ -1229,3 +1255,4 @@
   if(get_unit_in_focus())
     request_unit_wakeup(punit_focus);
 }
+
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/control.h freeciv/client/control.h
--- FreecivCVS/client/control.h	Sun Apr  2 13:27:30 2000
+++ freeciv/client/control.h	Tue Apr  4 15:30:44 2000
@@ -57,6 +57,7 @@
 void update_unit_focus(void);
 struct unit *find_visible_unit(struct tile *ptile);
 void set_units_in_combat(struct unit *pattacker, struct unit *pdefender);
+void blink_active_unit(void);
 
 void key_cancel_action(void);
 void key_city_names_toggle(void);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-gtk/mapview.c freeciv/client/gui-gtk/mapview.c
--- FreecivCVS/client/gui-gtk/mapview.c	Sun Apr  2 13:27:31 2000
+++ freeciv/client/gui-gtk/mapview.c	Tue Apr  4 15:11:18 2000
@@ -215,37 +215,6 @@
 /**************************************************************************
 ...
 **************************************************************************/
-void blink_active_unit(void)
-{
-  static int is_shown;
-  struct unit *punit;
-  
-  if((punit=get_unit_in_focus())) {
-    struct tile *ptile;
-    ptile=map_get_tile(punit->x, punit->y);
-
-    if(is_shown) {
-      struct unit_list units;
-      units=ptile->units;
-      unit_list_init(&ptile->units);
-      refresh_tile_mapcanvas(punit->x, punit->y, 1);
-      ptile->units=units;
-    }
-    else {
-      /* make sure that the blinking unit is always on the top */      
-      unit_list_unlink(&ptile->units, punit);
-      unit_list_insert(&ptile->units, punit);
-      refresh_tile_mapcanvas(punit->x, punit->y, 1);
-    }
-      
-    is_shown=!is_shown;
-  }
-}
-
-
-/**************************************************************************
-...
-**************************************************************************/
 void set_overview_dimensions(int x, int y)
 {
   gtk_widget_set_usize(overview_canvas, 2*x, 2*y);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-mui/mapview.c freeciv/client/gui-mui/mapview.c
--- FreecivCVS/client/gui-mui/mapview.c	Sun Apr  2 13:27:31 2000
+++ freeciv/client/gui-mui/mapview.c	Tue Apr  4 15:11:18 2000
@@ -155,40 +155,6 @@
 }
 
 /**************************************************************************
- gui independend
-**************************************************************************/
-void blink_active_unit(void)
-{
-  static int is_shown;
-  struct unit *punit;
-
-  if ((punit = get_unit_in_focus()))
-  {
-    struct tile *ptile;
-    ptile = map_get_tile(punit->x, punit->y);
-
-    if (is_shown)
-    {
-      struct unit_list units;
-      units = ptile->units;
-      unit_list_init(&ptile->units);
-      refresh_tile_mapcanvas(punit->x, punit->y, 1);
-      ptile->units = units;
-    }
-    else
-    {
-      /* make sure that the blinking unit is always on the top */
-      unit_list_unlink(&ptile->units, punit);
-      unit_list_insert(&ptile->units, punit);
-      refresh_tile_mapcanvas(punit->x, punit->y, 1);
-    }
-
-    is_shown = !is_shown;
-  }
-}
-
-
-/**************************************************************************
  Set the dimensions of the overviewmap
 **************************************************************************/
 void set_overview_dimensions(int x, int y)
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-stub/mapview.c freeciv/client/gui-stub/mapview.c
--- FreecivCVS/client/gui-stub/mapview.c	Sun Apr  2 13:27:31 2000
+++ freeciv/client/gui-stub/mapview.c	Tue Apr  4 15:11:18 2000
@@ -129,12 +129,6 @@
 }
 
 void
-blink_active_unit(void)
-{
-	/* PORTME */
-}
-
-void
 move_unit_map_canvas(struct unit *punit, int x0, int y0, int x1, int y1)
 {
 	/* PORTME */
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/gui_main.c freeciv/client/gui-xaw/gui_main.c
--- FreecivCVS/client/gui-xaw/gui_main.c	Sun Apr  2 13:27:31 2000
+++ freeciv/client/gui-xaw/gui_main.c	Tue Apr  4 15:32:41 2000
@@ -47,6 +47,7 @@
 #include "climisc.h"
 #include "clinet.h"
 #include "colors.h"
+#include "control.h"
 #include "dialogs.h"
 #include "graphics.h"
 #include "gui_stuff.h"		/* I_SW() */
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/mapview.c freeciv/client/gui-xaw/mapview.c
--- FreecivCVS/client/gui-xaw/mapview.c	Sun Apr  2 13:27:31 2000
+++ freeciv/client/gui-xaw/mapview.c	Tue Apr  4 15:11:18 2000
@@ -186,38 +186,6 @@
   refresh_tile_mapcanvas(punit1->x, punit1->y, 1);
 }
 
-
-/**************************************************************************
-...
-**************************************************************************/
-void blink_active_unit(void)
-{
-  static int is_shown;
-  struct unit *punit;
-  
-  if((punit=get_unit_in_focus())) {
-    struct tile *ptile;
-    ptile=map_get_tile(punit->x, punit->y);
-
-    if(is_shown) {
-      struct unit_list units;
-      units=ptile->units;
-      unit_list_init(&ptile->units);
-      refresh_tile_mapcanvas(punit->x, punit->y, 1);
-      ptile->units=units;
-    }
-    else {
-      /* make sure that the blinking unit is always on the top */      
-      unit_list_unlink(&ptile->units, punit);
-      unit_list_insert(&ptile->units, punit);
-      refresh_tile_mapcanvas(punit->x, punit->y, 1);
-    }
-      
-    is_shown=!is_shown;
-  }
-}
-
-
 /**************************************************************************
 ...
 **************************************************************************/
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/include/mapview_g.h freeciv/client/include/mapview_g.h
--- FreecivCVS/client/include/mapview_g.h	Sun Apr  2 13:27:32 2000
+++ freeciv/client/include/mapview_g.h	Tue Apr  4 15:11:18 2000
@@ -47,7 +47,6 @@
 void put_cross_overlay_tile(int x,int y);
 void put_city_workers(struct city *pcity, int color);
 
-void blink_active_unit(void);
 void move_unit_map_canvas(struct unit *punit, int x0, int y0, int x1, int y1);
 void decrease_unit_hp_smooth(struct unit *punit0, int hp0, 
 			     struct unit *punit1, int hp1);