metacity r4017 - in trunk: . src/core src/ui

[tthurman svn gnome org]

Author: tthurman
Date: Wed Nov 12 03:43:51 2008
New Revision: 4017
URL: http://svn.gnome.org/viewvc/metacity?rev=4017&view=rev

Log:
        Clean up #includes according to the GNOME Goal.
	Closes #560449.  Patch is 122467.
	* src/core/place.c:
	* src/ui/draw-workspace.h:
	* src/ui/gradient.h:
	* src/ui/metaaccellabel.c:
	* src/ui/metaaccellabel.h:
	* src/ui/preview-widget.c:
	* src/ui/preview-widget.h:
	* src/ui/resizepopup.c:
	* src/ui/theme.c:
	* src/ui/theme.h:
	* src/ui/themewidget.h:



Modified:
   trunk/ChangeLog
   trunk/src/core/place.c
   trunk/src/ui/draw-workspace.h
   trunk/src/ui/gradient.h
   trunk/src/ui/metaaccellabel.c
   trunk/src/ui/metaaccellabel.h
   trunk/src/ui/preview-widget.c
   trunk/src/ui/preview-widget.h
   trunk/src/ui/resizepopup.c
   trunk/src/ui/theme.c
   trunk/src/ui/theme.h
   trunk/src/ui/themewidget.h

Modified: trunk/src/core/place.c
==============================================================================
--- trunk/src/core/place.c	(original)
+++ trunk/src/core/place.c	Wed Nov 12 03:43:51 2008
@@ -29,7 +29,7 @@
 #include "place.h"
 #include "workspace.h"
 #include "prefs.h"
-#include <gdk/gdkregion.h>
+#include <gdk/gdk.h>
 #include <math.h>
 #include <stdlib.h>
 

Modified: trunk/src/ui/draw-workspace.h
==============================================================================
--- trunk/src/ui/draw-workspace.h	(original)
+++ trunk/src/ui/draw-workspace.h	Wed Nov 12 03:43:51 2008
@@ -28,9 +28,9 @@
 #ifndef WNCK_DRAW_WORKSPACE_H
 #define WNCK_DRAW_WORKSPACE_H
 
-#include <gdk/gdkdrawable.h>
+#include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef struct
 {

Modified: trunk/src/ui/gradient.h
==============================================================================
--- trunk/src/ui/gradient.h	(original)
+++ trunk/src/ui/gradient.h	Wed Nov 12 03:43:51 2008
@@ -25,7 +25,7 @@
 #define META_GRADIENT_H
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 typedef enum
 {

Modified: trunk/src/ui/metaaccellabel.c
==============================================================================
--- trunk/src/ui/metaaccellabel.c	(original)
+++ trunk/src/ui/metaaccellabel.c	Wed Nov 12 03:43:51 2008
@@ -33,8 +33,7 @@
 
 #include <config.h>
 #include "metaaccellabel.h"
-#include <gtk/gtkmain.h>
-#include <gtk/gtkaccelmap.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include "util.h"
 

Modified: trunk/src/ui/metaaccellabel.h
==============================================================================
--- trunk/src/ui/metaaccellabel.h	(original)
+++ trunk/src/ui/metaaccellabel.h	Wed Nov 12 03:43:51 2008
@@ -34,7 +34,7 @@
 #ifndef __META_ACCEL_LABEL_H__
 #define __META_ACCEL_LABEL_H__
 
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include "common.h"
 
 #ifdef __cplusplus

Modified: trunk/src/ui/preview-widget.c
==============================================================================
--- trunk/src/ui/preview-widget.c	(original)
+++ trunk/src/ui/preview-widget.c	Wed Nov 12 03:43:51 2008
@@ -25,7 +25,7 @@
 #define _XOPEN_SOURCE 600 /* for the maths routines over floats */
 
 #include <math.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include "preview-widget.h"
 
 static void     meta_preview_class_init    (MetaPreviewClass *klass);

Modified: trunk/src/ui/preview-widget.h
==============================================================================
--- trunk/src/ui/preview-widget.h	(original)
+++ trunk/src/ui/preview-widget.h	Wed Nov 12 03:43:51 2008
@@ -22,7 +22,7 @@
  */
 
 #include "theme.h"
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 #ifndef META_PREVIEW_WIDGET_H
 #define META_PREVIEW_WIDGET_H

Modified: trunk/src/ui/resizepopup.c
==============================================================================
--- trunk/src/ui/resizepopup.c	(original)
+++ trunk/src/ui/resizepopup.c	Wed Nov 12 03:43:51 2008
@@ -24,11 +24,7 @@
 #include <config.h>
 #include "resizepopup.h"
 #include "util.h"
-#include <gtk/gtkwindow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkmain.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 struct _MetaResizePopup
 {

Modified: trunk/src/ui/theme.c
==============================================================================
--- trunk/src/ui/theme.c	(original)
+++ trunk/src/ui/theme.c	Wed Nov 12 03:43:51 2008
@@ -57,9 +57,7 @@
 #include "theme-parser.h"
 #include "util.h"
 #include "gradient.h"
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>

Modified: trunk/src/ui/theme.h
==============================================================================
--- trunk/src/ui/theme.h	(original)
+++ trunk/src/ui/theme.h	Wed Nov 12 03:43:51 2008
@@ -27,7 +27,7 @@
 #include "boxes.h"
 #include "gradient.h"
 #include "common.h"
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
 
 typedef struct _MetaFrameStyle MetaFrameStyle;
 typedef struct _MetaFrameStyleSet MetaFrameStyleSet;

Modified: trunk/src/ui/themewidget.h
==============================================================================
--- trunk/src/ui/themewidget.h	(original)
+++ trunk/src/ui/themewidget.h	Wed Nov 12 03:43:51 2008
@@ -22,7 +22,7 @@
  */
 
 #include "theme.h"
-#include <gtk/gtkmisc.h>
+#include <gtk/gtk.h>
 
 #ifndef META_THEME_WIDGET_H
 #define META_THEME_WIDGET_H