# HG changeset patch
# User masneyb
# Date 1112097313 0
# Node ID ff091f8e387f13957dc6bf8a3156eff91c58c483
# Parent  1ad0e8150862a63f71f60d0b7a6434f653e02fc2
2005-3-29 Brian Masney <masneyb@gftp.org>

        * src/text/gftp-text.c src/gtk/options_dialog.c - compiler fixes for
        GTK+ 1.2

diff -r 1ad0e8150862 -r ff091f8e387f ChangeLog
--- a/ChangeLog	Mon Mar 28 17:04:25 2005 +0000
+++ b/ChangeLog	Tue Mar 29 11:55:13 2005 +0000
@@ -1,3 +1,7 @@
+2005-3-29 Brian Masney <masneyb@gftp.org>
+	* src/text/gftp-text.c src/gtk/options_dialog.c - compiler fixes for
+	GTK+ 1.2
+
 2005-2-14 Brian Masney <masneyb@gftp.org>
 	* Changelog-Old - updated security fix line with the CVE ID
 	CAN-2005-0372
@@ -3292,7 +3296,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.408 2005/02/14 10:58:26 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.409 2005/03/29 11:55:13 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 1ad0e8150862 -r ff091f8e387f src/gtk/options_dialog.c
--- a/src/gtk/options_dialog.c	Mon Mar 28 17:04:25 2005 +0000
+++ b/src/gtk/options_dialog.c	Tue Mar 29 11:55:13 2005 +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
diff -r 1ad0e8150862 -r ff091f8e387f src/text/gftp-text.c
--- a/src/text/gftp-text.c	Mon Mar 28 17:04:25 2005 +0000
+++ b/src/text/gftp-text.c	Tue Mar 29 11:55:13 2005 +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,