summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorThomas James Alexander Thurman <tthurman@src.gnome.org>2008-11-12 03:43:51 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-11-12 03:43:51 +0000
commit39e389cc5b2fb1931f552c007e978bd5b7b01716 (patch)
tree4c26eca4fbbcd75d2a6861b0fe56ab1008b5f407 /src/ui
parentd079ef538cba10c20bd7f3ef02875a1fa3802d57 (diff)
downloadmetacity-39e389cc5b2fb1931f552c007e978bd5b7b01716.tar.gz
metacity-39e389cc5b2fb1931f552c007e978bd5b7b01716.tar.bz2
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: svn path=/trunk/; revision=4017
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/draw-workspace.h4
-rw-r--r--src/ui/gradient.h2
-rw-r--r--src/ui/metaaccellabel.c3
-rw-r--r--src/ui/metaaccellabel.h2
-rw-r--r--src/ui/preview-widget.c2
-rw-r--r--src/ui/preview-widget.h2
-rw-r--r--src/ui/resizepopup.c6
-rw-r--r--src/ui/theme.c4
-rw-r--r--src/ui/theme.h2
-rw-r--r--src/ui/themewidget.h2
10 files changed, 11 insertions, 18 deletions
diff --git a/src/ui/draw-workspace.h b/src/ui/draw-workspace.h
index de60550..10018aa 100644
--- a/src/ui/draw-workspace.h
+++ b/src/ui/draw-workspace.h
@@ -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
{
diff --git a/src/ui/gradient.h b/src/ui/gradient.h
index 58d6d40..16b3985 100644
--- a/src/ui/gradient.h
+++ b/src/ui/gradient.h
@@ -25,7 +25,7 @@
#define META_GRADIENT_H
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
typedef enum
{
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
index cdc8636..d523304 100644
--- a/src/ui/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
@@ -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"
diff --git a/src/ui/metaaccellabel.h b/src/ui/metaaccellabel.h
index 2282327..4fb8ed5 100644
--- a/src/ui/metaaccellabel.h
+++ b/src/ui/metaaccellabel.h
@@ -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
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index 23504f9..e098baa 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -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);
diff --git a/src/ui/preview-widget.h b/src/ui/preview-widget.h
index 32b3c48..ab6a8f9 100644
--- a/src/ui/preview-widget.h
+++ b/src/ui/preview-widget.h
@@ -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
diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
index 79736fa..cca4708 100644
--- a/src/ui/resizepopup.c
+++ b/src/ui/resizepopup.c
@@ -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
{
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 85d20e5..6343fd4 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -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>
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 2d48b08..2fc1283 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -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;
diff --git a/src/ui/themewidget.h b/src/ui/themewidget.h
index 5f044ce..1568aa8 100644
--- a/src/ui/themewidget.h
+++ b/src/ui/themewidget.h
@@ -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