diff options
| author | Guy Harris <guy@alum.mit.edu> | 2006-10-19 21:17:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2006-10-19 21:17:23 +0000 |
| commit | 1eefc6d60e757e99ed889de27591dce0caf9819d (patch) | |
| tree | 08e289e65f097dbabdae1b24036baaa1f4c7b1e1 /gtk | |
| parent | 0a069f6785961ab62dbeaa3410794b268ddcafe0 (diff) | |
Clean up the word wrap stuff a bit. (Arguably, that should be done in
the code that displays it - we might, for example, be able to have the
About dialog word-wrap to the appropriate size, and word-wrap text
printed to the standard output to the terminal width if it's going to a
terminal and to 80 or whatever columns otherwise.)
Don't report anything in dumpcap about libraries not used by dumpcap.
(It was printing a blank, which looked a bit weird.)
Fix the handling of _MSC_VER as per Gerald's fix for _MSC_FULL_VER.
svn path=/trunk/; revision=19618
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/main.c b/gtk/main.c index cc78a274f0..7ddf4baa8d 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2003,9 +2003,12 @@ static void main_cf_callback(gint event, gpointer data, gpointer user_data _U_) } static void -portaudio_info(GString *str) +get_epan_and_portaudio_version_info(GString *str) { + get_epan_compiled_version_info(str); + #ifdef HAVE_LIBPORTAUDIO + g_string_append(str, ", "); #ifdef PORTAUDIO_API_1 g_string_append(str, "with PortAudio <= V18"); #else /* PORTAUDIO_API_1 */ @@ -2120,7 +2123,7 @@ main(int argc, char *argv[]) #endif g_string_append(comp_info_str, ", "); - get_compiled_version_info(comp_info_str, portaudio_info); + get_compiled_version_info(comp_info_str, get_epan_and_portaudio_version_info); /* Assemble the run-time version information string */ runtime_info_str = g_string_new("Running "); |