Mercurial > gftp.yaz
changeset 702:ff091f8e387f
2005-3-29 Brian Masney <masneyb@gftp.org>
* src/text/gftp-text.c src/gtk/options_dialog.c - compiler fixes for
GTK+ 1.2
| author | masneyb |
|---|---|
| date | Tue, 29 Mar 2005 11:55:13 +0000 |
| parents | 1ad0e8150862 |
| children | 56de00e9afa1 |
| files | ChangeLog src/gtk/options_dialog.c src/text/gftp-text.c |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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,