Index: client/packhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v
retrieving revision 1.215
diff -u -r1.215 packhand.c
--- client/packhand.c	2002/02/12 09:36:44	1.215
+++ client/packhand.c	2002/02/13 19:08:54
@@ -1657,6 +1657,8 @@
   game.aqueduct_size = packet->aqueduct_size;
   game.sewer_size = packet->sewer_size;
   game.add_to_size_limit = packet->add_to_size_limit;
+  game.notradesize = packet->notradesize;
+  game.fulltradesize = packet->fulltradesize;
   
   game.rtech.cathedral_plus = packet->rtech.cathedral_plus;
   game.rtech.cathedral_minus = packet->rtech.cathedral_minus;
Index: common/capstr.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/capstr.c,v
retrieving revision 1.94
diff -u -r1.94 capstr.c
--- common/capstr.c	2002/02/12 08:20:45	1.94
+++ common/capstr.c	2002/02/13 19:08:58
@@ -72,7 +72,7 @@
 
 #define CAPABILITY "+1.11.6 conn_info pop_cost turn attributes new_bonus_tech"\
 " fund_added processing_packets angrycitizen tile_trade init_techs"\
-" short_worklists tech_cost_style short_city_tile_trade"
+" short_worklists tech_cost_style short_city_tile_trade trade_size"
   
 /* "+1.11.6" is protocol for 1.11.6 beta release.
   
@@ -113,6 +113,9 @@
 
    "short_city_tile_trade" sends the tile trade in the short_city
    packet.
+
+   "trade_size" transfer game.notradesize and game.fulltradesize to
+   the client.
 */
 
 void init_our_capability(void)
Index: common/packets.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.c,v
retrieving revision 1.178
diff -u -r1.178 packets.c
--- common/packets.c	2002/02/12 08:59:58	1.178
+++ common/packets.c	2002/02/13 19:09:03
@@ -2912,6 +2912,10 @@
   cptr=put_uint8(cptr, packet->aqueduct_size);
   cptr=put_uint8(cptr, packet->sewer_size);
   cptr=put_uint8(cptr, packet->add_to_size_limit);
+  if (has_capability("trade_size", pc->capability)) {
+    cptr = put_uint8(cptr, packet->notradesize);
+    cptr = put_uint8(cptr, packet->fulltradesize);
+  }
 
   if (!has_capability("new_bonus_tech", pc->capability)) {
     cptr = put_uint8(cptr, packet->rtech.get_bonus_tech);
@@ -2955,6 +2959,13 @@
   iget_uint8(&iter, &packet->aqueduct_size);
   iget_uint8(&iter, &packet->sewer_size);
   iget_uint8(&iter, &packet->add_to_size_limit);
+  if (has_capability("trade_size", pc->capability)) {
+    iget_uint8(&iter, &packet->notradesize);
+    iget_uint8(&iter, &packet->fulltradesize);
+  } else {
+    packet->notradesize = 0;
+    packet->fulltradesize = 1;
+  }
 
   if (!has_capability("new_bonus_tech", pc->capability)) {
     iget_uint8(&iter, &packet->rtech.get_bonus_tech);
Index: common/packets.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.h,v
retrieving revision 1.102
diff -u -r1.102 packets.h
--- common/packets.h	2002/02/07 10:24:20	1.102
+++ common/packets.h	2002/02/13 19:09:03
@@ -554,6 +554,7 @@
   int aqueduct_size;
   int sewer_size;
   int add_to_size_limit;
+  int notradesize, fulltradesize;
   int num_unit_types;
   int num_impr_types;
   int num_tech_types;
Index: server/ruleset.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/ruleset.c,v
retrieving revision 1.92
diff -u -r1.92 ruleset.c
--- server/ruleset.c	2002/02/11 10:38:11	1.92
+++ server/ruleset.c	2002/02/13 19:09:07
@@ -1696,6 +1696,8 @@
   packet.aqueduct_size = game.aqueduct_size;
   packet.sewer_size = game.sewer_size;
   packet.add_to_size_limit = game.add_to_size_limit;
+  packet.notradesize = game.notradesize;
+  packet.fulltradesize = game.fulltradesize;
 
   /* when removing the new_bonus_tech capability remove the following
      line; has_capability("new_bonus_tech", */