From e247caad786c090e5e7050843f614c34133cbd90 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 1 Feb 2003 00:34:52 +0000 Subject: [PATCH] Use GDK_MULTIHEAD_SAFE like all other gtk headers. 2003-02-01 Matthias Clasen * gtk/gtkiconfactory.h: Use GDK_MULTIHEAD_SAFE like all other gtk headers. --- 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 | 4 ++-- 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e0b5a2ff7..3d763a54e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-02-01 Matthias Clasen + + * gtk/gtkiconfactory.h: Use GDK_MULTIHEAD_SAFE like all other gtk + headers. Sorry about gtk_selection_clear, Yosh. + Thu Jan 30 17:16:05 2003 Manish Singh * gtk/gtkselection.h: declare gtk_selection_clear in GTK_COMPILATION diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4e0b5a2ff7..3d763a54e4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-02-01 Matthias Clasen + + * gtk/gtkiconfactory.h: Use GDK_MULTIHEAD_SAFE like all other gtk + headers. Sorry about gtk_selection_clear, Yosh. + Thu Jan 30 17:16:05 2003 Manish Singh * gtk/gtkselection.h: declare gtk_selection_clear in GTK_COMPILATION diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4e0b5a2ff7..3d763a54e4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-02-01 Matthias Clasen + + * gtk/gtkiconfactory.h: Use GDK_MULTIHEAD_SAFE like all other gtk + headers. Sorry about gtk_selection_clear, Yosh. + Thu Jan 30 17:16:05 2003 Manish Singh * gtk/gtkselection.h: declare gtk_selection_clear in GTK_COMPILATION diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4e0b5a2ff7..3d763a54e4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-02-01 Matthias Clasen + + * gtk/gtkiconfactory.h: Use GDK_MULTIHEAD_SAFE like all other gtk + headers. Sorry about gtk_selection_clear, Yosh. + Thu Jan 30 17:16:05 2003 Manish Singh * gtk/gtkselection.h: declare gtk_selection_clear in GTK_COMPILATION diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4e0b5a2ff7..3d763a54e4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-02-01 Matthias Clasen + + * gtk/gtkiconfactory.h: Use GDK_MULTIHEAD_SAFE like all other gtk + headers. Sorry about gtk_selection_clear, Yosh. + Thu Jan 30 17:16:05 2003 Manish Singh * gtk/gtkselection.h: declare gtk_selection_clear in GTK_COMPILATION diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index dda09002c3..91ebdf6810 100644 --- a/gtk/gtkiconfactory.h +++ b/gtk/gtkiconfactory.h @@ -88,11 +88,11 @@ GtkIconSet* gtk_icon_factory_lookup_default (const gchar *stock_id); * size from the rendered pixbuf, not from here. */ -#ifndef GTK_MULTIHEAD_SAFE +#ifndef GDK_MULTIHEAD_SAFE gboolean gtk_icon_size_lookup (GtkIconSize size, gint *width, gint *height); -#endif /* GTK_MULTIHEAD_SAFE */ +#endif /* GDK_MULTIHEAD_SAFE */ gboolean gtk_icon_size_lookup_for_settings (GtkSettings *settings, GtkIconSize size, gint *width,