summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Lehmann <oliver@FreeBSD.org>2005-02-05 15:47:35 +0000
committerOliver Lehmann <oliver@FreeBSD.org>2005-02-05 15:47:35 +0000
commit890480ddf1e6a813c0970fb276db6be127559023 (patch)
tree871b1e5dbbe1a844ae9c30ef7c6cfdc4890f73f4
parentFix plist. (diff)
fix build with glib/gtk12
Notes
Notes: svn path=/head/; revision=128077
-rw-r--r--ftp/gftp/files/patch-src::gtk::options_dialog.c11
-rw-r--r--ftp/gftp/files/patch-src::text::gftp-text.c18
2 files changed, 29 insertions, 0 deletions
diff --git a/ftp/gftp/files/patch-src::gtk::options_dialog.c b/ftp/gftp/files/patch-src::gtk::options_dialog.c
new file mode 100644
index 000000000000..2fb1b0bd6a24
--- /dev/null
+++ b/ftp/gftp/files/patch-src::gtk::options_dialog.c
@@ -0,0 +1,11 @@
+--- src/gtk/options_dialog.c.orig Sat Feb 5 16:42:53 2005
++++ src/gtk/options_dialog.c Sat Feb 5 16:45:15 2005
+@@ -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 --git a/ftp/gftp/files/patch-src::text::gftp-text.c b/ftp/gftp/files/patch-src::text::gftp-text.c
new file mode 100644
index 000000000000..0e1bf3bd9fa7
--- /dev/null
+++ b/ftp/gftp/files/patch-src::text::gftp-text.c
@@ -0,0 +1,18 @@
+--- src/text/gftp-text.c.orig Sat Feb 5 16:38:03 2005
++++ src/text/gftp-text.c Sat Feb 5 16:39:26 2005
+@@ -185,6 +185,7 @@
+ else
+ infd = stdin;
+
++#if GLIB_MAJOR_VERSION > 1
+ locale_question = g_locale_from_utf8 (question, -1, NULL, NULL, NULL);
+ if (locale_question != NULL)
+ {
+@@ -193,6 +194,7 @@
+ g_free (locale_question);
+ }
+ else
++#endif
+ printf ("%s%s%s ", GFTPUI_COMMON_COLOR_BLUE, question,
+ GFTPUI_COMMON_COLOR_DEFAULT);
+