From e187961d72d07f66a2b71c9f0967c841c7dc96b5 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Sat, 5 Mar 2011 10:49:24 -0500
Subject: [PATCH] src: update for mutter include reorganization

https://bugzilla.gnome.org/show_bug.cgi?id=641724
---
 src/gnome-shell-plugin.c   | 12 +++++-----
 src/main.c                 |  6 ++---
 src/shell-app-system.c     |  2 +-
 src/shell-app-system.h     |  2 +-
 src/shell-app-usage.c      |  7 +++---
 src/shell-app.c            | 16 +++++++-------
 src/shell-app.h            |  3 +--
 src/shell-global.c         | 45 +++++++++++++++++++-------------------
 src/shell-global.h         |  3 +--
 src/shell-tray-manager.c   |  6 ++---
 src/shell-window-tracker.c |  9 ++++----
 src/shell-window-tracker.h |  2 +-
 src/shell-wm.c             |  4 ++--
 src/shell-wm.h             |  2 +-
 14 files changed, 56 insertions(+), 63 deletions(-)

diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index d634391cb..8bf7441be 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -25,18 +25,16 @@
 
 #include "config.h"
 
-#include <meta-plugin.h>
-
-#include <clutter/clutter.h>
-#include <clutter/x11/clutter-x11.h>
-#include <gjs/gjs.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <clutter/clutter.h>
+#include <clutter/x11/clutter-x11.h>
 #include <GL/glx.h>
 #include <GL/glxext.h>
-
-#include "display.h"
+#include <gjs/gjs.h>
+#include <meta/display.h>
+#include <meta/meta-plugin.h>
 
 #include "shell-global-private.h"
 #include "shell-perf-log.h"
diff --git a/src/main.c b/src/main.c
index 91cd96864..ba53a73ac 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,9 +16,9 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <girepository.h>
-#include <main.h>
-#include <meta-plugin.h>
-#include <prefs.h>
+#include <meta/main.h>
+#include <meta/meta-plugin.h>
+#include <meta/prefs.h>
 
 #include "shell-a11y.h"
 #include "shell-global.h"
diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 301fc3f5d..519a83010 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -10,11 +10,11 @@
 #include <gtk/gtk.h>
 #include <clutter/clutter.h>
 #include <glib/gi18n.h>
+#include <meta/display.h>
 
 #include "shell-app-private.h"
 #include "shell-window-tracker-private.h"
 #include "shell-global.h"
-#include "display.h"
 #include "st.h"
 
 #define GMENU_I_KNOW_THIS_IS_UNSTABLE
diff --git a/src/shell-app-system.h b/src/shell-app-system.h
index 07684b791..3b615cecb 100644
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -4,9 +4,9 @@
 
 #include <gio/gio.h>
 #include <clutter/clutter.h>
+#include <meta/window.h>
 
 #include "shell-app.h"
-#include "window.h"
 
 #define SHELL_TYPE_APP_SYSTEM                 (shell_app_system_get_type ())
 #define SHELL_APP_SYSTEM(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_APP_SYSTEM, ShellAppSystem))
diff --git a/src/shell-app-usage.c b/src/shell-app-usage.c
index e8fe3ae8a..7b70a138a 100644
--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@@ -12,16 +12,15 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib.h>
+#include <meta/display.h>
+#include <meta/group.h>
+#include <meta/window.h>
 
 #include "shell-app-usage.h"
 #include "shell-window-tracker.h"
 #include "shell-global.h"
 #include "shell-marshal.h"
 
-#include "display.h"
-#include "window.h"
-#include "group.h"
-
 /* This file includes modified code from
  * desktop-data-engine/engine-dbus/hippo-application-monitor.c
  * in the functions collecting application usage data.
diff --git a/src/shell-app.c b/src/shell-app.c
index 74b72fb33..9ffe85654 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -2,16 +2,16 @@
 
 #include "config.h"
 
-#include "st.h"
-#include "shell-app-private.h"
-#include "shell-global.h"
-#include "shell-enum-types.h"
-#include "display.h"
-#include "st.h"
-#include "shell-window-tracker-private.h"
-
 #include <string.h>
 
+#include <meta/display.h>
+
+#include "shell-app-private.h"
+#include "shell-enum-types.h"
+#include "shell-global.h"
+#include "shell-window-tracker-private.h"
+#include "st.h"
+
 /* This is mainly a memory usage optimization - the user is going to
  * be running far fewer of the applications at one time than they have
  * installed.  But it also just helps keep the code more logically
diff --git a/src/shell-app.h b/src/shell-app.h
index 78b61f5ad..729cfecc8 100644
--- a/src/shell-app.h
+++ b/src/shell-app.h
@@ -4,8 +4,7 @@
 
 #include <clutter/clutter.h>
 #include <gio/gio.h>
-
-#include "window.h"
+#include <meta/window.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/shell-global.c b/src/shell-global.c
index 5a2f2e668..b16758ff5 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -2,38 +2,39 @@
 
 #include "config.h"
 
-#include "shell-global-private.h"
-#include "shell-enum-types.h"
-#include "shell-perf-log.h"
-#include "shell-window-tracker.h"
-#include "shell-marshal.h"
-#include "shell-wm.h"
-#include "st.h"
-
-#include "display.h"
-#include "util.h"
-#include <clutter/glx/clutter-glx.h>
-#include <clutter/x11/clutter-x11.h>
-#include <gdk/gdkx.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <dbus/dbus-glib.h>
-#include <gio/gio.h>
-#include <math.h>
-#include <X11/extensions/Xfixes.h>
-#include <gjs/gjs-module.h>
-#include <canberra.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
+
+#include <X11/extensions/Xfixes.h>
+#include <canberra.h>
+#include <clutter/glx/clutter-glx.h>
+#include <clutter/x11/clutter-x11.h>
+#include <dbus/dbus-glib.h>
+#include <gdk/gdkx.h>
+#include <gio/gio.h>
+#include <gjs/gjs-module.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlmemory.h>
+#include <meta/display.h>
+#include <meta/util.h>
+
+#include "shell-enum-types.h"
+#include "shell-global-private.h"
 #include "shell-jsapi-compat-private.h"
+#include "shell-marshal.h"
+#include "shell-perf-log.h"
+#include "shell-window-tracker.h"
+#include "shell-wm.h"
+#include "st.h"
 
 static void grab_notify (GtkWidget *widget, gboolean is_grab, gpointer user_data);
 
diff --git a/src/shell-global.h b/src/shell-global.h
index 66b912735..42909801c 100644
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -2,12 +2,11 @@
 #ifndef __SHELL_GLOBAL_H__
 #define __SHELL_GLOBAL_H__
 
-#include "meta-plugin.h"
 #include <clutter/clutter.h>
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
-
+#include <meta/meta-plugin.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/src/shell-tray-manager.c b/src/shell-tray-manager.c
index 0d126e920..2efbc4fe7 100644
--- a/src/shell-tray-manager.c
+++ b/src/shell-tray-manager.c
@@ -4,11 +4,9 @@
 
 #include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
-#include <gtk/gtk.h>
-
-#include <display.h>
-
 #include <girepository.h>
+#include <gtk/gtk.h>
+#include <meta/display.h>
 
 #include "shell-tray-manager.h"
 #include "na-tray-manager.h"
diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index 25ee54437..d2889236f 100644
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -9,6 +9,10 @@
 #include <X11/Xatom.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <meta/display.h>
+#include <meta/group.h>
+#include <meta/util.h>
+#include <meta/window.h>
 
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn.h>
@@ -20,11 +24,6 @@
 #include "shell-marshal.h"
 #include "st.h"
 
-#include "display.h"
-#include "window.h"
-#include "group.h"
-#include "util.h"
-
 /* This file includes modified code from
  * desktop-data-engine/engine-dbus/hippo-application-monitor.c
  * in the functions collecting application usage data.
diff --git a/src/shell-window-tracker.h b/src/shell-window-tracker.h
index bb2014dbe..9e16f4744 100644
--- a/src/shell-window-tracker.h
+++ b/src/shell-window-tracker.h
@@ -4,8 +4,8 @@
 
 #include <glib-object.h>
 #include <glib.h>
+#include <meta/window.h>
 
-#include "window.h"
 #include "shell-app.h"
 #include "shell-app-system.h"
 
diff --git a/src/shell-wm.c b/src/shell-wm.c
index 669ef4afb..a47376355 100644
--- a/src/shell-wm.c
+++ b/src/shell-wm.c
@@ -4,12 +4,12 @@
 
 #include <string.h>
 
+#include <meta/keybindings.h>
+
 #include "shell-wm-private.h"
 #include "shell-global.h"
 #include "shell-marshal.h"
 
-#include <keybindings.h>
-
 struct _ShellWM {
   GObject parent;
 
diff --git a/src/shell-wm.h b/src/shell-wm.h
index 477ac1e70..81fe83f13 100644
--- a/src/shell-wm.h
+++ b/src/shell-wm.h
@@ -3,7 +3,7 @@
 #define __SHELL_WM_H__
 
 #include <glib-object.h>
-#include <meta-plugin.h>
+#include <meta/meta-plugin.h>
 
 G_BEGIN_DECLS