diff options
| author | Cody Russell <bratsche@gnome.org> | 2007-06-04 18:57:55 +0000 |
|---|---|---|
| committer | Cody Russell <bratsche@src.gnome.org> | 2007-06-04 18:57:55 +0000 |
| commit | 5a01ec8551c6c7324cc8ab76af9ca1da3174aa93 (patch) | |
| tree | 404405765732278ed5d3865edec53ff9557b9a21 | |
| parent | ee592b324792cdd78d570fe0f178c1bc3ee72af0 (diff) | |
| download | gtk+-5a01ec8551c6c7324cc8ab76af9ca1da3174aa93.tar.gz | |
gtk/gtklinkbutton.h Change function argument "link" to "link_" to fix
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)
svn path=/trunk/; revision=18033
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gtk/gtkaboutdialog.h | 2 | ||||
| -rw-r--r-- | gtk/gtklinkbutton.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,12 @@ 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 if down_button is NULL. This happens when the pathbar button for the current directory is too large to fit in the 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 |