gnome-settings-daemon r630 - in trunk: . plugins/a11y-keyboard plugins/common plugins/mouse

[jensg svn gnome org]

Author: jensg
Date: Tue Dec  9 19:39:27 2008
New Revision: 630
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=630&view=rev

Log:
2008-12-09  Jens Granseuer  <jensgr gmx net>

	Patch by: Pedro Fragoso <ember ubuntu com>

	* plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h:
	* plugins/common/eggaccelerators.c:
	* plugins/common/eggaccelerators.h:
	* plugins/mouse/gsd-locate-pointer.h: only use top-level headers for
	glib and GTK+ (bug #563796)


Modified:
   trunk/ChangeLog
   trunk/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h
   trunk/plugins/common/eggaccelerators.c
   trunk/plugins/common/eggaccelerators.h
   trunk/plugins/mouse/gsd-locate-pointer.h

Modified: trunk/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h
==============================================================================
--- trunk/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h	(original)
+++ trunk/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h	Tue Dec  9 19:39:27 2008
@@ -22,7 +22,7 @@
 #define __GSD_A11Y_PREFERENCES_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/plugins/common/eggaccelerators.c
==============================================================================
--- trunk/plugins/common/eggaccelerators.c	(original)
+++ trunk/plugins/common/eggaccelerators.c	Tue Dec  9 19:39:27 2008
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 
 enum
 {

Modified: trunk/plugins/common/eggaccelerators.h
==============================================================================
--- trunk/plugins/common/eggaccelerators.h	(original)
+++ trunk/plugins/common/eggaccelerators.h	Tue Dec  9 19:39:27 2008
@@ -21,7 +21,7 @@
 #ifndef __EGG_ACCELERATORS_H__
 #define __EGG_ACCELERATORS_H__
 
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS

Modified: trunk/plugins/mouse/gsd-locate-pointer.h
==============================================================================
--- trunk/plugins/mouse/gsd-locate-pointer.h	(original)
+++ trunk/plugins/mouse/gsd-locate-pointer.h	Tue Dec  9 19:39:27 2008
@@ -17,7 +17,7 @@
 #ifndef LOCATE_POINTER_H
 #define LOCATE_POINTER_H
 
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 
 void gsd_locate_pointer (GdkScreen *screen);