diff --git a/ChangeLog b/ChangeLog
index 465f0da841..3f207ad26b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-06  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktooltip.c (find_topmost_widget_coords_from_event):
+	remove unused get of has_tooltip.
+
+	* tests/testtooltips.c (query_tooltip_tree_view_cb): use the
+	portable g_snprintf instead of snprintf.
+
 2007-02-06  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtktooltip.c (gtk_tooltip_finalize): chain up.
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 17c3f242d9..047cdd877f 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -500,7 +500,6 @@ find_topmost_widget_coords_from_event (GdkEvent *event,
   gdouble dx, dy;
   GtkWidget *tmp;
   GtkWidget *orig;
-  gboolean has_tooltip;
 
   gdk_event_get_coords (event, &dx, &dy);
   tx = dx;
@@ -508,8 +507,6 @@ find_topmost_widget_coords_from_event (GdkEvent *event,
 
   orig = tmp = find_widget_under_pointer (event->any.window, &tx, &ty);
 
-  g_object_get (tmp, "has-tooltip", &has_tooltip, NULL);
-
   if (tmp && (x != NULL || y != NULL))
     {
       if (tmp != orig)
diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 8def5111b7..f0a062e763 100644
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -115,7 +115,7 @@ query_tooltip_tree_view_cb (GtkWidget  *widget,
   gtk_tree_model_get (model, &iter, 0, &tmp, -1);
   pathstring = gtk_tree_path_to_string (path);
 
-  snprintf (buffer, 511, "<b>Path %s:</b> %s", pathstring, tmp);
+  g_snprintf (buffer, 511, "<b>Path %s:</b> %s", pathstring, tmp);
   gtk_tooltip_set_markup (tooltip, buffer);
 
   gtk_tree_path_free (path);