[Freeciv-Dev] (PR#15748) gui-stub compile fix

["Christian Prochaska" <cp.ml.freeciv.dev@xxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=15748 >

Here's a compile fix for gui-stub.

Index: client/gui-stub/citydlg.c
===================================================================
--- client/gui-stub/citydlg.c   (Revision 11643)
+++ client/gui-stub/citydlg.c   (Arbeitskopie)
@@ -21,7 +21,7 @@
   Pop up (or bring to the front) a dialog for the given city.  It may or
   may not be modal.
 **************************************************************************/
-void popup_city_dialog(struct city *pcity, bool make_modal)
+void popup_city_dialog(struct city *pcity)
 {
   /* PORTME */
 }
Index: client/gui-stub/sprite.c
===================================================================
--- client/gui-stub/sprite.c    (Revision 11643)
+++ client/gui-stub/sprite.c    (Arbeitskopie)
@@ -15,6 +15,8 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "sprite.h"
 
 /****************************************************************************
Index: client/gui-stub/mapview.c
===================================================================
--- client/gui-stub/mapview.c   (Revision 11643)
+++ client/gui-stub/mapview.c   (Arbeitskopie)
@@ -62,7 +62,7 @@
   prompt etc).  And it may call update_unit_pix_label() to update the
   icons for units on this tile.
 ****************************************************************************/
-void update_unit_info_label(struct unit *punit)
+void update_unit_info_label(struct unit_list *punitlist)
 {
   /* PORTME */
 }
@@ -112,17 +112,6 @@
 }
 
 /****************************************************************************
-  Called when the map size changes. This may be used to change the
-  size of the GUI element holding the overview canvas. The
-  overview.width and overview.height are updated if this function is
-  called.
-****************************************************************************/
-void map_size_changed(void)
-{
-  /* PORTME */
-}
-
-/****************************************************************************
   Return a canvas that is the overview window.
 ****************************************************************************/
 struct canvas *get_overview_window(void)
@@ -229,3 +218,25 @@
   /* Here you should do any necessary redraws (for instance, the city
    * dialogs usually need to be resized). */
 }
+
+/****************************************************************************
+  Return the dimensions of the area (container widget; maximum size) for
+  the overview.
+****************************************************************************/
+void get_overview_area_dimensions(int *width, int *height)
+{
+  /* PORTME */
+  *width = 0;
+  *height = 0;  
+}
+
+/****************************************************************************
+  Called when the map size changes. This may be used to change the
+  size of the GUI element holding the overview canvas. The
+  overview.width and overview.height are updated if this function is
+  called.
+****************************************************************************/
+void overview_size_changed(void)
+{
+  /* PORTME */
+}
Index: client/gui-stub/canvas.c
===================================================================
--- client/gui-stub/canvas.c    (Revision 11643)
+++ client/gui-stub/canvas.c    (Arbeitskopie)
@@ -82,7 +82,7 @@
   Draw a filled-in colored rectangle onto canvas.
 ****************************************************************************/
 void canvas_put_rectangle(struct canvas *pcanvas,
-                      enum color_std color,
+                      struct color *pcolor,
                       int canvas_x, int canvas_y, int width, int height)
 {
   /* PORTME */
@@ -92,7 +92,7 @@
   Fill the area covered by the sprite with the given color.
 ****************************************************************************/
 void canvas_fill_sprite_area(struct canvas *pcanvas,
-                            struct sprite *psprite, enum color_std color,
+                            struct sprite *psprite, struct color *pcolor,
                             int canvas_x, int canvas_y)
 {
   /* PORTME */
@@ -110,7 +110,7 @@
 /****************************************************************************
   Draw a 1-pixel-width colored line onto the canvas.
 ****************************************************************************/
-void canvas_put_line(struct canvas *pcanvas, enum color_std color,
+void canvas_put_line(struct canvas *pcanvas, struct color *pcolor,
                  enum line_type ltype, int start_x, int start_y,
                  int dx, int dy)
 {
@@ -140,7 +140,7 @@
   take care of this manually.  The text will not be NULL but may be empty.
 ****************************************************************************/
 void canvas_put_text(struct canvas *pcanvas, int canvas_x, int canvas_y,
-                    enum client_font font, enum color_std color,
+                    enum client_font font, struct color *pcolor,
                     const char *text)
 {
   /* PORTME */
Index: client/gui-stub/pages.c
===================================================================
--- client/gui-stub/pages.c     (Revision 11643)
+++ client/gui-stub/pages.c     (Arbeitskopie)
@@ -36,3 +36,20 @@
 {
   /* PORTME */
 }
+
+/**************************************************************************
+  Returns current client page
+**************************************************************************/
+enum client_pages get_client_page(void)
+{
+  /* PORTME*/
+  return PAGE_MAIN;
+}
+
+/**************************************************************************
+  update the start page.
+**************************************************************************/
+void update_start_page(void)
+{
+  /* PORTME*/    
+}
Index: client/gui-stub/connectdlg.c
===================================================================
--- client/gui-stub/connectdlg.c        (Revision 11643)
+++ client/gui-stub/connectdlg.c        (Arbeitskopie)
@@ -29,9 +29,6 @@
 #include "connectdlg.h"
 #include "packhand_gen.h"
 
-static void try_to_autoconnect(void);
-
-
 /**************************************************************************
  Really close and destroy the dialog.
 **************************************************************************/
@@ -104,4 +101,3 @@
 {
   /* PORTME */
 }
-
Index: client/gui-stub/dialogs.c
===================================================================
--- client/gui-stub/dialogs.c   (Revision 11643)
+++ client/gui-stub/dialogs.c   (Arbeitskopie)
@@ -43,7 +43,7 @@
 /**************************************************************************
   Popup the nation selection dialog.
 **************************************************************************/
-void popup_races_dialog(void)
+void popup_races_dialog(struct player *pplayer)
 {
   /* PORTME */
 }
@@ -69,7 +69,7 @@
   In the nation selection dialog, make already-taken nations unavailable.
   This information is contained in the packet_nations_used packet.
 **************************************************************************/
-void races_toggles_set_sensitive(bool *nations_used)
+void races_toggles_set_sensitive(void)
 {
   /* PORTME */
 }
@@ -99,7 +99,7 @@
   Is there currently a caravan dialog open?  This is important if there
   can be only one such dialog at a time; otherwise return FALSE.
 **************************************************************************/
-bool caravan_dialog_is_open(void)
+bool caravan_dialog_is_open(int* unit_id, int* city_id)
 {
   /* PORTME */
   return FALSE;
@@ -115,16 +115,6 @@
 }
 
 /**************************************************************************
-  Return whether a diplomat dialog is open.  This is important if there
-  can be only one such dialog at a time; otherwise return FALSE.
-**************************************************************************/
-bool diplomat_dialog_is_open(void)
-{
-  /* PORTME */
-  return FALSE;
-}
-
-/**************************************************************************
   Popup a window asking a diplomatic unit if it wishes to incite the
   given enemy city.
 **************************************************************************/
@@ -155,8 +145,7 @@
   Popup a dialog asking the unit which improvement they would like to
   pillage.
 **************************************************************************/
-void popup_pillage_dialog(struct unit *punit,
-                         enum tile_special_type may_pillage)
+void popup_pillage_dialog(struct unit *punit, bv_special may_pillage)
 {
   /* PORTME */
 }
@@ -169,3 +158,28 @@
 {
   /* PORTME */
 }
+
+/****************************************************************
+  Returns id of a diplomat currently handled in diplomat dialog
+*****************************************************************/
+int diplomat_handled_in_diplomat_dialog(void)
+{
+  /* PORTME */    
+  return -1;  
+}
+
+/****************************************************************
+  Closes the diplomat dialog
+****************************************************************/
+void close_diplomat_dialog(void)
+{
+  /* PORTME */
+}
+
+/****************************************************************
+  Updates caravan dialog
+****************************************************************/
+void caravan_dialog_update(void)
+{
+  /* PORT ME */
+}
Index: client/climisc.h
===================================================================
--- client/climisc.h    (Revision 11643)
+++ client/climisc.h    (Arbeitskopie)
@@ -17,6 +17,7 @@
 
 #include "fc_types.h"
 #include "events.h"
+#include "unittype.h"
 
 struct Clause;