at-spi r1123 - in trunk: . libspi registryd test

[cosimoc svn gnome org]

Author: cosimoc
Date: Mon Nov 10 17:47:19 2008
New Revision: 1123
URL: http://svn.gnome.org/viewvc/at-spi?rev=1123&view=rev

Log:
2008-11-10  Cosimo Cecchi  <cosimoc gnome org>

	* libspi/base.h:
	* libspi/keymasks.h:
	* libspi/spi-private.h:
	* libspi/util.c:
	* registryd/desktop.c:
	* registryd/deviceeventcontroller.c:
	* registryd/registry-main.c:
	* registryd/registry.h:
	* test/login-helper-server-test.c:
	Use single GLib/GTK+ includes.


Modified:
   trunk/ChangeLog
   trunk/libspi/base.h
   trunk/libspi/keymasks.h
   trunk/libspi/spi-private.h
   trunk/libspi/util.c
   trunk/registryd/desktop.c
   trunk/registryd/deviceeventcontroller.c
   trunk/registryd/registry-main.c
   trunk/registryd/registry.h
   trunk/test/login-helper-server-test.c

Modified: trunk/libspi/base.h
==============================================================================
--- trunk/libspi/base.h	(original)
+++ trunk/libspi/base.h	Mon Nov 10 17:47:19 2008
@@ -24,7 +24,7 @@
 #ifndef SPI_BASE_H_
 #define SPI_BASE_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <atk/atkobject.h>
 #include <bonobo/bonobo-object.h>
 #include <libspi/Accessibility.h>

Modified: trunk/libspi/keymasks.h
==============================================================================
--- trunk/libspi/keymasks.h	(original)
+++ trunk/libspi/keymasks.h	Mon Nov 10 17:47:19 2008
@@ -25,7 +25,7 @@
 #define _SPI_KEYMASKS_H_
 
 #include <X11/Xlib.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libspi/spi-private.h
==============================================================================
--- trunk/libspi/spi-private.h	(original)
+++ trunk/libspi/spi-private.h	Mon Nov 10 17:47:19 2008
@@ -24,7 +24,7 @@
 #ifndef SPI_PRIVATE_H_
 #define SPI_PRIVATE_H_
 
-#include <glib/glist.h>
+#include <glib.h>
 #include <atk/atk.h>
 #include <orbit/orbit.h>
 #include <Accessibility.h>

Modified: trunk/libspi/util.c
==============================================================================
--- trunk/libspi/util.c	(original)
+++ trunk/libspi/util.c	Mon Nov 10 17:47:19 2008
@@ -22,8 +22,7 @@
  */
 
 #include <config.h>
-#include <glib/gmessages.h>
-#include <glib/gslist.h>
+#include <glib.h>
 #include <Accessibility.h>
 
 #include "spi-private.h"

Modified: trunk/registryd/desktop.c
==============================================================================
--- trunk/registryd/desktop.c	(original)
+++ trunk/registryd/desktop.c	Mon Nov 10 17:47:19 2008
@@ -28,7 +28,7 @@
 #include <libbonobo.h>
 #include "desktop.h"
 #include <atk/atkcomponent.h>
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 /* SpiDesktop signals */

Modified: trunk/registryd/deviceeventcontroller.c
==============================================================================
--- trunk/registryd/deviceeventcontroller.c	(original)
+++ trunk/registryd/deviceeventcontroller.c	Mon Nov 10 17:47:19 2008
@@ -51,7 +51,6 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h> /* TODO: hide dependency (wrap in single porting file) */
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkwindow.h>
 
 #include "../libspi/spi-private.h"
 #include "deviceeventcontroller.h"

Modified: trunk/registryd/registry-main.c
==============================================================================
--- trunk/registryd/registry-main.c	(original)
+++ trunk/registryd/registry-main.c	Mon Nov 10 17:47:19 2008
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <gdk/gdkx.h>
 #include <libbonobo.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include "registry.h"
 
 #define spi_get_display() GDK_DISPLAY()

Modified: trunk/registryd/registry.h
==============================================================================
--- trunk/registryd/registry.h	(original)
+++ trunk/registryd/registry.h	Mon Nov 10 17:47:19 2008
@@ -24,7 +24,7 @@
 #ifndef SPI_REGISTRY_H_
 #define SPI_REGISTRY_H_
 
-#include <glib/gmain.h>
+#include <glib.h>
 #include <libspi/listener.h>
 
 typedef struct _SpiRegistry SpiRegistry;

Modified: trunk/test/login-helper-server-test.c
==============================================================================
--- trunk/test/login-helper-server-test.c	(original)
+++ trunk/test/login-helper-server-test.c	Mon Nov 10 17:47:19 2008
@@ -1,7 +1,6 @@
 #include <libbonobo.h>
 #include <login-helper/login-helper.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>