fix compile warnings

Fallout from running make CFLAGS="-Werror"; mostly missing casts and
constness issues.

6 files changed, 14 insertions, 11 deletions

diff --git a/gtk/gtkactivatable.c b/gtk/gtkactivatable.c
index 8e1483726c..65c166b87e 100644
--- a/gtk/gtkactivatable.c
+++ b/gtk/gtkactivatable.c
@@ -449,7 +449,7 @@ gtk_activatable_do_set_related_action (GtkActivatable *activatable,
           /* Some apps are using the object data directly...
            * so continue to set it for a bit longer
            */
-          g_object_set_data (activatable, "gtk-action", NULL);
+          g_object_set_data (G_OBJECT (activatable), "gtk-action", NULL);
 
           /*
            * We don't want prev_action to be activated
@@ -478,7 +478,7 @@ gtk_activatable_do_set_related_action (GtkActivatable *activatable,
 
 	  _gtk_action_add_to_proxy_list (action, GTK_WIDGET (activatable));
 
-          g_object_set_data (activatable, "gtk-action", action);
+          g_object_set_data (G_OBJECT (activatable), "gtk-action", action);
 	}
     }
 }
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 96fcb7434f..8bbb4d24da 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -483,7 +483,7 @@ grab_dnd_keys (GtkWidget *widget,
   gdk_flush ();
   gdk_error_trap_pop ();
 
-  gdk_window_add_filter (NULL, root_key_filter, GDK_WINDOW_XID (window));
+  gdk_window_add_filter (NULL, root_key_filter, (gpointer) GDK_WINDOW_XID (window));
 }
 
 static void
@@ -497,7 +497,7 @@ ungrab_dnd_keys (GtkWidget *widget,
   window = widget->window;
   root = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
 
-  gdk_window_remove_filter (NULL, root_key_filter, GDK_WINDOW_XID (window));
+  gdk_window_remove_filter (NULL, root_key_filter, (gpointer) GDK_WINDOW_XID (window));
 
   gdk_error_trap_push ();
 
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 2215689567..46e9592bf2 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -1079,7 +1079,8 @@ gtk_handle_box_button_press (GtkWidget      *widget,
 	      gint root_x, root_y;
 	      gint width, height;
 
-              gtk_invisible_set_screen (GTK_INVISIBLE (invisible), gtk_widget_get_screen (hb));
+              gtk_invisible_set_screen (GTK_INVISIBLE (invisible),
+                                        gtk_widget_get_screen (GTK_WIDGET (hb)));
 	      gdk_window_get_deskrelative_origin (hb->bin_window, &desk_x, &desk_y);
 	      gdk_window_get_origin (hb->bin_window, &root_x, &root_y);
 	      gdk_drawable_get_size (hb->bin_window, &width, &height);
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 3a413f0ed2..afbc229222 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -9014,12 +9014,14 @@ gtk_icon_view_accessible_model_row_changed (GtkTreeModel *tree_model,
   GtkIconViewItem *item;
   GtkIconViewAccessible *a11y_view;
   GtkIconViewItemAccessible *a11y_item;
-  gchar *name, *text;
+  const gchar *name;
+  gchar *text;
 
   atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
   a11y_view = GTK_ICON_VIEW_ACCESSIBLE (atk_obj);
   index = gtk_tree_path_get_indices(path)[0];
-  a11y_item = gtk_icon_view_accessible_find_child (atk_obj, index);
+  a11y_item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (
+      gtk_icon_view_accessible_find_child (atk_obj, index));
 
   if (a11y_item)
     {
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index cfe1a141c6..068b2369a4 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10331,7 +10331,7 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
     return;
 
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (tree_view));
-  screen = gtk_widget_get_screen (tree_view);
+  screen = gtk_widget_get_screen (GTK_WIDGET (tree_view));
 
    if (tree_view->priv->search_window != NULL)
      {
diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c
index 224660d43e..f5a85ac4fa 100644
--- a/gtk/tests/builder.c
+++ b/gtk/tests/builder.c
@@ -2518,17 +2518,17 @@ test_message_area (void)
     "</interface>";
 
   error = NULL;
-  builder = builder_new_from_string (buffer, -1, &error);
+  builder = builder_new_from_string (buffer, -1, NULL);
   g_assert (error == NULL);
   obj = gtk_builder_get_object (builder, "infobar1");
   g_assert (GTK_IS_INFO_BAR (obj));
   obj1 = gtk_builder_get_object (builder, "content");
   g_assert (GTK_IS_LABEL (obj1));
-  g_assert (gtk_widget_get_parent (gtk_widget_get_parent (obj1)) == obj);
+  g_assert (gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (obj1))) == GTK_WIDGET (obj));
 
   obj1 = gtk_builder_get_object (builder, "button_ok");
   g_assert (GTK_IS_BUTTON (obj1));
-  g_assert (gtk_widget_get_parent (gtk_widget_get_parent (obj1)) == obj);
+  g_assert (gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (obj1))) == GTK_WIDGET (obj));
 
   g_object_unref (builder);
 }