From 86f27564bd952386b2271dcc8de78a849e66fc73 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 17 Jun 2008 09:58:09 +0000 Subject: [PATCH] #undef GTK_DISABLE_DEPRECATED, clean up includes a bit. 2008-06-17 Michael Natterer * gtk/gtktestutils.c: #undef GTK_DISABLE_DEPRECATED, clean up includes a bit. * gtk/gtkuimanager.c: #include "gtkwindow.h", it was only pulled in via deprecated headers. svn path=/trunk/; revision=20416 --- ChangeLog | 8 ++++++++ gtk/gtktestutils.c | 4 +++- gtk/gtkuimanager.c | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 601a3569b4..6731e8761f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-17 Michael Natterer + + * gtk/gtktestutils.c: #undef GTK_DISABLE_DEPRECATED, clean up + includes a bit. + + * gtk/gtkuimanager.c: #include "gtkwindow.h", it was only pulled + in via deprecated headers. + 2008-06-16 Matthias Clasen Bug 508751 – gnome-terminal crashed with SIGSEGV after keypress diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c index 10ffe48421..2895f7c7b3 100644 --- a/gtk/gtktestutils.c +++ b/gtk/gtktestutils.c @@ -20,8 +20,10 @@ /* need to get the prototypes of all get_type functions */ #define GTK_ENABLE_BROKEN +#undef GTK_DISABLE_DEPRECATED + +#include -#include "gtktestutils.h" #include #include "gtkalias.h" diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 8ba5f1617a..b0d48a848f 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -43,6 +43,7 @@ #include "gtktearoffmenuitem.h" #include "gtktoolbar.h" #include "gtkuimanager.h" +#include "gtkwindow.h" #include "gtkprivate.h" #include "gtkalias.h"