In the GTK+ code, move the redefinition of "isprint()" to

"gtk/isprint.h", and include that in "follow_dlg.c" (which wasn't
including "gtkglobals.h" and thus wasn't getting the redefinition) and
"proto_draw.c" (which was including "gtkglobals.h" but now needs to
include "isprint.h" as well).

svn path=/trunk/; revision=11355

5 files changed, 51 insertions, 17 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 90b0719852..8f2b6e2cc5 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for the GTK interface routines for Ethereal
 #
-# $Id: Makefile.am,v 1.106 2004/06/27 00:21:57 gerald Exp $
+# $Id: Makefile.am,v 1.107 2004/07/09 23:02:37 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -60,6 +60,7 @@ noinst_HEADERS = \
 	gui_prefs.h	\
 	help_dlg.h	\
 	hostlist_table.h \
+	isprint.h	\
 	keys.h		\
 	layout_prefs.h	\
 	main.h		\
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index 1ea98d857d..e13ff16ed3 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
 /* follow_dlg.c
  *
- * $Id: follow_dlg.c,v 1.68 2004/06/29 03:27:51 jmayer Exp $
+ * $Id: follow_dlg.c,v 1.69 2004/07/09 23:02:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -40,6 +40,8 @@
 
 #include <ctype.h>
 
+#include "isprint.h"
+
 #include "color.h"
 #include "color_utils.h"
 #include "file.h"
diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h
index 31fd095a11..3469e8c378 100644
--- a/gtk/gtkglobals.h
+++ b/gtk/gtkglobals.h
@@ -1,7 +1,7 @@
 /* gtkglobals.h
  * GTK-related Global defines, etc.
  *
- * $Id: gtkglobals.h,v 1.30 2004/06/17 16:35:24 ulfl Exp $
+ * $Id: gtkglobals.h,v 1.31 2004/07/09 23:02:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -54,17 +54,4 @@ extern GtkWidget *byte_nb_ptr;
 /** The filter text entry in the filter toolbar. */
 extern GtkWidget   *main_display_filter_widget;
 
-#if GTK_MAJOR_VERSION >= 2 || GTK_MINOR_VERSION >= 3
-/**
- * XXX - "isprint()" can return "true" for non-ASCII characters, but
- * those don't work with GTK+ 1.3 or later, as they take UTF-8 strings
- * as input.  Until we fix up Ethereal to properly handle non-ASCII
- * characters in all output (both GUI displays and text printouts)
- * in those versions of GTK+, we work around the problem by escaping
- * all characters that aren't printable ASCII.
- */
-#undef isprint
-#define isprint(c) (c >= 0x20 && c < 0x7f)
-#endif
-
 #endif
diff --git a/gtk/isprint.h b/gtk/isprint.h
new file mode 100644
index 0000000000..274fc43e3d
--- /dev/null
+++ b/gtk/isprint.h
@@ -0,0 +1,42 @@
+/* isprint.h
+ * Temporary redefinition of "isprint()" to cope with GTK+ 1.3 and
+ * later using UTF-8 strings
+ *
+ * $Id: isprint.h,v 1.1 2004/07/09 23:02:38 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __ISPRINT_H__
+#define __ISPRINT_H__
+
+#if GTK_MAJOR_VERSION >= 2 || GTK_MINOR_VERSION >= 3
+/**
+ * XXX - "isprint()" can return "true" for non-ASCII characters, but
+ * those don't work with GTK+ 1.3 or later, as they take UTF-8 strings
+ * as input.  Until we fix up Ethereal to properly handle non-ASCII
+ * characters in all output (both GUI displays and text printouts)
+ * in those versions of GTK+, we work around the problem by escaping
+ * all characters that aren't printable ASCII.
+ */
+#undef isprint
+#define isprint(c) (c >= 0x20 && c < 0x7f)
+#endif
+
+#endif
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index e2055289a5..fde570ef57 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
 /* proto_draw.c
  * Routines for GTK+ packet display
  *
- * $Id: proto_draw.c,v 1.107 2004/06/30 06:58:58 guy Exp $
+ * $Id: proto_draw.c,v 1.108 2004/07/09 23:02:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -50,6 +50,8 @@
 
 #include <epan/epan_dissect.h>
 
+#include "isprint.h"
+
 #include "main.h"
 #include <epan/packet.h>
 #include "util.h"