[libgail-gnome] [Goal] Clean up GLib and GTK+ includes (Fixes #563684)

[Luis Menina <lmenina src gnome org>]

commit d8c4089e147583da01bc123bc744f24ddee2ca3e
Author: Luis Menina <liberforce freeside fr>
Date:   Tue Jun 16 23:04:33 2009 +0200

    [Goal] Clean up GLib and GTK+ includes (Fixes #563684)
    
    Allows to compile with G_DISABLE_SINGLE_INCLUDES,
    GDK_PIXBUF_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES. This
    prepares for the GNOME 3.0 transition.

 gail-gnome/bonobo_plug_atk_object.h           |    2 +-
 gail-gnome/bonobo_plug_atk_object_factory.c   |    2 +-
 gail-gnome/bonobo_socket_atk_object.h         |    2 +-
 gail-gnome/bonobo_socket_atk_object_factory.c |    2 +-
 gail-gnome/gail-gnome-debug.h                 |    2 +-
 gail-gnome/panel-applet-atk-object-factory.c  |    2 +-
 gail-gnome/panel-applet-atk-object.h          |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gail-gnome/bonobo_plug_atk_object.h b/gail-gnome/bonobo_plug_atk_object.h
index 515b9b6..bf099e3 100644
--- a/gail-gnome/bonobo_plug_atk_object.h
+++ b/gail-gnome/bonobo_plug_atk_object.h
@@ -21,7 +21,7 @@
 #ifndef BONOBO_PLUG_ATK_OBJECT_H_
 #define BONOBO_PLUG_ATK_OBJECT_H_
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include <bonobo/bonobo-plug.h>
 
 G_BEGIN_DECLS
diff --git a/gail-gnome/bonobo_plug_atk_object_factory.c b/gail-gnome/bonobo_plug_atk_object_factory.c
index c47e29e..7db2d08 100644
--- a/gail-gnome/bonobo_plug_atk_object_factory.c
+++ b/gail-gnome/bonobo_plug_atk_object_factory.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libspi/Accessibility.h>
 #include "bonobo_plug_atk_object.h"
 #include "bonobo_plug_atk_object_factory.h"
diff --git a/gail-gnome/bonobo_socket_atk_object.h b/gail-gnome/bonobo_socket_atk_object.h
index f793f77..ba14976 100644
--- a/gail-gnome/bonobo_socket_atk_object.h
+++ b/gail-gnome/bonobo_socket_atk_object.h
@@ -21,7 +21,7 @@
 #ifndef BONOBO_SOCKET_ATK_OBJECT_H_
 #define BONOBO_SOCKET_ATK_OBJECT_H_
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include <bonobo/bonobo-socket.h>
 
 G_BEGIN_DECLS
diff --git a/gail-gnome/bonobo_socket_atk_object_factory.c b/gail-gnome/bonobo_socket_atk_object_factory.c
index a313cbd..dd697d7 100644
--- a/gail-gnome/bonobo_socket_atk_object_factory.c
+++ b/gail-gnome/bonobo_socket_atk_object_factory.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libspi/Accessibility.h>
 #include "bonobo_socket_atk_object.h"
 #include "bonobo_socket_atk_object_factory.h"
diff --git a/gail-gnome/gail-gnome-debug.h b/gail-gnome/gail-gnome-debug.h
index 97bb127..4c94b61 100644
--- a/gail-gnome/gail-gnome-debug.h
+++ b/gail-gnome/gail-gnome-debug.h
@@ -21,7 +21,7 @@
 #ifndef __GAIL_GNOME_DEBUG_H__
 #define __GAIL_GNOME_DEBUG_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/gail-gnome/panel-applet-atk-object-factory.c b/gail-gnome/panel-applet-atk-object-factory.c
index e5a848b..bb6b945 100644
--- a/gail-gnome/panel-applet-atk-object-factory.c
+++ b/gail-gnome/panel-applet-atk-object-factory.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <atk/atkobjectfactory.h>
 #include <libspi/Accessibility.h>
 #include "panel-applet-atk-object.h"
diff --git a/gail-gnome/panel-applet-atk-object.h b/gail-gnome/panel-applet-atk-object.h
index 2eb392a..4093ace 100644
--- a/gail-gnome/panel-applet-atk-object.h
+++ b/gail-gnome/panel-applet-atk-object.h
@@ -21,7 +21,7 @@
 #ifndef PANEL_APPLET_ATK_OBJECT_H_
 #define PANEL_APPLET_ATK_OBJECT_H_
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
 
 G_BEGIN_DECLS