diff options
| -rw-r--r-- | epan/prefs.c | 3 | ||||
| -rw-r--r-- | gtk/main.c | 6 | ||||
| -rw-r--r-- | gtk/prefs_gui.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index 532a843247..256d557030 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -2979,7 +2979,8 @@ write_prefs(char **pf_path_return) fprintf(pf, PRS_GUI_START_TITLE ": %s\n", prefs.gui_start_title); - fprintf(pf, "\n# Show version in start page, can be useful in custom builds.\n"); + fprintf(pf, "\n# Show version in start page and main window's title bar.\n"); + fprintf(pf, "# This can be useful for keeping track of custom builds.\n"); fprintf(pf, "# TRUE or FALSE (case-insensitive).\n"); fprintf(pf, PRS_GUI_VERSION_IN_START_PAGE ": %s\n", prefs.gui_version_in_start_page == TRUE ? "TRUE" : "FALSE"); diff --git a/gtk/main.c b/gtk/main.c index 74a0d7bb19..cc72bf1b15 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1427,7 +1427,11 @@ set_display_filename(capture_file *cf) } /* window title */ - win_name = g_strdup_printf("%s - Wireshark", cf_get_display_name(cf)); + if (prefs.gui_version_in_start_page) { + win_name = g_strdup_printf("Wireshark %s %s: %s", VERSION, wireshark_svnversion, cf_get_display_name(cf)); + } else { + win_name = g_strdup_printf("Wireshark: %s", cf_get_display_name(cf)); + } set_main_window_name(win_name); g_free(win_name); } diff --git a/gtk/prefs_gui.c b/gtk/prefs_gui.c index 17d16357ee..6a7272dfb1 100644 --- a/gtk/prefs_gui.c +++ b/gtk/prefs_gui.c @@ -326,8 +326,8 @@ gui_prefs_show(void) /* Show version in welcome screen */ show_version_cb = create_preference_check_button(main_tb, pos++, - "Welcome screen shows version:", - "Whether version should be shown in the start page or not.", + "Welcome screen and title bar shows the version:", + "Whether version should be shown in the start page and main window's title bar.", prefs.gui_version_in_start_page ); g_object_set_data(G_OBJECT(main_vb), GUI_SHOW_VERSION_KEY, show_version_cb); |