Re: [gftp] gftp-2.0.18 is broken with gtk12

[Brian Masney <masneyb@xxxxxxxx>]

This is now fixed in CVS.

Brian


On Sat, Feb 05, 2005 at 04:47:33PM +0100, Oliver Lehmann wrote:
> cc  -O2 -fno-strict-aliasing -pipe -march=pentium2   -o gftp-text 
> gftp-text.o textui.o ../../lib/libgftp.a ../../lib/fsplib/libfsp.a
> ../uicommon/libgftpui.a -L/usr/local/lib -lglib12 -lutil -lm -lreadline
> -lintl -lncurses -lcrypto -lssl -lintl -L/usr/local/lib
> gftp-text.o(.text+0x325): In function `gftp_text_ask_question':
> : undefined reference to `g_locale_from_utf8'
> *** Error code 1
> 
> Stop in
> /usr/obj/i386-6.0/mnt/files/freebsd-cvs/ports/ftp/gftp/work/gftp-2.0.18/s
> rc/text.
> *** Error code 1
> 
> find a patch attached which will fix that issue
> 
> 
> 
> if cc -DHAVE_CONFIG_H -I. -I. -I../.. -I/usr/X11R6/include/gtk12
> -I/usr/local/include/glib12 -I/usr/local/include -I/usr/X11R6/include
> -D_REENTRANT -D_THREAD_SAFE -I../../intl   -I/usr/local/include  -O2
> -fno-strict-aliasing -pipe -march=pentium2 -MT options_dialog.o -MD -MP
> -MF ".deps/options_dialog.Tpo"  -c -o options_dialog.o `test -f
> 'options_dialog.c' || echo './'`options_dialog.c;  then mv -f
> ".deps/options_dialog.Tpo" ".deps/options_dialog.Po";  else rm -f
> ".deps/options_dialog.Tpo"; exit 1;  fi
> options_dialog.c: In function `add_proxy_host':
> options_dialog.c:1009: error: syntax error before "gtk_misc_set_alignment"
> *** Error code 1
> 
> find a patch attached which will fix that issue
> 
> -- 
>  Oliver Lehmann
>   http://www.pofo.de/
>   http://wishlist.ans-netz.de/



Index: src/gtk/options_dialog.c
===================================================================
RCS file: /cvs/gnome/gftp/src/gtk/options_dialog.c,v
retrieving revision 1.25
diff -u -r1.25 options_dialog.c
--- src/gtk/options_dialog.c	2 Dec 2004 22:22:31 -0000	1.25
+++ src/gtk/options_dialog.c	29 Mar 2005 11:54:16 -0000
@@ -1002,7 +1002,7 @@
   gtk_widget_show (box);
   
 #if GTK_MAJOR_VERSION == 1
-  tempwid = gtk_label_new (_("Type:"))
+  tempwid = gtk_label_new (_("Type:"));
 #else
   tempwid = gtk_label_new_with_mnemonic (_("_Type:"));
 #endif
Index: src/text/gftp-text.c
===================================================================
RCS file: /cvs/gnome/gftp/src/text/gftp-text.c,v
retrieving revision 1.45
diff -u -r1.45 gftp-text.c
--- src/text/gftp-text.c	25 Jan 2005 01:11:00 -0000	1.45
+++ src/text/gftp-text.c	29 Mar 2005 11:54:16 -0000
@@ -185,7 +185,12 @@
   else
     infd = stdin;
 
+#if GLIB_MAJOR_VERSION > 1
   locale_question = g_locale_from_utf8 (question, -1, NULL, NULL, NULL);
+#else
+  locale_question = NULL;
+#endif
+
   if (locale_question != NULL)
     {
       printf ("%s%s%s ", GFTPUI_COMMON_COLOR_BLUE, locale_question,