From 6cb4ec86a954904114e1d6b4810cfd5c47bb861d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 2 Dec 2003 00:18:43 +0000 Subject: [PATCH] Remove duplicate declaration of gtk_icon_source_set_icon_name(). (#Jeff Tue Dec 2 01:01:54 2003 Matthias Clasen * gtk/gtkiconfactory.h: Remove duplicate declaration of gtk_icon_source_set_icon_name(). (#Jeff Franks, #128269) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkiconfactory.h | 2 -- 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f2b6b42a..ac6cee50d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 2 01:01:54 2003 Matthias Clasen + + * gtk/gtkiconfactory.h: Remove duplicate declaration of + gtk_icon_source_set_icon_name(). (#Jeff Franks, #128269) + 2003-12-01 Federico Mena Quintero Patch from Hans-Petter Jansson to align the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7f2b6b42a..ac6cee50d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Dec 2 01:01:54 2003 Matthias Clasen + + * gtk/gtkiconfactory.h: Remove duplicate declaration of + gtk_icon_source_set_icon_name(). (#Jeff Franks, #128269) + 2003-12-01 Federico Mena Quintero Patch from Hans-Petter Jansson to align the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7f2b6b42a..ac6cee50d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Dec 2 01:01:54 2003 Matthias Clasen + + * gtk/gtkiconfactory.h: Remove duplicate declaration of + gtk_icon_source_set_icon_name(). (#Jeff Franks, #128269) + 2003-12-01 Federico Mena Quintero Patch from Hans-Petter Jansson to align the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7f2b6b42a..ac6cee50d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Dec 2 01:01:54 2003 Matthias Clasen + + * gtk/gtkiconfactory.h: Remove duplicate declaration of + gtk_icon_source_set_icon_name(). (#Jeff Franks, #128269) + 2003-12-01 Federico Mena Quintero Patch from Hans-Petter Jansson to align the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7f2b6b42a..ac6cee50d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Dec 2 01:01:54 2003 Matthias Clasen + + * gtk/gtkiconfactory.h: Remove duplicate declaration of + gtk_icon_source_set_icon_name(). (#Jeff Franks, #128269) + 2003-12-01 Federico Mena Quintero Patch from Hans-Petter Jansson to align the diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index 51fed289f..200c0ad59 100644 --- a/gtk/gtkiconfactory.h +++ b/gtk/gtkiconfactory.h @@ -146,8 +146,6 @@ void gtk_icon_source_set_icon_name (GtkIconSource *so const gchar *icon_name); void gtk_icon_source_set_pixbuf (GtkIconSource *source, GdkPixbuf *pixbuf); -void gtk_icon_source_set_icon_name (GtkIconSource *source, - const gchar *icon_name); G_CONST_RETURN gchar* gtk_icon_source_get_filename (const GtkIconSource *source); G_CONST_RETURN gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source);