diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-10-10 19:00:50 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-10-10 19:00:50 +0000 |
| commit | fe2f2920b843530dc8253da9098889d38dae4241 (patch) | |
| tree | ba9b84d9709ca7373f5ac6321725d094110b81a9 | |
| parent | 26cce5d9fd36f22a347eb1ebddd3de07e15e31da (diff) | |
Don't let PortAudio skip the queue on the about dialog ;)
svn path=/trunk/; revision=19478
| -rw-r--r-- | gtk/main.c | 24 | ||||
| -rw-r--r-- | version_info.c | 8 |
2 files changed, 17 insertions, 15 deletions
diff --git a/gtk/main.c b/gtk/main.c index fee81ca026..822c7ea932 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2067,17 +2067,6 @@ main(int argc, char *argv[]) /* Assemble the compile-time version information string */ comp_info_str = g_string_new("Compiled "); -#ifdef HAVE_LIBPORTAUDIO -#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, ", "); g_string_append(comp_info_str, "with "); g_string_sprintfa(comp_info_str, @@ -2091,6 +2080,19 @@ main(int argc, char *argv[]) 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, "."); + /* Assemble the run-time version information string */ runtime_info_str = g_string_new("Running "); get_runtime_version_info(runtime_info_str); diff --git a/version_info.c b/version_info.c index 3cec88e08d..9cf6742c4c 100644 --- a/version_info.c +++ b/version_info.c @@ -265,18 +265,18 @@ get_compiled_version_info(GString *str) #else g_string_append(str, "without Kerberos"); #endif /* HAVE_KERBEROS */ - g_string_append(str, "."); do_word_wrap(str, break_point); #ifndef HAVE_LIBPCRE break_point = str->len - 1; g_string_append(str, - "\nNOTE: this build doesn't support the \"matches\" operator for Wireshark filter" + ".\nNOTE: this build doesn't support the \"matches\" operator for Wireshark filter" "\nsyntax."); - do_word_wrap(str, break_point); +#else + g_string_append(str, ","); #endif /* HAVE_LIBPCRE */ + do_word_wrap(str, break_point); - end_string(str); } /* |