diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
| commit | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (patch) | |
| tree | 885dc3989020530f2fcf4b82ec39284d36d43bd4 /ui/gtk/capture_file_dlg.c | |
| parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) | |
| download | wireshark-8112ecc321d5d2025e7b780db21f88a31d0ee472.tar.gz | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404
Note: The following parts of the patch had been previously done:
asn1/snmp/packet-snmp-template.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-x11.c
Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
didn't compile and needed a few additional patches.
svn path=/trunk/; revision=48447
Diffstat (limited to 'ui/gtk/capture_file_dlg.c')
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index adabc41d2b..5b14d20af5 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -1031,7 +1031,7 @@ file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) { user whether to save the capture. */ if (cfile.is_tempfile) { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "Do you want to save the captured packets before merging another capture file into it?"); @@ -1044,7 +1044,7 @@ file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) { */ display_basename = g_filename_display_basename(cfile.filename); msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "Do you want to save the changes you've made " @@ -1140,7 +1140,7 @@ test_file_close(capture_file *cf, gboolean from_quit, const char *before_what) to save the data. */ if (cf->is_tempfile) { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, capture_in_progress ? @@ -1157,14 +1157,14 @@ test_file_close(capture_file *cf, gboolean from_quit, const char *before_what) display_basename = g_filename_display_basename(cf->filename); if (capture_in_progress) { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "Do you want to stop the capture and save the captured packets%s?", before_what); } else { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "Do you want to save the changes you've made " @@ -2343,7 +2343,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list) /* Write out the filters (all, or only the ones that are currently displayed or selected) to the file with the specified name. */ - if (!color_filters_export(cf_name, filter_list, color_selected)) { + if (!color_filters_export(cf_name, (GSList *)filter_list, color_selected)) { /* The write failed; don't dismiss the open dialog box, just leave it around so that the user can, after they dismiss the alert box popped up for the error, try again. */ |