Index: gtkpathbar.c
===================================================================
--- gtkpathbar.c	(revisjon 19731)
+++ gtkpathbar.c	(arbeidskopi)
@@ -1773,8 +1773,6 @@
   home = g_get_home_dir ();
   if (home != NULL)
     {
-      gchar *freeme = NULL;
-
       path_bar->home_path = gtk_file_system_filename_to_path (path_bar->file_system, home);
       /* FIXME: Need file system backend specific way of getting the
        * Desktop path.
Index: gtkstyle.c
===================================================================
--- gtkstyle.c	(revisjon 19731)
+++ gtkstyle.c	(arbeidskopi)
@@ -590,7 +590,7 @@
   if (style->styles)
     {
       if (style->styles->data != style)
-        g_slist_remove (style->styles, style);
+        style->styles = g_slist_remove (style->styles, style);
       else
         {
           GSList *tmp_list = style->styles->next;
Index: gtkcolorsel.c
===================================================================
--- gtkcolorsel.c	(revisjon 19731)
+++ gtkcolorsel.c	(arbeidskopi)
@@ -1628,7 +1628,6 @@
 {
   GtkWidget *label;
   GtkAdjustment *adjust;
-  ColorSelectionPrivate *priv = colorsel->private_data;
   
   if (channel_type == COLORSEL_HUE)
     {
Index: gtkbuilder.c
===================================================================
--- gtkbuilder.c	(revisjon 19731)
+++ gtkbuilder.c	(arbeidskopi)
@@ -1333,8 +1333,8 @@
   gunichar ch;
   gboolean eos;
 
-  g_return_val_if_fail (G_TYPE_IS_FLAGS (type), 0);
-  g_return_val_if_fail (string != 0, 0);
+  g_return_val_if_fail (G_TYPE_IS_FLAGS (type), FALSE);
+  g_return_val_if_fail (string != NULL, FALSE);
 
   ret = TRUE;
   
Index: gtkdialog.c
===================================================================
--- gtkdialog.c	(revisjon 19731)
+++ gtkdialog.c	(arbeidskopi)
@@ -1320,7 +1320,7 @@
     attributes_text_element,
   };
 
-gboolean
+static gboolean
 gtk_dialog_buildable_custom_tag_start (GtkBuildable  *buildable,
 				       GtkBuilder    *builder,
 				       GObject       *child,
Index: gtktreestore.c
===================================================================
--- gtktreestore.c	(revisjon 19731)
+++ gtktreestore.c	(arbeidskopi)
@@ -3236,7 +3236,6 @@
 			gpointer             user_data,
 			GError             **error)
 {
-  guint i;
   GSListSubParserData *data = (GSListSubParserData*)user_data;
 
   g_assert(data->builder);
Index: gtktreemodelsort.c
===================================================================
--- gtktreemodelsort.c	(revisjon 19731)
+++ gtktreemodelsort.c	(arbeidskopi)
@@ -901,7 +901,7 @@
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
 
-  if (tree_model_sort->child_model == 0)
+  if (tree_model_sort->child_model == NULL)
     return 0;
 
   return gtk_tree_model_get_n_columns (tree_model_sort->child_model);
Index: gtkfilechooserdefault.c
===================================================================
--- gtkfilechooserdefault.c	(revisjon 19731)
+++ gtkfilechooserdefault.c	(arbeidskopi)
@@ -4200,7 +4200,7 @@
 
   if ((data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
        data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) &&
-      data->uris[1] == 0 && !error &&
+      data->uris[1] == NULL && !error &&
       gtk_file_info_get_is_folder (info))
     change_folder_and_display_error (data->impl, data->path, FALSE);
   else
Index: gtktreeview.c
===================================================================
--- gtktreeview.c	(revisjon 19731)
+++ gtktreeview.c	(arbeidskopi)
@@ -345,15 +345,6 @@
 							      GtkTreeIter       *iter,
 							      gint               depth,
 							      gboolean           recurse);
-static gboolean gtk_tree_view_discover_dirty_iter            (GtkTreeView       *tree_view,
-							      GtkTreeIter       *iter,
-							      gint               depth,
-							      gint              *height,
-							      GtkRBNode         *node);
-static void     gtk_tree_view_discover_dirty                 (GtkTreeView       *tree_view,
-							      GtkRBTree         *tree,
-							      GtkTreeIter       *iter,
-							      gint               depth);
 static void     gtk_tree_view_clamp_node_visible             (GtkTreeView       *tree_view,
 							      GtkRBTree         *tree,
 							      GtkRBNode         *node);
@@ -8772,133 +8763,6 @@
     gtk_tree_path_free (path);
 }
 
-/* If height is non-NULL, then we set it to be the new height.  if it's all
- * dirty, then height is -1.  We know we'll remeasure dirty rows, anyways.
- */
-static gboolean
-gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view,
-				   GtkTreeIter *iter,
-				   gint         depth,
-				   gint        *height,
-				   GtkRBNode   *node)
-{
-  GtkTreeViewColumn *column;
-  GList *list;
-  gboolean retval = FALSE;
-  gint tmpheight;
-  gint horizontal_separator;
-
-  gtk_widget_style_get (GTK_WIDGET (tree_view),
-			"horizontal-separator", &horizontal_separator,
-			NULL);
-
-  if (height)
-    *height = -1;
-
-  for (list = tree_view->priv->columns; list; list = list->next)
-    {
-      gint width;
-      column = list->data;
-      if (column->dirty == TRUE)
-	continue;
-      if (height == NULL && column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
-	continue;
-      if (!column->visible)
-	continue;
-
-      gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter,
-					       GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
-					       node->children?TRUE:FALSE);
-
-      if (height)
-	{
-	  gtk_tree_view_column_cell_get_size (column,
-					      NULL, NULL, NULL,
-					      &width, &tmpheight);
-	  *height = MAX (*height, tmpheight);
-	}
-      else
-	{
-	  gtk_tree_view_column_cell_get_size (column,
-					      NULL, NULL, NULL,
-					      &width, NULL);
-	}
-
-      if (gtk_tree_view_is_expander_column (tree_view, column))
-	{
-	  int tmp = 0;
-
-	  tmp = horizontal_separator + width + (depth - 1) * tree_view->priv->level_indentation;
-	  if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
-	    tmp += depth * tree_view->priv->expander_size;
-
-	  if (tmp > column->requested_width)
-	    {
-	      _gtk_tree_view_column_cell_set_dirty (column, TRUE);
-	      retval = TRUE;
-	    }
-	}
-      else
-	{
-	  if (horizontal_separator + width > column->requested_width)
-	    {
-	      _gtk_tree_view_column_cell_set_dirty (column, TRUE);
-	      retval = TRUE;
-	    }
-	}
-    }
-
-  return retval;
-}
-
-static void
-gtk_tree_view_discover_dirty (GtkTreeView *tree_view,
-			      GtkRBTree   *tree,
-			      GtkTreeIter *iter,
-			      gint         depth)
-{
-  GtkRBNode *temp = tree->root;
-  GtkTreeViewColumn *column;
-  GList *list;
-  GtkTreeIter child;
-  gboolean is_all_dirty;
-
-  TREE_VIEW_INTERNAL_ASSERT_VOID (tree != NULL);
-
-  while (temp->left != tree->nil)
-    temp = temp->left;
-
-  do
-    {
-      TREE_VIEW_INTERNAL_ASSERT_VOID (temp != NULL);
-      is_all_dirty = TRUE;
-      for (list = tree_view->priv->columns; list; list = list->next)
-	{
-	  column = list->data;
-	  if (column->dirty == FALSE)
-	    {
-	      is_all_dirty = FALSE;
-	      break;
-	    }
-	}
-
-      if (is_all_dirty)
-	return;
-
-      gtk_tree_view_discover_dirty_iter (tree_view,
-					 iter,
-					 depth,
-					 NULL,
-					 temp);
-      if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter) &&
-	  temp->children != NULL)
-	gtk_tree_view_discover_dirty (tree_view, temp->children, &child, depth + 1);
-      temp = _gtk_rbtree_next (tree, temp);
-    }
-  while (gtk_tree_model_iter_next (tree_view->priv->model, iter));
-}
-
-
 /* Make sure the node is visible vertically */
 static void
 gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view,
Index: gtktrayicon-x11.c
===================================================================
--- gtktrayicon-x11.c	(revisjon 19731)
+++ gtktrayicon-x11.c	(arbeidskopi)
@@ -140,7 +140,7 @@
 		      GdkEventExpose *event)
 {
   GtkWidget *focus_child;
-  gint border_width, x, y, width, height;
+  gint x, y, width, height;
   gboolean retval = FALSE;
 
   gdk_window_clear_area (widget->window, event->area.x, event->area.y,
@@ -154,6 +154,8 @@
     {
       width  = widget->allocation.width;
       height = widget->allocation.height;
+      x      = widget->allocation.x;
+      y      = widget->allocation.y;
 
       gtk_paint_focus (widget->style, widget->window,
                        GTK_WIDGET_STATE (widget),
@@ -405,8 +407,6 @@
 gtk_tray_icon_delete (GtkWidget   *widget,
 		      GdkEventAny *event)
 {
-  GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
-
   GTK_NOTE (PLUGSOCKET,
 	    g_print ("GtkStatusIcon %p: delete notify, tray manager window %lx\n",
 	    	     icon, (gulong) icon->priv->manager_window));
Index: gtkentry.c
===================================================================
--- gtkentry.c	(revisjon 19731)
+++ gtkentry.c	(arbeidskopi)
@@ -1858,14 +1858,6 @@
   return text;
 }
 
-static void
-drag_begin_cb (GtkWidget      *widget,
-               GdkDragContext *context,
-               gpointer        data)
-{
-  g_signal_handlers_disconnect_by_func (widget, drag_begin_cb, NULL);
-}
-
 static gint
 gtk_entry_motion_notify (GtkWidget      *widget,
 			 GdkEventMotion *event)
Index: gtkuimanager.c
===================================================================
--- gtkuimanager.c	(revisjon 19731)
+++ gtkuimanager.c	(arbeidskopi)
@@ -467,7 +467,7 @@
     return;
   
   group = gtk_ui_manager_get_accel_group (uimgr);
-  groups = gtk_accel_groups_from_object (toplevel);
+  groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
   if (g_slist_find (groups, group) == NULL)
     gtk_window_add_accel_group (GTK_WINDOW (toplevel), group);
 
Index: gtktoolbar.c
===================================================================
--- gtktoolbar.c	(revisjon 19731)
+++ gtktoolbar.c	(arbeidskopi)
@@ -1126,7 +1126,7 @@
     {
       ToolbarContent *content = list->data;
       ItemState state;
-      GtkAllocation goal_allocation;
+      GtkAllocation goal_allocation = { 0, };
       GtkAllocation allocation;
       gboolean cont;
 
@@ -1736,7 +1736,7 @@
 	{
 	  GtkAllocation alloc;
 	  GtkAllocation start_allocation = { 0, };
-	  GtkAllocation goal_allocation;
+	  GtkAllocation goal_allocation = { 0, };
 
 	  if (priv->is_sliding)
 	    {
Index: xdgmime/xdgmimecache.c
===================================================================
--- xdgmime/xdgmimecache.c	(revisjon 19731)
+++ xdgmime/xdgmimecache.c	(arbeidskopi)
@@ -885,7 +885,7 @@
 	    }
 	}
     }
-  all_parents[p++] = 0;
+  all_parents[p++] = NULL;
   
   result = (char **) malloc (p * sizeof (char *));
   memcpy (result, all_parents, p * sizeof (char *));
