[Freeciv-Dev] Re: gtk2 compile error (PR#2072)

[Jason Short <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

Jason Short wrote:
> The gtk2 client won't compile because the dataio functions weren't 
> renamed when that code was renamed and split off into dataio.[ch].
> Patch attached.
Err, I guess the function iget_conv should be renamed to just get_conv, 
as well.
jason

Index: client/gui-gtk-2.0/gui_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/gui_main.c,v
retrieving revision 1.26
diff -u -r1.26 gui_main.c
--- client/gui-gtk-2.0/gui_main.c       2002/08/24 14:37:43     1.26
+++ client/gui-gtk-2.0/gui_main.c       2002/09/19 19:00:41
@@ -30,6 +30,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "dataio.h"
 #include "fcintl.h"
 #include "game.h"
 #include "government.h"
@@ -189,8 +190,8 @@
  Returns FALSE if the destination isn't large enough or the source was
  bad.
 **************************************************************************/
-static bool iget_conv(char *dst, size_t ndst, const unsigned char *src,
-                     size_t nsrc)
+static bool get_conv(char *dst, size_t ndst, const unsigned char *src,
+                    size_t nsrc)
 {
   gsize len;                   /* length to copy, not including null */
   gchar *out = g_convert(src, nsrc, "UTF-8", network_charset, NULL, &len, 
NULL);
@@ -860,8 +861,8 @@
     network_charset = mystrdup(charset);
   }
 
-  set_put_conv_callback(put_conv);
-  set_iget_conv_callback(iget_conv);
+  dio_set_put_conv_callback(put_conv);
+  dio_set_get_conv_callback(get_conv);
 
   /* convert inputs */
   s = g_locale_to_utf8(player_name, -1, NULL, NULL, NULL);