osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

GTK+: Yell at the user less. 

Change some exclamation points in error and warning messages to periods.

Change-Id: Ie084c40cf54362b43462bf4f6a29134caa101387
Reviewed-on: https://code.wireshark.org/review/19744
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2017-01-23 07:43:59 -08:00 committed by Gerald Combs
parent 781f03580c
commit 9cece7c081
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/gtk/capture_dlg.c
View File

@ -5642,7 +5642,7 @@ capture_dlg_prep(gpointer parent_w) {
global_capture_opts.autostop_filesize = tmp;
} else {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%sMultiple files: Requested filesize too large!%s\n\n"
"%sMultiple files: Requested file size too large.%s\n\n"
"The setting \"Next file every x byte(s)\" can't be greater than %u bytes (2GiB).",
simple_dialog_primary_start(), simple_dialog_primary_end(), (guint32)G_MAXINT + 1);
return FALSE;
@ -5652,13 +5652,13 @@ capture_dlg_prep(gpointer parent_w) {
/* test if the settings are ok for a ringbuffer */
if (global_capture_opts.save_file == NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%sMultiple files: No capture file name given!%s\n\n"
"%sMultiple files: No capture file name given.%s\n\n"
"You must specify a filename if you want to use multiple files.",
simple_dialog_primary_start(), simple_dialog_primary_end());
return FALSE;
} else if (!global_capture_opts.has_autostop_filesize && !global_capture_opts.has_file_duration) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%sMultiple files: No file limit given!%s\n\n"
"%sMultiple files: No file limit given.%s\n\n"
"You must specify a file size or duration at which is switched to the next capture file\n"
"if you want to use multiple files.",
simple_dialog_primary_start(), simple_dialog_primary_end());
@ -5676,7 +5676,7 @@ capture_dlg_prep(gpointer parent_w) {
global_capture_opts.autostop_filesize = tmp;
} else {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%sStop Capture: Requested filesize too large!%s\n\n"
"%sStop Capture: Requested file size too large.%s\n\n"
"The setting \"after x byte(s)\" can't be greater than %u bytes (2GiB).",
simple_dialog_primary_start(), simple_dialog_primary_end(), (guint32)G_MAXINT + 1);
return FALSE;

2
ui/gtk/capture_if_details_dlg_win32.c
View File

@ -2254,7 +2254,7 @@ capture_if_details_open_win(char *iface)
* XXX - We should use the TurboCap API to get info about TurboCap adapters.
*/
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%sCould not open adapter %s!%s"
"%sCould not open adapter %s.%s"
"\n\nHas it been unplugged?",
simple_dialog_primary_start(), iface, simple_dialog_primary_end());
return;

2
ui/gtk/main.c
View File

@ -1273,7 +1273,7 @@ main_cf_cb_file_closing(capture_file *cf)
* rather than, say, a progress spinner, here! */
if(cf->count > 10000) {
close_dlg = (GtkWidget *)simple_dialog(ESD_TYPE_STOP, ESD_BTN_NONE,
"%sClosing file!%s\n\nPlease wait ...",
"%sClosing file.%s\n\nPlease wait ...",
simple_dialog_primary_start(),
simple_dialog_primary_end());
gtk_window_set_position(GTK_WINDOW(close_dlg), GTK_WIN_POS_CENTER_ON_PARENT);