diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:58:59 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:58:59 +0000 |
commit | 35d1b406d74101f0ec04026e9a8b2ce75d57201d (patch) | |
tree | 0f082370b8dc5dd91106bda722e9d097a568dbb3 /ui/gtk/rtp_stream_dlg.c | |
parent | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (diff) | |
download | wireshark-35d1b406d74101f0ec04026e9a8b2ce75d57201d.tar.gz |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10408
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
svn path=/trunk/; revision=48448
Diffstat (limited to 'ui/gtk/rtp_stream_dlg.c')
-rw-r--r-- | ui/gtk/rtp_stream_dlg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index 4d28fd7334..fda197bdd4 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -121,8 +121,8 @@ static gboolean save_stream_ok_cb(GtkWidget *ok_bt _U_, gpointer fs) /* It's a directory - set the file selection box to display it. */ set_last_open_dir(g_dest); g_free(g_dest); - file_selection_set_current_folder(fs, get_last_open_dir()); - gtk_file_chooser_set_current_name(fs, ""); + file_selection_set_current_folder((GtkWidget *)fs, get_last_open_dir()); + gtk_file_chooser_set_current_name((GtkFileChooser *)fs, ""); return FALSE; } @@ -188,8 +188,8 @@ rtpstream_on_unselect(GtkButton *button _U_, gpointer user_data _U_) /****************************************************************************/ static gint rtp_stream_info_cmp_reverse(gconstpointer aa, gconstpointer bb) { - const struct _rtp_stream_info* a = aa; - const struct _rtp_stream_info* b = bb; + const struct _rtp_stream_info* a = (struct _rtp_stream_info *)aa; + const struct _rtp_stream_info* b = (struct _rtp_stream_info *)bb; if (a==NULL || b==NULL) return 1; |