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

R46374 replaced too many GTK_STOCK_SAVEs. Put them back. 

svn path=/trunk/; revision=46690
This commit is contained in:
Gerald Combs 2012-12-22 05:21:46 +00:00
parent 238e30bfaf
commit 0adca98fb7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/gtk/capture_file_dlg.c
View File

@ -986,10 +986,10 @@ file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) {
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
WIRESHARK_STOCK_FILE, GTK_RESPONSE_ACCEPT);
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
#else
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
WIRESHARK_STOCK_FILE, GTK_RESPONSE_ACCEPT);
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
#endif
@ -1122,13 +1122,13 @@ test_file_close(capture_file *cf, gboolean from_quit, const char *before_what)
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
(capture_in_progress ?
WIRESHARK_STOCK_STOP_SAVE :
WIRESHARK_STOCK_FILE),
GTK_STOCK_SAVE),
GTK_RESPONSE_ACCEPT);
#else
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
(capture_in_progress ?
WIRESHARK_STOCK_STOP_SAVE :
WIRESHARK_STOCK_FILE),
GTK_STOCK_SAVE),
GTK_RESPONSE_ACCEPT);
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);

2
ui/gtk/file_dlg.c
View File

@ -92,7 +92,7 @@ file_selection_new(const gchar *title, file_selection_action_t action)
case FILE_SELECTION_SAVE:
gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
ok_button_text = WIRESHARK_STOCK_FILE;
ok_button_text = GTK_STOCK_SAVE;
break;
case FILE_SELECTION_WRITE_BROWSE: