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/about_dlg.c | |
| parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) | |
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/about_dlg.c')
| -rw-r--r-- | ui/gtk/about_dlg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 224563a44a..220eeb3ce8 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -277,7 +277,7 @@ splash_update(register_action_e action, const char *message, gpointer client_dat prog_bar = (GtkWidget *)g_object_get_data(G_OBJECT(win), "progress_bar"); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(prog_bar), percentage); - percentage_lb = g_object_get_data(G_OBJECT(win), "percentage_label"); + percentage_lb = (GtkWidget *)g_object_get_data(G_OBJECT(win), "percentage_label"); g_snprintf(tmp, sizeof(tmp), "%lu%%", ul_percentage); gtk_label_set_text((GtkLabel*)percentage_lb, tmp); @@ -578,7 +578,7 @@ about_wireshark_cb( GtkWidget *w _U_, gpointer data _U_ ) bbox = dlg_button_row_new(GTK_STOCK_OK, NULL); gtk_box_pack_start(GTK_BOX(main_box), bbox, FALSE, FALSE, 0); - ok_btn = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_btn = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); gtk_widget_grab_focus(ok_btn); gtk_widget_grab_default(ok_btn); window_set_cancel_button(about_wireshark_w, ok_btn, window_cancel_button_cb); |