aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2006-10-19 18:43:12 +0000
committerGuy Harris <guy@alum.mit.edu>2006-10-19 18:43:12 +0000
commit00d8ca2d4567d0c0e9b837a065a786e9076ad893 (patch)
tree7a2417a3d23f01ebec8ab5f177e6cdc1bb527abe /gtk
parent85a34375499dd6e9dd90679ea9ffbbdd038ebcf9 (diff)
Fix up the changes to put the Portaudio information at the end of the
version string, so the information comes out right for applications that don't use Portaudio. Get rid of an extra "with" in the version string for dumpcap. Get rid of an extra blank after the libpcap version string, and get rid of an extra newline before it. Attempt to add more compiler version information and to prettify the MSVC++ version information (both untested). svn path=/trunk/; revision=19613
Diffstat (limited to 'gtk')
-rw-r--r--gtk/main.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/gtk/main.c b/gtk/main.c
index d6f3aabfd5..cc78a274f0 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2002,6 +2002,21 @@ static void main_cf_callback(gint event, gpointer data, gpointer user_data _U_)
}
}
+static void
+portaudio_info(GString *str)
+{
+#ifdef HAVE_LIBPORTAUDIO
+#ifdef PORTAUDIO_API_1
+ g_string_append(str, "with PortAudio <= V18");
+#else /* PORTAUDIO_API_1 */
+ g_string_append(str, "with PortAudio ");
+ g_string_append(str, Pa_GetVersionText());
+#endif /* PORTAUDIO_API_1 */
+#else /* HAVE_LIBPORTAUDIO */
+ g_string_append(str, "without PortAudio");
+#endif /* HAVE_LIBPORTAUDIO */
+}
+
/* And now our feature presentation... [ fade to music ] */
int
main(int argc, char *argv[])
@@ -2105,20 +2120,7 @@ main(int argc, char *argv[])
#endif
g_string_append(comp_info_str, ", ");
- get_compiled_version_info(comp_info_str);
-
-#ifdef HAVE_LIBPORTAUDIO
- g_string_append(comp_info_str, " ");
-#ifdef PORTAUDIO_API_1
- g_string_append(comp_info_str, "with PortAudio <= V18");
-#else
- g_string_append(comp_info_str, "with PortAudio ");
- g_string_append(comp_info_str, Pa_GetVersionText());
-#endif
-#else
- g_string_append(comp_info_str, "without PortAudio");
-#endif /* HAVE_LIBPORTAUDIO */
- g_string_append(comp_info_str, ".");
+ get_compiled_version_info(comp_info_str, portaudio_info);
/* Assemble the run-time version information string */
runtime_info_str = g_string_new("Running ");