diff --git a/ChangeLog b/ChangeLog
index 33d1854238..2e2055a7bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-04  Cody Russell  <bratsche@gnome.org>
+
+	* gtk/gtklinkbutton.h
+	* gtk/gtkaboutdialog.h: Change function argument "link"
+	to "link_" to fix warnings for applications compiling
+	with -Wshadow. (#379213)
+
 2007-06-04  Cody Russell  <bratsche@gnome.org>
 
 	* gtk/gtkpathbar.c (gtk_path_bar_scroll_down): Check
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 29555b8d34..b77e658c19 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -115,7 +115,7 @@ void                   gtk_about_dialog_set_logo_icon_name     (GtkAboutDialog
 								const gchar     *icon_name);
 
 typedef void (* GtkAboutDialogActivateLinkFunc) (GtkAboutDialog *about,
-						 const gchar    *link,
+						 const gchar    *link_,
 						 gpointer        data);
 
 GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func,
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 92b48512e0..24e79b460c 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -42,7 +42,7 @@ typedef struct _GtkLinkButtonClass	GtkLinkButtonClass;
 typedef struct _GtkLinkButtonPrivate	GtkLinkButtonPrivate;
 
 typedef void (*GtkLinkButtonUriFunc) (GtkLinkButton *button,
-				      const gchar   *link,
+				      const gchar   *link_,
 				      gpointer       user_data);
 
 struct _GtkLinkButton