diff --git a/ChangeLog b/ChangeLog
index 7626c6fcfe..d7878a7d60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2006-04-04  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpcontainertreeview-dnd.c
+	(gimp_container_tree_view_drag_leave)
+	(gimp_container_tree_view_drag_motion): use the correct API to
+	unset the tree view's drop indicator. Apparently using the wrong
+	API has stopped working due to changes in GtkTreeView...
+
+2006-04-04  Michael Natterer  <mitch@gimp.org>
+
+	* app/pdb/Makefile.am
+	* app/pdb/gimpargument.[ch]: removed...
+
+	* app/pdb/gimp-pdb-compat.[ch]: ...and added with renamed functions.
+	Added gimp_pdb_compat_param_spec().
+
+	* app/pdb/gimpprocedure.[ch]: removed gimp_procedure_add_compat_arg()
+	and _add_compat_value(). Use gimp_pdb_compat_param_spec() plus
+	gimp_procedure_add_argument()/return_value() instead.
+
+	* app/pdb/procedural-db-query.c
+	* app/pdb/procedural_db.c
+	* app/plug-in/plug-in-message.c
+	* app/plug-in/plug-in-params.c
+	* app/plug-in/plug-in-rc.c
+	* tools/pdbgen/pdb/procedural_db.pdb: changed accordingly.
+
+	* app/xcf/xcf.c: no need to use compat functions here.
+
+	* app/pdb/procedural_db_cmds.c: regnerated.
+
 2006-04-04  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/gif.c (save_image): nicer progress update when
diff --git a/app/widgets/gimpcontainertreeview-dnd.c b/app/widgets/gimpcontainertreeview-dnd.c
index 639781eeae..690ab23071 100644
--- a/app/widgets/gimpcontainertreeview-dnd.c
+++ b/app/widgets/gimpcontainertreeview-dnd.c
@@ -218,7 +218,7 @@ gimp_container_tree_view_drag_leave (GtkWidget             *widget,
       tree_view->scroll_timeout_id = 0;
     }
 
-  gtk_tree_view_unset_rows_drag_dest (tree_view->view);
+  gtk_tree_view_set_drag_dest_row (tree_view->view, NULL, 0);
 }
 
 gboolean
@@ -276,7 +276,7 @@ gimp_container_tree_view_drag_motion (GtkWidget             *widget,
     }
   else
     {
-      gtk_tree_view_unset_rows_drag_dest (tree_view->view);
+      gtk_tree_view_set_drag_dest_row (tree_view->view, NULL, 0);
     }
 
   /*  always return TRUE so drag_leave() is called  */