--- a/patches/metacity-04-trusted-extensions.diff	Sun Feb 07 23:20:07 2010 +0000
+++ b/patches/metacity-04-trusted-extensions.diff	Sun Feb 07 23:45:13 2010 +0000
@@ -293,28 +293,6 @@
  static void
  handle_run_command (MetaDisplay    *display,
                      MetaScreen     *screen,
-diff -purN -x '*.orig' -x '*.rej' -x '*~' ../metacity-2.27.1/src/core/main.c metacity-2.27.1/src/core/main.c
---- ../metacity-2.27.1/src/core/main.c	2009-09-14 09:05:19.277575533 +0200
-+++ metacity-2.27.1/src/core/main.c	2009-09-14 09:05:34.520926616 +0200
-@@ -67,6 +67,7 @@
- #include <fcntl.h>
- #include <locale.h>
- #include <time.h>
-+#include "trusted.h"
- 
- /**
-  * The exit code we'll return to our parent process when we eventually die.
-@@ -423,6 +424,10 @@ main (int argc, char **argv)
-   };
-   guint i;
- 
-+  if (tsol_use_trusted_extensions () ) {
-+	putenv ("GDK_NATIVE_WINDOWS=true");
-+  }
-+
-   if (!g_thread_supported ())
-     g_thread_init (NULL);
-   
 diff -purN -x '*.orig' -x '*.rej' -x '*~' ../metacity-2.27.1/src/core/prefs.c metacity-2.27.1/src/core/prefs.c
 --- ../metacity-2.27.1/src/core/prefs.c	2009-09-14 09:05:19.277296857 +0200
 +++ metacity-2.27.1/src/core/prefs.c	2009-09-14 09:05:34.523152341 +0200
@@ -328,18 +306,6 @@
  
  #define MAX_REASONABLE_WORKSPACES 36
  
-@@ -63,6 +66,11 @@
- 
- #define KEY_WORKSPACE_NAME_PREFIX "/apps/metacity/workspace_names/name_"
- 
-+#ifdef HAVE_XTSOL
-+#define KEY_WORKSPACE_LABEL_PREFIX "/apps/metacity/workspace_labels/ws_"
-+#define KEY_WORKSPACE_ROLE_PREFIX "/apps/metacity/workspace_roles/ws_"
-+#endif /* HAVE_XTSOL */
-+
- 
- #ifdef HAVE_GCONF
- static GConfClient *default_client = NULL;
 @@ -106,6 +114,14 @@ static char *commands[MAX_COMMANDS] = { 
  static char *terminal_command = NULL;
  
@@ -3357,14 +3323,6 @@
 diff -purN -x '*.orig' -x '*.rej' -x '*~' ../metacity-2.27.1/src/include/ui.h metacity-2.27.1/src/include/ui.h
 --- ../metacity-2.27.1/src/include/ui.h	2009-09-14 09:05:19.285511276 +0200
 +++ metacity-2.27.1/src/include/ui.h	2009-09-14 09:05:34.530226877 +0200
-@@ -30,6 +30,7 @@
- #include <X11/Xutil.h>
- #include <glib.h>
- #include <gdk-pixbuf/gdk-pixbuf.h>
-+#include "frames.h"
- 
- /* This is between GTK_PRIORITY_RESIZE (+10) and GTK_PRIORITY_REDRAW (+20) */
- #define META_PRIORITY_RESIZE    (G_PRIORITY_HIGH_IDLE + 15)
 @@ -204,6 +205,12 @@ MetaUIDirection meta_ui_get_direction (v
  
  GdkPixbuf *meta_ui_get_pixbuf_from_pixmap (Pixmap   pmap);
@@ -4423,3 +4381,50 @@
  MetaUIDirection
  meta_ui_get_direction (void)
  {
+diff -ruNp metacity-2.28.1.orig/src/core/main.c metacity-2.28.1/src/core/main.c
+--- metacity-2.28.1.orig/src/core/main.c	2010-02-02 06:20:51.406777070 +0000
++++ metacity-2.28.1/src/core/main.c	2010-02-02 06:22:45.082185635 +0000
+@@ -68,6 +68,7 @@
+ #include <locale.h>
+ #include <time.h>
+ #include <unistd.h>
++#include "trusted.h"
+ 
+ /**
+  * The exit code we'll return to our parent process when we eventually die.
+@@ -416,6 +417,10 @@ main (int argc, char **argv)
+   guint i;
+   GIOChannel *channel;
+ 
++  if (tsol_use_trusted_extensions () ) {
++       putenv ("GDK_NATIVE_WINDOWS=true");
++  }
++
+   if (!g_thread_supported ())
+     g_thread_init (NULL);
+   
+diff -ruN metacity-2.28.1.orig/src/core/prefs.c metacity-2.28.1/src/core/prefs.c
+--- metacity-2.28.1.orig/src/core/prefs.c	2010-02-02 06:23:34.519993887 +0000
++++ metacity-2.28.1/src/core/prefs.c	2010-02-02 06:24:39.723889605 +0000
+@@ -68,6 +68,10 @@
+ #define KEY_WORKSPACE_NAME_DIRECTORY "/apps/metacity/workspace_names"
+ #define KEY_WORKSPACE_NAME_PREFIX "/apps/metacity/workspace_names/name_"
+ 
++#ifdef HAVE_XTSOL
++#define KEY_WORKSPACE_LABEL_PREFIX "/apps/metacity/workspace_labels/ws_"
++#define KEY_WORKSPACE_ROLE_PREFIX "/apps/metacity/workspace_roles/ws_"
++#endif /* HAVE_XTSOL */
+ 
+ #ifdef HAVE_GCONF
+ static GConfClient *default_client = NULL;
+diff -ruNp metacity-2.28.1.orig/src/include/ui.h metacity-2.28.1/src/include/ui.h
+--- metacity-2.28.1.orig/src/include/ui.h	2010-02-02 06:25:53.374932836 +0000
++++ metacity-2.28.1/src/include/ui.h	2010-02-02 06:26:49.796360045 +0000
+@@ -30,6 +30,7 @@
+ #include <X11/Xutil.h>
+ #include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
++#include "frames.h"
+ 
+ /* This is between GTK_PRIORITY_RESIZE (+10) and GDK_PRIORITY_REDRAW (+20) */
+ #define META_PRIORITY_RESIZE    (G_PRIORITY_HIGH_IDLE + 15)