diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/dialogs.c freeciv/client/gui-xaw/dialogs.c
--- FreecivCVS/client/gui-xaw/dialogs.c	Mon Feb 28 16:37:25 2000
+++ freeciv/client/gui-xaw/dialogs.c	Sat Mar 18 10:08:06 2000
@@ -40,6 +40,7 @@
 #include "mem.h"
 #include "packets.h"
 #include "player.h"
+#include "rand.h"
 #include "support.h"
 
 #include "chatline.h"
@@ -66,6 +67,7 @@
 static Widget races_dialog_shell=NULL;
 static Widget races_form, races_toggles_form, races_label;
 static Widget *races_toggles=NULL;
+static int *races_toggles_to_nations=NULL;
 static Widget races_leader_form, races_leader;
 static Widget races_leader_pick_popupmenu, races_leader_pick_menubutton;
 static Widget races_sex_toggles[2], races_sex_form, races_sex_label;
@@ -129,6 +131,8 @@
 static int races_style_buttons_get_current(void);
 static void races_sex_buttons_set_current(int i);
 
+static int races_indirect_compare(const void *first, const void *second);
+
 static void races_toggles_callback(Widget w, XtPointer client_data, 
 				   XtPointer call_data);
 static void races_leader_pick_callback(Widget w, XtPointer client_data,
@@ -1747,6 +1751,8 @@
 
   free(races_toggles);
   races_toggles = fc_calloc(game.playable_nation_count,sizeof(Widget));
+  free(races_toggles_to_nations);
+  races_toggles_to_nations = fc_calloc(game.playable_nation_count,sizeof(int));
 
   for( i = 0; i < ((game.playable_nation_count-1)/per_row)+1; i++) {
     index = i * per_row;
@@ -1973,7 +1979,7 @@
 
   for(i=0; i<game.playable_nation_count; i++) {
     XtAddCallback(races_toggles[i], XtNcallback, 
-		  races_toggles_callback, (XtPointer) 0);
+		  races_toggles_callback, (XtPointer)i);
   }
 
 
@@ -1990,7 +1996,13 @@
   XtRealizeWidget(races_dialog_shell);
 
   for(i=0; i<game.playable_nation_count; i++) {
-    XtVaSetValues(races_toggles[i], XtNlabel, (XtArgVal)get_nation_name(i), NULL);
+    races_toggles_to_nations[i] = i;
+  }
+  qsort(races_toggles_to_nations, i, sizeof(int), races_indirect_compare);
+  for(i=0; i<game.playable_nation_count; i++) {
+    XtVaSetValues (races_toggles[i],
+		   XtNlabel, (XtArgVal)get_nation_name(races_toggles_to_nations[i]),
+		   NULL);
   }
 
   for(i=0; i<b_s_num; i++) {
@@ -1998,7 +2010,7 @@
 		  (XtArgVal)city_styles[city_style_idx[i]].name, NULL);
   }
 
-  x_simulate_button_click(races_toggles[0]);
+  x_simulate_button_click(races_toggles[myrand(game.playable_nation_count)]);
 }
 
 /****************************************************************
@@ -2011,89 +2023,73 @@
     x_simulate_button_click(ok);
 }
 
-
 /**************************************************************************
 ...
 **************************************************************************/
 void races_toggles_set_sensitive(int bits1, int bits2)
 {
-  int i, selected, mybits;
+  int i, race, selected;
+  Boolean sens;
 
-  mybits=bits1;
-
-  for(i=0; i<game.playable_nation_count && i<32; i++) {
-    if(mybits&1)
-      XtSetSensitive(races_toggles[i], FALSE);
-    else
-      XtSetSensitive(races_toggles[i], TRUE);
-    mybits>>=1;
-  }
-
-  mybits=bits2;
-
-  for(i=32; i<game.playable_nation_count; i++) {
-    if(mybits&1)
-      XtSetSensitive(races_toggles[i], FALSE);
-    else
-      XtSetSensitive(races_toggles[i], TRUE);
-    mybits>>=1;
+  for(i=0; i<game.playable_nation_count; i++) {
+    race = races_toggles_to_nations[i];
+    sens = !( ( ((race<32)?bits1:bits2) >> ((race<32)?race:race-32) )&1 );
+    XtSetSensitive(races_toggles[i], sens);
   }
 
   if((selected=races_buttons_get_current())==-1)
-     return;
+    return;
+  race = races_toggles_to_nations[selected];
 
-  if( (bits1 & (1<<selected)) || 
-      ( selected>32 && (bits2 & (1<<(selected-32))) ) )
-     XawToggleUnsetCurrent(races_toggles[0]);
+  if( (bits1 & (1<<race)) || 
+      (race>32 && (bits2 & (1<<(race-32))) ) )
+    XawToggleUnsetCurrent(races_toggles[0]);
 }
 
-
 /**************************************************************************
 ...
 **************************************************************************/
 void races_toggles_callback(Widget w, XtPointer client_data, 
 			    XtPointer call_data)
 {
-  int i, j;
+  int index, race;
+  int j;
   int leader_count;
   char **leaders;
   Widget entry;
 
-  for(i=0; i<game.playable_nation_count; i++) {
-    if(w==races_toggles[i]) {
-      leaders = get_nation_leader_names(i, &leader_count);
-
-      if(races_leader_pick_popupmenu)
-	XtDestroyWidget(races_leader_pick_popupmenu);
+  index = (int)client_data;
+  race = races_toggles_to_nations[index];
 
-      races_leader_pick_popupmenu =
-	XtVaCreatePopupShell("menu",
-			     simpleMenuWidgetClass,
-			     races_leader_pick_menubutton,
-			     NULL);
-
-      for(j=0; j<leader_count; j++) {
-	entry =
-	  XtVaCreateManagedWidget(leaders[j],
-				  smeBSBObjectClass,
-				  races_leader_pick_popupmenu,
-				  NULL);
-	XtAddCallback(entry,
-		      XtNcallback,
-		      races_leader_pick_callback,
-		      (XtPointer)((MAX_NUM_NATIONS * i) + j));
-      }
+  leaders = get_nation_leader_names(race, &leader_count);
 
-      races_leader_set_values(i, 0);
+  if(races_leader_pick_popupmenu)
+    XtDestroyWidget(races_leader_pick_popupmenu);
 
-      x_simulate_button_click
-      (
-       races_style_toggles[city_style_ridx[get_nation_city_style(i)]]
-      );
+  races_leader_pick_popupmenu =
+    XtVaCreatePopupShell("menu",
+			 simpleMenuWidgetClass,
+			 races_leader_pick_menubutton,
+			 NULL);
 
-      return;
-    }
-  }
+  for(j=0; j<leader_count; j++) {
+    entry =
+      XtVaCreateManagedWidget(leaders[j],
+			      smeBSBObjectClass,
+			      races_leader_pick_popupmenu,
+			      NULL);
+    XtAddCallback(entry,
+		  XtNcallback,
+		  races_leader_pick_callback,
+		  (XtPointer)((MAX_NUM_NATIONS * race) + j));
+  }
+
+  races_leader_set_values(race, myrand(leader_count));
+
+  x_simulate_button_click
+  (
+   races_style_toggles[city_style_ridx[get_nation_city_style(race)]]
+  );
 }
 
 /**************************************************************************
@@ -2208,15 +2204,34 @@
 /**************************************************************************
 ...
 **************************************************************************/
+int races_indirect_compare(const void *first, const void *second)
+{
+  int first_index;
+  int second_index;
+  char *first_string;
+  char *second_string;
+
+  first_index = *((const int *)first);
+  second_index = *((const int *)second);
+
+  first_string = get_nation_name(first_index);
+  second_string = get_nation_name(second_index);
+
+  return mystrcasecmp(first_string, second_string);
+}
+
+/**************************************************************************
+...
+**************************************************************************/
 void races_ok_command_callback(Widget w, XtPointer client_data, 
 			       XtPointer call_data)
 {
-  int selected, selected_sex, selected_style;
+  int selected_index, selected_sex, selected_style;
   XtPointer dp;
 
   struct packet_alloc_nation packet;
 
-  if((selected=races_buttons_get_current())==-1) {
+  if((selected_index=races_buttons_get_current())==-1) {
     append_output_window(_("You must select a nation."));
     return;
   }
@@ -2234,7 +2249,7 @@
   XtVaGetValues(races_leader, XtNstring, &dp, NULL);
 
   /* perform a minimum of sanity test on the name */
-  packet.nation_no=selected;
+  packet.nation_no=races_toggles_to_nations[selected_index];
   packet.city_style = get_nation_city_style(packet.nation_no);
   packet.is_male = selected_sex? 0: 1;     /* first button is male */
   packet.city_style = city_style_idx[selected_style];
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/repodlgs.c freeciv/client/gui-xaw/repodlgs.c
--- FreecivCVS/client/gui-xaw/repodlgs.c	Wed Mar 15 14:02:47 2000
+++ freeciv/client/gui-xaw/repodlgs.c	Sat Mar 18 10:07:42 2000
@@ -202,7 +202,6 @@
   Widget science_form;
   Widget  close_command;
   static char *tech_list_names_ptrs[A_LAST+1];
-  static char tech_list_names[A_LAST+1][200];
   int j, flag, num_list;
   size_t i;
   Dimension width;
@@ -232,11 +231,11 @@
   
   for(i=A_FIRST, j=0; i<game.num_tech_types; i++)
     if(get_invention(game.player_ptr, i)==TECH_KNOWN) {
-      sz_strlcpy(tech_list_names[j], advances[i].name);
-      tech_list_names_ptrs[j]=tech_list_names[j];
+      tech_list_names_ptrs[j]=advances[i].name;
       j++;
     }
   tech_list_names_ptrs[j]=0;
+  qsort(tech_list_names_ptrs, j, sizeof(char *), string_ptr_compare);
   num_list = j;
   /* printf("science list num: %d\n", num_list); */
   
@@ -486,7 +485,6 @@
   if(science_dialog_shell) {
     char text[512];
     static char *tech_list_names_ptrs[A_LAST+1];
-    static char tech_list_names[A_LAST+1][200];
     int j, flag;
     size_t i;
     char title_text[512], rate_text[128];
@@ -525,11 +523,11 @@
 
     for(i=A_FIRST, j=0; i<game.num_tech_types; i++)
       if(get_invention(game.player_ptr, i)==TECH_KNOWN) {
-	sz_strlcpy(tech_list_names[j], advances[i].name);
-	tech_list_names_ptrs[j]=tech_list_names[j];
+	tech_list_names_ptrs[j]=advances[i].name;
 	j++;
       }
     tech_list_names_ptrs[j]=0;
+    qsort(tech_list_names_ptrs, j, sizeof(char *), string_ptr_compare);
 
     XawListChange(science_list, tech_list_names_ptrs, 0/*j*/, 0, 1);