From 5467d67f2a54c6d6efe407b10053e06067147a37 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 11 Jul 2011 19:15:57 +0000
Subject: [PATCH] In version_info.c, assume we always have the "matches"
 operator. In capture_opts.c, assume our output filename has been passed
 through arg_list_utf_16to8().

svn path=/trunk/; revision=37974
---
 capture_opts.c | 6 ------
 version_info.c | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/capture_opts.c b/capture_opts.c
index 7eb135ced0..4cd142fafb 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -697,12 +697,6 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
     case 'w':        /* Write to capture file x */
         capture_opts->saving_to_file = TRUE;
         g_free(capture_opts->save_file);
-#if defined _WIN32 && GLIB_CHECK_VERSION(2,6,0)
-        /* since GLib 2.6, we need to convert filenames to utf8 for Win32 */
-        capture_opts->save_file = g_locale_to_utf8(optarg_str_p, -1, NULL, NULL, NULL);
-#else
-        capture_opts->save_file = g_strdup(optarg_str_p);
-#endif
         status = capture_opts_output_to_pipe(capture_opts->save_file, &capture_opts->output_to_pipe);
         return status;
     case 'g':        /* enable group read access on the capture file(s) */
diff --git a/version_info.c b/version_info.c
index dc00463eb0..676825d789 100644
--- a/version_info.c
+++ b/version_info.c
@@ -163,12 +163,6 @@ get_compiled_version_info(GString *str, void (*prepend_info)(GString *),
 		(*append_info)(str);
 	g_string_append(str, ".");
 
-#if !defined(HAVE_LIBPCRE) && !GLIB_CHECK_VERSION(2,14,0)
-	g_string_append(str,
-	"\nNOTE: this build doesn't support the \"matches\" operator for Wireshark filter syntax");
-	g_string_append(str, ".");
-#endif	/* HAVE_LIBPCRE */
-
 	end_string(str);
 }