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/progress_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/progress_dlg.c')
| -rw-r--r-- | ui/gtk/progress_dlg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c index 675252e50e..2d89352647 100644 --- a/ui/gtk/progress_dlg.c +++ b/ui/gtk/progress_dlg.c @@ -91,7 +91,7 @@ create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title gchar *task_title_dup; gchar *item_title_dup; - dlg = g_malloc(sizeof (progdlg_t)); + dlg = (progdlg_t *)g_malloc(sizeof (progdlg_t)); /* limit the item_title to some reasonable length */ item_title_dup = g_strdup(item_title); @@ -203,7 +203,7 @@ create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title gtk_container_add(GTK_CONTAINER(main_vb), bbox); gtk_widget_show(bbox); - cancel_bt = g_object_get_data(G_OBJECT(bbox), terminate_is_stop ? GTK_STOCK_STOP : + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), terminate_is_stop ? GTK_STOCK_STOP : GTK_STOCK_CANCEL); gtk_widget_grab_default(cancel_bt); @@ -388,7 +388,7 @@ update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status) } /* update progress bar */ - prog_bar = g_object_get_data(G_OBJECT(dlg_w), PROG_BAR_KEY); + prog_bar = (GtkWidget *)g_object_get_data(G_OBJECT(dlg_w), PROG_BAR_KEY); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(prog_bar), percentage); /* |