diff options
| author | Cody Russell <bratsche@gnome.org> | 2007-06-04 18:59:42 +0000 |
|---|---|---|
| committer | Cody Russell <bratsche@src.gnome.org> | 2007-06-04 18:59:42 +0000 |
| commit | 0655665d42c3b72125550f083732108d5a5e5811 (patch) | |
| tree | 2c766592311b836c96288a19125a9b6905054b11 | |
| parent | 484d13e3132ed45e729df49c813a1b88b0c14852 (diff) | |
| download | gdk-pixbuf-0655665d42c3b72125550f083732108d5a5e5811.tar.gz | |
Merge from trunk:
2007-06-04 Cody Russell <bratsche@gnome.org>
Merge from trunk:
* gtk/gtklinkbutton.h
* gtk/gtkaboutdialog.h: Change function argument "link"
to "link_" to fix warnings for applications compiling
with -Wshadow. (#379213)
svn path=/branches/gtk-2-10/; revision=18034
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gtk/gtkaboutdialog.h | 2 | ||||
| -rw-r--r-- | gtk/gtklinkbutton.h | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -2,6 +2,15 @@ Merge from trunk: + * 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> + + Merge from trunk: + * 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 f9337e609..e60878a8f 100644 --- a/gtk/gtkaboutdialog.h +++ b/gtk/gtkaboutdialog.h @@ -110,7 +110,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 92b48512e..24e79b460 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 |