Use explicit casts.

svn path=/trunk/; revision=48217

10 files changed, 90 insertions, 90 deletions

diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index c61a244a15..55b7fc4fa6 100644
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -92,7 +92,7 @@ fs_open_entry(fileset_entry *entry)
 static void
 fs_rb_cb(GtkWidget *open_bt, gpointer fs_data)
 {
-    fileset_entry *entry = fs_data;
+    fileset_entry *entry = (fileset_entry *)fs_data;
 
     /* button release should have no effect */
     if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(open_bt) )) {
@@ -319,11 +319,11 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_)
     bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
     gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
 
-    close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
+    close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
     window_set_cancel_button(fs_w, close_bt, window_cancel_button_cb);
     gtk_widget_set_tooltip_text(close_bt, "Close this window.");
 
-    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
     g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FILESET_DIALOG);
 
     gtk_widget_grab_default(close_bt);
diff --git a/ui/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c
index 0301e267a1..7cc92d2ea5 100644
--- a/ui/gtk/filter_autocomplete.c
+++ b/ui/gtk/filter_autocomplete.c
@@ -185,7 +185,7 @@ autoc_filter_row_activated_cb(GtkTreeView *treeview,
   }
 
   w_main = gtk_widget_get_toplevel(GTK_WIDGET(data));
-  win = g_object_get_data(G_OBJECT(w_main), E_FILT_AUTOCOMP_PTR_KEY);
+  win = (GtkWidget *)g_object_get_data(G_OBJECT(w_main), E_FILT_AUTOCOMP_PTR_KEY);
   if(win != NULL) {
     gtk_widget_destroy(win);
     g_object_set_data(G_OBJECT(w_main), E_FILT_AUTOCOMP_PTR_KEY, NULL);
@@ -199,7 +199,7 @@ filter_te_focus_out_cb(GtkWidget *filter_te _U_,
 {
   GtkWidget *win;
 
-  win = g_object_get_data(G_OBJECT(data), E_FILT_AUTOCOMP_PTR_KEY);
+  win = (GtkWidget *)g_object_get_data(G_OBJECT(data), E_FILT_AUTOCOMP_PTR_KEY);
   if(win != NULL) {
     gtk_widget_destroy(win);
     g_object_set_data(G_OBJECT(data), E_FILT_AUTOCOMP_PTR_KEY, NULL);
@@ -352,7 +352,7 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event, gpoint
 
   w_toplevel = gtk_widget_get_toplevel(filter_te);
 
-  popup_win = g_object_get_data(G_OBJECT(w_toplevel), E_FILT_AUTOCOMP_PTR_KEY);
+  popup_win = (GtkWidget *)g_object_get_data(G_OBJECT(w_toplevel), E_FILT_AUTOCOMP_PTR_KEY);
 
   k = event->keyval;
   ckey = event->string[0];
@@ -470,7 +470,7 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event, gpoint
   }
 
 
-  treeview = g_object_get_data(G_OBJECT(popup_win), E_FILT_AUTOCOMP_TREE_KEY);
+  treeview = (GtkWidget *)g_object_get_data(G_OBJECT(popup_win), E_FILT_AUTOCOMP_TREE_KEY);
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
   model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
 
@@ -858,7 +858,7 @@ filter_parent_dlg_key_pressed_cb(GtkWidget *win, GdkEventKey *event, gpointer us
 {
   GtkWidget *popup_win;
 
-  popup_win = g_object_get_data(G_OBJECT(win), E_FILT_AUTOCOMP_PTR_KEY);
+  popup_win = (GtkWidget *)g_object_get_data(G_OBJECT(win), E_FILT_AUTOCOMP_PTR_KEY);
 
   if(popup_win && event->keyval == GDK_Escape) {
     gtk_widget_destroy(popup_win);
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
index 654bdee5bd..731e8d8184 100644
--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@@ -117,7 +117,7 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_)
     };
 
     /* Has a filter dialog box already been opened for that button? */
-    filter_browse_w = g_object_get_data(G_OBJECT(w), E_FILT_DIALOG_PTR_KEY);
+    filter_browse_w = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_FILT_DIALOG_PTR_KEY);
 
     if (filter_browse_w != NULL) {
         /* Yes.  Just re-activate that dialog box. */
@@ -126,7 +126,7 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_)
     }
 
     /* No.  Get the text entry attached to the button. */
-    parent_filter_te = g_object_get_data(G_OBJECT(w), E_FILT_TE_PTR_KEY);
+    parent_filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_FILT_TE_PTR_KEY);
 
     /* Now create a new dialog, without an "Add Expression..." button. */
     filter_dialog_new(w, parent_filter_te, CFILTER_LIST, &args);
@@ -148,12 +148,12 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_)
 void
 display_filter_construct_cb(GtkWidget *w, gpointer construct_args_ptr)
 {
-    construct_args_t *construct_args = construct_args_ptr;
+    construct_args_t *construct_args = (construct_args_t *)construct_args_ptr;
     GtkWidget *filter_browse_w;
     GtkWidget *parent_filter_te;
 
     /* Has a filter dialog box already been opened for the button? */
-    filter_browse_w = g_object_get_data(G_OBJECT(w), E_FILT_DIALOG_PTR_KEY);
+    filter_browse_w = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_FILT_DIALOG_PTR_KEY);
 
     if (filter_browse_w != NULL) {
         /* Yes.  Just re-activate that dialog box. */
@@ -162,7 +162,7 @@ display_filter_construct_cb(GtkWidget *w, gpointer construct_args_ptr)
     }
 
     /* No.  Get the text entry attached to the button. */
-    parent_filter_te = g_object_get_data(G_OBJECT(w), E_FILT_TE_PTR_KEY);
+    parent_filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_FILT_TE_PTR_KEY);
 
     /* Now create a new dialog, possibly with an "Apply" button, and
        definitely with an "Add Expression..." button. */
@@ -178,7 +178,7 @@ filter_button_destroy_cb(GtkWidget *button, gpointer user_data _U_)
 
     /* Is there a filter edit/selection dialog associated with this
        button? */
-    filter_w = g_object_get_data(G_OBJECT(button), E_FILT_DIALOG_PTR_KEY);
+    filter_w = (GtkWidget *)g_object_get_data(G_OBJECT(button), E_FILT_DIALOG_PTR_KEY);
 
     if (filter_w != NULL) {
         /* Yes.  Break the association, and destroy the dialog. */
@@ -233,7 +233,7 @@ dfilter_dialog_cb(GtkWidget *w _U_)
         FALSE
     };
 
-        display_filter_construct_cb(g_object_get_data(G_OBJECT(top_level), E_FILT_BT_PTR_KEY), &args);
+        display_filter_construct_cb((GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_FILT_BT_PTR_KEY), &args);
 }
 
 /* List of capture filter dialogs, so that if the list of filters changes
@@ -319,7 +319,7 @@ fill_list(GtkWidget  *main_w, filter_list_type_t list_type, const gchar *filter_
                  * and use it later without any crashes.  This may not be a
                  * valid assumption.
                  */
-                l_select = g_memdup(&iter, sizeof(iter));
+                l_select = (GtkTreeIter *)g_memdup(&iter, sizeof(iter));
             }
         }
 
@@ -567,7 +567,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
     gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
     gtk_widget_show(bbox);
 
-    ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
+    ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
     g_signal_connect(ok_bt, "clicked", G_CALLBACK(filter_dlg_ok_cb), filter_list_type_p);
     gtk_widget_set_tooltip_text(ok_bt, "Apply the filters and close this dialog");
 
@@ -581,20 +581,20 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
         dlg_set_activate(filter_te, ok_bt);
     }
 
-    apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY);
+    apply_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY);
     g_signal_connect(apply_bt, "clicked", G_CALLBACK(filter_dlg_apply_cb), filter_list_type_p);
     gtk_widget_set_tooltip_text(apply_bt, "Apply the filters and keep this dialog open");
 
-    save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE);
+    save_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE);
     g_signal_connect(save_bt, "clicked", G_CALLBACK(filter_dlg_save_cb), filter_list_type_p);
     gtk_widget_set_tooltip_text(save_bt, "Save the filters permanently and keep this dialog open");
 
-    cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+    cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
     gtk_widget_set_tooltip_text(cancel_bt, "Cancel the changes");
     g_signal_connect(cancel_bt, "clicked", G_CALLBACK(filter_dlg_cancel_cb), filter_list_type_p);
     window_set_cancel_button(main_w, cancel_bt, NULL);
 
-    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
     if (list_type == CFILTER_EDITED_LIST) {
         g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_CAPTURE_FILTERS_DIALOG);
     } else {
@@ -664,7 +664,7 @@ filter_dlg_dclick(GtkWidget *filter_l, gpointer main_w_arg, gpointer activate)
 {
     GtkWidget  *main_w = GTK_WIDGET(main_w_arg);
     GtkWidget  *parent_filter_te =
-        g_object_get_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY);
+        (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY);
     GList      *flp;
     filter_def *filt;
     GtkTreeSelection *sel;
@@ -744,9 +744,9 @@ static void
 filter_apply(GtkWidget *main_w, gboolean destroy)
 {
     construct_args_t *construct_args =
-        g_object_get_data(G_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY);
+        (construct_args_t *)g_object_get_data(G_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY);
     GtkWidget        *parent_filter_te =
-        g_object_get_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY);
+        (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY);
     GtkWidget        *filter_te;
     const gchar      *filter_string;
 
@@ -756,7 +756,7 @@ filter_apply(GtkWidget *main_w, gboolean destroy)
          * box; put the filter in our text entry widget into that
          * text entry widget.
          */
-                filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
+                filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
         filter_string =
                     (const gchar *)gtk_entry_get_text(GTK_ENTRY(filter_te));
         gtk_entry_set_text(GTK_ENTRY(parent_filter_te), filter_string);
@@ -921,7 +921,7 @@ filter_dlg_destroy_cb(GtkWidget *win, gpointer data)
     /* Get the button that requested that we be popped up, if any.
        (It should arrange to destroy us if it's destroyed, so
        that we don't get a pointer to a non-existent window here.) */
-    button = g_object_get_data(G_OBJECT(win), E_FILT_BUTTON_PTR_KEY);
+    button = (GtkWidget *)g_object_get_data(G_OBJECT(win), E_FILT_BUTTON_PTR_KEY);
 
     if (button != NULL) {
         /* Tell it we no longer exist. */
@@ -956,7 +956,7 @@ filter_sel_list_button_cb(GtkWidget *list, GdkEventButton *event,
     gpointer func_activate;
 
     if (event->type == GDK_2BUTTON_PRESS) {
-        func = g_object_get_data(G_OBJECT(list), E_FILT_DBLFUNC_KEY);
+        func = ( void (*)(GtkWidget *, void *, void *))g_object_get_data(G_OBJECT(list), E_FILT_DBLFUNC_KEY);
         func_arg = g_object_get_data(G_OBJECT(list), E_FILT_DBLARG_KEY);
         func_activate = g_object_get_data(G_OBJECT(list), E_FILT_DBLACTIVATE_KEY);
 
@@ -974,11 +974,11 @@ filter_sel_list_cb(GtkTreeSelection *sel, gpointer data _U_)
     GtkWidget    *main_w = gtk_widget_get_toplevel(filter_l);
     GtkTreeModel *model;
     GtkTreeIter   iter;
-    GtkWidget    *name_te = g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY);
-    GtkWidget    *filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
-    GtkWidget    *chg_bt = g_object_get_data(G_OBJECT(main_w), E_FILT_CHG_BT_KEY);
-    GtkWidget    *copy_bt = g_object_get_data(G_OBJECT(main_w), E_FILT_COPY_BT_KEY);
-    GtkWidget    *del_bt = g_object_get_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY);
+    GtkWidget    *name_te   = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY);
+    GtkWidget    *filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
+    GtkWidget    *chg_bt    = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_CHG_BT_KEY);
+    GtkWidget    *copy_bt   = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_COPY_BT_KEY);
+    GtkWidget    *del_bt    = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY);
     filter_def   *filt;
     gchar        *name = NULL, *strval = NULL;
     GList        *flp;
@@ -1044,12 +1044,12 @@ typedef struct {
 static void
 new_filter_cb(gpointer data, gpointer user_data)
 {
-    GtkWidget    *main_w = data;
+    GtkWidget    *main_w = (GtkWidget *)data;
     GtkTreeView  *filter_l;
     GtkListStore *store;
     GtkTreeIter   iter;
-    new_filter_cb_args_t *args = user_data;
-    filter_def *nfilt = args->nflp->data;
+    new_filter_cb_args_t *args = (new_filter_cb_args_t *)user_data;
+    filter_def *nfilt = (filter_def *)args->nflp->data;
 
     filter_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY));
     store = GTK_LIST_STORE(gtk_tree_view_get_model(filter_l));
@@ -1065,10 +1065,10 @@ new_filter_cb(gpointer data, gpointer user_data)
 static void
 filter_new_bt_clicked_cb(GtkWidget *w, gpointer data)
 {
-    GtkWidget  *main_w = gtk_widget_get_toplevel(w);
-    GtkWidget  *name_te = g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY);
-    GtkWidget  *filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
-    GtkWidget  *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
+    GtkWidget  *main_w           = gtk_widget_get_toplevel(w);
+    GtkWidget  *name_te          = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY);
+    GtkWidget  *filter_te        = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
+    GtkWidget  *filter_l         = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
     filter_list_type_t list_type = *(filter_list_type_t *)data;
     GList      *fl_entry;
     const gchar *name, *strval;
@@ -1102,8 +1102,8 @@ static gboolean
 chg_list_item_cb(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
                  gpointer data)
 {
-    GList      *flp = data;
-    filter_def *filt = flp->data;
+    GList      *flp   = (GList *)data;
+    filter_def *filt  = (filter_def *)flp->data;
     GList      *nl_model;
 
     gtk_tree_model_get(model, iter, 1, &nl_model, -1);
@@ -1120,8 +1120,8 @@ chg_list_item_cb(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
 static void
 chg_filter_cb(gpointer data, gpointer user_data)
 {
-    GtkWidget  *main_w = data;
-    GtkWidget  *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
+    GtkWidget  *main_w   = (GtkWidget *)data;
+    GtkWidget  *filter_l = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
 
     gtk_tree_model_foreach(gtk_tree_view_get_model(GTK_TREE_VIEW(filter_l)),
                            chg_list_item_cb, user_data);
@@ -1130,10 +1130,10 @@ chg_filter_cb(gpointer data, gpointer user_data)
 static void
 filter_name_te_changed_cb(GtkWidget *w, gpointer data)
 {
-    GtkWidget  *main_w = gtk_widget_get_toplevel(w);
-    GtkWidget  *name_te = g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY);
-    GtkWidget  *filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
-    GtkWidget  *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
+    GtkWidget  *main_w    = gtk_widget_get_toplevel(w);
+    GtkWidget  *name_te   = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY);
+    GtkWidget  *filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
+    GtkWidget  *filter_l  = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
     filter_def *filt;
     GList      *fl_entry;
     filter_list_type_t  list_type = *(filter_list_type_t *)data;
@@ -1177,10 +1177,10 @@ filter_name_te_changed_cb(GtkWidget *w, gpointer data)
 static void
 delete_filter_cb(gpointer data, gpointer user_data)
 {
-    GtkWidget    *main_w = data;
-    GtkWidget    *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
-    gchar        *pos = (gchar *)user_data;
-    GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(filter_l));
+    GtkWidget    *main_w   = (GtkWidget *)data;
+    GtkWidget    *filter_l = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
+    gchar        *pos      = (gchar *)user_data;
+    GtkTreeModel *model    = gtk_tree_view_get_model(GTK_TREE_VIEW(filter_l));
     GtkTreeIter   iter;
 
     gtk_tree_model_get_iter_from_string(model, &iter, pos);
@@ -1190,8 +1190,8 @@ delete_filter_cb(gpointer data, gpointer user_data)
 static void
 filter_del_bt_clicked_cb(GtkWidget *w, gpointer data)
 {
-    GtkWidget  *main_w = gtk_widget_get_toplevel(w);
-    GtkWidget  *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
+    GtkWidget  *main_w           = gtk_widget_get_toplevel(w);
+    GtkWidget  *filter_l         = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY);
     filter_list_type_t list_type = *(filter_list_type_t *)data;
     GList      *fl_entry;
     gchar             *pos;
@@ -1225,7 +1225,7 @@ filter_add_expr_bt_cb(GtkWidget *w _U_, gpointer main_w_arg)
     GtkWidget  *main_w = GTK_WIDGET(main_w_arg);
     GtkWidget  *filter_te, *dfilter_w;
 
-    filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
+    filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
     dfilter_w = dfilter_expr_dlg_new(filter_te);
 
     /* If we're opening a series of modal dialogs (such as when going
diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c
index 4020ba3ee2..51053c8c08 100644
--- a/ui/gtk/filter_expression_save_dlg.c
+++ b/ui/gtk/filter_expression_save_dlg.c
@@ -123,7 +123,7 @@ filter_expression_reinit(int what)
 		fe = *pfilter_expression_head;
 		while (fe != NULL) {
 			if (fe->button != NULL) {
-				gtk_widget_destroy(fe->button);
+				gtk_widget_destroy((GtkWidget *)fe->button);
 				fe->button = NULL;
 			}
 			fe = fe->next;
@@ -196,7 +196,7 @@ filter_button_add(const char *label, const char *expr, struct filter_expression
 	gtk_widget_set_sensitive(GTK_WIDGET(fe->button), FALSE);
 	gtk_widget_show(GTK_WIDGET(fe->button));
 
-	gtk_toolbar_insert(GTK_TOOLBAR(_filter_tb), fe->button, -1);
+	gtk_toolbar_insert(GTK_TOOLBAR(_filter_tb), (GtkToolItem *)fe->button, -1);
 	gtk_widget_set_sensitive(GTK_WIDGET(fe->button), TRUE);
 	gtk_widget_set_tooltip_text(GTK_WIDGET(fe->button), fe->expression);
 
@@ -298,15 +298,15 @@ filter_expression_save_dlg(gpointer data)
 	gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
 	gtk_widget_show(bbox);
 
-	ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
+	ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
 	g_signal_connect(ok_bt, "clicked", G_CALLBACK(filter_save_ok_cb),
 	filter_save_frame_w);
 
-	cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+	cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
 	g_signal_connect(cancel_bt, "clicked", G_CALLBACK(filter_save_close_cb),
 	filter_save_frame_w);
 
-	help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+	help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
 	g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb),
 	(gpointer)HELP_FILTER_SAVE_DIALOG);
 
diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c
index b0c61a02dd..e5097bd2b8 100644
--- a/ui/gtk/find_dlg.c
+++ b/ui/gtk/find_dlg.c
@@ -325,13 +325,13 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
   gtk_widget_show(bbox);
 
-  ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_FIND);
+  ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_FIND);
   g_signal_connect(ok_bt, "clicked", G_CALLBACK(find_frame_ok_cb), find_frame_w);
 
-  cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+  cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
   g_signal_connect(cancel_bt, "clicked", G_CALLBACK(find_frame_close_cb), find_frame_w);
 
-  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
   g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FIND_DIALOG);
 
   /* Attach pointers to needed widgets to the capture prefs window/object */
diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
index 1ed70af33e..5f0301219f 100644
--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@@ -277,20 +277,20 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
     gtk_box_pack_start(GTK_BOX(vbox), button_hbox, FALSE, FALSE, 0);
 
     /* Create Copy Button */
-    button = g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_COPY);
+    button = (GtkWidget *)g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_COPY);
     g_signal_connect(button, "clicked", G_CALLBACK(firewall_copy_cmd_cb), rule_info);
 	gtk_widget_set_tooltip_text(button, "Copy rule to clipboard");
 
     /* Create Save Button */
-    button = g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_SAVE);
+    button = (GtkWidget *)g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_SAVE);
     g_signal_connect(button, "clicked", G_CALLBACK(firewall_save_as_cmd_cb), rule_info);
 	gtk_widget_set_tooltip_text(button, "Save the rule as currently displayed");
 
-    button = g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_CANCEL);
+    button = (GtkWidget *)g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_CANCEL);
 	gtk_widget_set_tooltip_text(button, "Cancel the dialog");
     window_set_cancel_button(rule_w, button, window_cancel_button_cb);
 
-    button = g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_HELP);
+    button = (GtkWidget *)g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_HELP);
     g_signal_connect(button, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FIREWALL_DIALOG);
 
     /* Tuck away the rule_info object into the window */
@@ -332,7 +332,7 @@ select_product(GtkWidget *w, gpointer data _U_)
     rule_type_t rule_type = RT_NONE;
     gboolean sensitive = FALSE;
 
-    rule_info = g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
+    rule_info =(rule_info_t	*)g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
 
     if (prod >= NUM_PRODS || !rule_info)
         return;
@@ -409,7 +409,7 @@ select_filter(GtkWidget *w, gpointer data _U_)
     rule_info_t	*rule_info;
     gpointer ptr;
 
-    rule_info = g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
+    rule_info = (rule_info_t *)g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
     if (!rule_info)
         return;
 
@@ -646,9 +646,9 @@ static void sf_netsh_ipv4_port(GString *rtxt, gchar *addr, guint32 port, port_ty
 static void
 firewall_destroy_cb(GtkWidget *w, gpointer data _U_)
 {
-    rule_info_t	*rule_info;
+    rule_info_t *rule_info;
 
-    rule_info = g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
+    rule_info = (rule_info_t *)g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
 #if 0
     forget_rule_info(rule_info);
 #endif
@@ -659,7 +659,7 @@ firewall_destroy_cb(GtkWidget *w, gpointer data _U_)
 static void
 firewall_copy_cmd_cb(GtkWidget *w _U_, gpointer data)
 {
-    rule_info_t	*rule_info = data;
+    rule_info_t	*rule_info = (rule_info_t *)data;
 
     GtkTextIter start, end;
     GtkTextBuffer *buf;
@@ -681,7 +681,7 @@ static void
 firewall_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
 {
     GtkWidget		*new_win;
-    rule_info_t	*rule_info = data;
+    rule_info_t	*rule_info = (rule_info_t *)data;
 
 #if 0  /* XXX: GtkFileChooserDialog/gtk_dialog_run currently being used is effectively modal so this is not req'd */
     if (rule_info->firewall_save_as_w != NULL) {
@@ -751,8 +751,8 @@ firewall_save_as_ok_cb(GtkWidget * w _U_, gpointer fs)
            directory, and leave the selection box displayed. */
         set_last_open_dir(to_name);
         g_free(to_name);
-        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; /* run the dialog again */
     }
 
@@ -787,7 +787,7 @@ firewall_save_as_ok_cb(GtkWidget * w _U_, gpointer fs)
 static void
 firewall_save_as_destroy_cb(GtkWidget * win _U_, gpointer data)
 {
-    rule_info_t	*rule_info = data;
+   rule_info_t	*rule_info = (rule_info_t *)data;
 
     /* Note that we no longer have a dialog box. */
     rule_info->firewall_save_as_w = NULL;
diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c
index 1f29b15676..14ffcf83ac 100644
--- a/ui/gtk/follow_ssl.c
+++ b/ui/gtk/follow_ssl.c
@@ -75,13 +75,13 @@ typedef struct {
 static int
 ssl_queue_packet_data(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *ssl)
 {
-    follow_info_t* follow_info = tapdata;
+    follow_info_t* follow_info = (follow_info_t*)tapdata;
     SslDecryptedRecord* rec;
     SslDataInfo* appl_data;
     gint total_len;
     guchar *p;
     int proto_ssl = GPOINTER_TO_INT(ssl);
-    SslPacketInfo* pi = p_get_proto_data(pinfo->fd, proto_ssl);
+    SslPacketInfo* pi = (SslPacketInfo*)p_get_proto_data(pinfo->fd, proto_ssl);
 
     /* skip packet without decrypted data payload*/
     if (!pi || !pi->appl_data)
@@ -96,7 +96,7 @@ ssl_queue_packet_data(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_
     } while (appl_data);
 
     /* compute packet direction */
-    rec = g_malloc(sizeof(SslDecryptedRecord) + total_len);
+    rec = (SslDecryptedRecord*)g_malloc(sizeof(SslDecryptedRecord) + total_len);
 
     if (follow_info->client_port == 0) {
         follow_info->client_port = pinfo->srcport;
@@ -175,7 +175,7 @@ follow_ssl_stream_cb(GtkWidget * w _U_, gpointer data _U_)
     }
 
     /* Set the display filter entry accordingly */
-	filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
+	filter_cm = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
 	filter_te = gtk_bin_get_child(GTK_BIN(filter_cm));
 
     /* needed in follow_filter_out_stream(), is there a better way? */
@@ -315,7 +315,7 @@ follow_read_ssl_stream(follow_info_t *follow_info,
     frs_return_t        frs_return;
 
     for (cur = follow_info->payload; cur; cur = g_list_next(cur)) {
-        SslDecryptedRecord* rec = cur->data;
+        SslDecryptedRecord* rec = (SslDecryptedRecord*)cur->data;
 	skip = FALSE;
 	if (!rec->is_server) {
 	    global_pos = &global_client_pos;
@@ -331,7 +331,7 @@ follow_read_ssl_stream(follow_info_t *follow_info,
 
         if (!skip) {
             size_t nchars = rec->data.data_len;
-            gchar *buffer = g_memdup(rec->data.data, (guint) nchars);
+            gchar *buffer = (gchar *)g_memdup(rec->data.data, (guint) nchars);
 
 	    frs_return = follow_show(follow_info, print_line_fcn_p, buffer, nchars,
 				     rec->is_server, arg, global_pos,
diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
index 3262f7d3a0..ff463602c9 100644
--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@@ -168,7 +168,7 @@ follow_tcp_stream_cb(GtkWidget * w _U_, gpointer data _U_)
 	}
 
 	/* Set the display filter entry accordingly */
-	filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
+	filter_cm = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
 	filter_te = gtk_bin_get_child(GTK_BIN(filter_cm));
 
 	/* needed in follow_filter_out_stream(), is there a better way? */
diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c
index fc131fdb2b..59d7b6ba81 100644
--- a/ui/gtk/follow_udp.c
+++ b/ui/gtk/follow_udp.c
@@ -49,10 +49,10 @@ udp_queue_packet_data(void *tapdata, packet_info *pinfo,
 		      epan_dissect_t *edt _U_, const void *data)
 {
 	follow_record_t *follow_record;
-	follow_info_t *follow_info = tapdata;
+	follow_info_t *follow_info = (follow_info_t *)tapdata;
 	tvbuff_t *next_tvb = (tvbuff_t *)data;
 
-	follow_record = g_malloc(sizeof(follow_record_t));
+	follow_record = g_new(follow_record_t,1);
 
 	follow_record->data = g_byte_array_sized_new(tvb_length(next_tvb));
 	follow_record->data = g_byte_array_append(follow_record->data,
@@ -123,7 +123,7 @@ follow_udp_stream_cb(GtkWidget *w _U_, gpointer data _U_)
 		}
 
 	/* Set the display filter entry accordingly */
-	filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
+	filter_cm = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
 	filter_te = gtk_bin_get_child(GTK_BIN(filter_cm));
 
 	/* needed in follow_filter_out_stream(), is there a better way? */
@@ -267,7 +267,7 @@ follow_read_udp_stream(follow_info_t *follow_info,
 
 
 	for (cur = follow_info->payload; cur; cur = g_list_next(cur)) {
-		follow_record = cur->data;
+		follow_record = (follow_record_t *)cur->data;
 		skip = FALSE;
 		if (!follow_record->is_server) {
 			global_pos = &global_client_pos;
@@ -282,7 +282,7 @@ follow_read_udp_stream(follow_info_t *follow_info,
 		}
 
 		if (!skip) {
-			buffer = g_memdup(follow_record->data->data,
+			buffer = (char *)g_memdup(follow_record->data->data,
 					  follow_record->data->len);
 
 			frs_return = follow_show(follow_info, print_line_fcn_p,
diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c
index 5f646af4c1..27c7607f55 100644
--- a/ui/gtk/goto_dlg.c
+++ b/ui/gtk/goto_dlg.c
@@ -78,13 +78,13 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
 
   gtk_widget_show(bbox);
 
-  ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_JUMP_TO);
+  ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_JUMP_TO);
   g_signal_connect(ok_bt, "clicked", G_CALLBACK(goto_frame_ok_cb), goto_frame_w);
 
-  cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+  cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
   window_set_cancel_button(goto_frame_w, cancel_bt, window_cancel_button_cb);
 
-  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
   g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_GOTO_DIALOG);
 
   gtk_widget_grab_default(ok_bt);