diff -Npru screem-0.16.1/gdl/gdl-dock-bar.c screem-0.16.1.new/gdl/gdl-dock-bar.c
--- screem-0.16.1/gdl/gdl-dock-bar.c	2004-10-14 02:25:31.000000000 +0200
+++ screem-0.16.1.new/gdl/gdl-dock-bar.c	2007-08-16 21:27:38.000000000 +0200
@@ -62,7 +62,6 @@ static void  gdl_dock_bar_attach        
 struct _GdlDockBarPrivate {
     GdlDockMaster *master;
     GSList        *items;
-    GtkTooltips   *tooltips;
     GtkOrientation orientation;
 };
 
@@ -118,10 +117,7 @@ gdl_dock_bar_instance_init (GdlDockBar *
     dockbar->_priv = g_new0 (GdlDockBarPrivate, 1);
     dockbar->_priv->master = NULL;
     dockbar->_priv->items = NULL;
-    dockbar->_priv->tooltips = gtk_tooltips_new ();
     dockbar->_priv->orientation = GTK_ORIENTATION_VERTICAL;
-    g_object_ref (dockbar->_priv->tooltips);
-    gtk_object_sink (GTK_OBJECT (dockbar->_priv->tooltips));
 }
 
 static void
@@ -174,11 +170,6 @@ gdl_dock_bar_destroy (GtkObject *object)
             priv->master = NULL;
         }
 
-        if (priv->tooltips) {
-            g_object_unref (priv->tooltips);
-            priv->tooltips = NULL;
-        }
-        
         dockbar->_priv = NULL;
 
         g_free (priv);
@@ -271,7 +262,7 @@ gdl_dock_bar_add_item (GdlDockBar  *dock
     gtk_container_add (GTK_CONTAINER (button), image);
     gtk_box_pack_start (GTK_BOX (dockbar), button, FALSE, FALSE, 0);
 
-    gtk_tooltips_set_tip (priv->tooltips, button, name, name);
+    gtk_widget_set_tooltip_text (button, name);
     g_free (name);
 
     g_object_set_data (G_OBJECT (item), "GdlDockBar", dockbar);
diff -Npru screem-0.16.1/gdl/gdl-dock-item-grip.c screem-0.16.1.new/gdl/gdl-dock-item-grip.c
--- screem-0.16.1/gdl/gdl-dock-item-grip.c	2004-10-01 20:55:04.000000000 +0200
+++ screem-0.16.1.new/gdl/gdl-dock-item-grip.c	2007-08-16 21:25:46.000000000 +0200
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <glib-object.h>
 #include <gtk/gtkbutton.h>
-#include <gtk/gtktooltips.h>
 #include <gtk/gtkimage.h>
 #include "gdl-dock-item.h"
 #include "gdl-dock-item-grip.h"
@@ -34,7 +33,6 @@ enum {
 struct _GdlDockItemGripPrivate {
     GtkWidget   *close_button;
     GtkWidget   *iconify_button;
-    GtkTooltips *tooltips;
 
     gboolean     icon_pixbuf_valid;
     GdkPixbuf   *icon_pixbuf;
@@ -242,11 +240,6 @@ gdl_dock_item_grip_destroy (GtkObject *o
             priv->icon_pixbuf = NULL;
         }
 
-        if (priv->tooltips) {
-            g_object_unref (priv->tooltips);
-            priv->tooltips = NULL;
-        }
-
         if (grip->item)
             g_signal_handlers_disconnect_by_func (grip->item,
                                                   gdl_dock_item_grip_item_notify,
@@ -364,13 +357,10 @@ gdl_dock_item_grip_instance_init (GdlDoc
     g_signal_connect (G_OBJECT (grip->_priv->iconify_button), "clicked",
                       G_CALLBACK (gdl_dock_item_grip_iconify_clicked), grip);
 
-    grip->_priv->tooltips = gtk_tooltips_new ();
-    g_object_ref (grip->_priv->tooltips);
-    gtk_object_sink (GTK_OBJECT (grip->_priv->tooltips));
-    gtk_tooltips_set_tip (grip->_priv->tooltips, grip->_priv->iconify_button,
-                          _("Iconify"), _("Iconify this dock"));
-    gtk_tooltips_set_tip (grip->_priv->tooltips, grip->_priv->close_button,
-                          _("Close"), _("Close this dock"));
+    gtk_widget_set_tooltip_text (grip->_priv->iconify_button,
+                          _("Iconify this dock"));
+    gtk_widget_set_tooltip_text (grip->_priv->close_button,
+                          _("Close this dock"));
 }
 
 static void