diff -urN gnome-desktop.orig/libgnome-desktop/Makefile.am gnome-desktop.new/libgnome-desktop/Makefile.am
--- gnome-desktop.orig/libgnome-desktop/Makefile.am	2006-06-30 15:04:46.293069000 +0100
+++ gnome-desktop.new/libgnome-desktop/Makefile.am	2006-06-30 15:07:06.906034000 +0100
@@ -18,6 +18,7 @@
 
 libgnome_desktop_2_la_SOURCES = \
 	gnome-desktop-item.c	\
+	gnome-desktop-tsol-extensions.c \
 	gnome-ditem-edit.c	\
 	gnome-hint.c
 
diff -urN gnome-desktop.orig/libgnome-desktop/gnome-desktop-item.c gnome-desktop.new/libgnome-desktop/gnome-desktop-item.c
--- gnome-desktop.orig/libgnome-desktop/gnome-desktop-item.c	2006-06-30 15:04:46.296493000 +0100
+++ gnome-desktop.new/libgnome-desktop/gnome-desktop-item.c	2006-06-30 15:27:31.705548000 +0100
@@ -50,6 +50,7 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #include <libgnome/gnome-desktop-item.h>
+#include <libgnome/gnome-desktop-tsol-extensions.h>
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 #define SN_API_NOT_YET_FROZEN
@@ -1751,6 +1752,7 @@
 	char *new_exec, *uris, *temp;
 	char *exec_locale;
 	int launched = 0;
+	char *command;
 #ifdef HAVE_STARTUP_NOTIFICATION
 	SnLauncherContext *sn_context;
 	SnDisplay *sn_display;
@@ -1948,8 +1950,13 @@
 		}
 #endif
 		
-		
-		if ( ! g_spawn_async (working_dir,
+	
+		if (gnome_desktop_tsol_is_multi_label_session ()) {
+			command = g_strdup_printf ("%d:%s", gdk_screen_get_number (screen), g_strjoinv (" ", real_argv));
+			gnome_desktop_tsol_proxy_app_launch (command);
+			g_free (command);
+		} else {	
+			if ( ! g_spawn_async (working_dir,
 				      real_argv,
 				      envp,
 				      G_SPAWN_SEARCH_PATH /* flags */,
@@ -1957,11 +1964,12 @@
 				      NULL, /* child_setup_func_data */
 				      &ret /* child_pid */,
 				      error)) {
-			/* The error was set for us,
-			 * we just can't launch this thingie */
-			ret = -1;
-			g_strfreev (real_argv);
-			break;
+				/* The error was set for us,
+			 	* we just can't launch this thingie */
+				ret = -1;
+				g_strfreev (real_argv);
+				break;
+			}
 		}
 		launched ++;
 
diff -urN gnome-desktop.orig/libgnome-desktop/gnome-desktop-tsol-extensions.c gnome-desktop.new/libgnome-desktop/gnome-desktop-tsol-extensions.c
--- gnome-desktop.orig/libgnome-desktop/gnome-desktop-tsol-extensions.c	1970-01-01 01:00:00.000000000 +0100
+++ gnome-desktop.new/libgnome-desktop/gnome-desktop-tsol-extensions.c	2006-06-30 15:18:34.580783000 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <config.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <X11/Xlib.h>
+#include <stdlib.h>
+#include <strings.h>
+
+#define ATOM "_LABEL_EXEC_COMMAND"
+
+gboolean
+gnome_desktop_tsol_is_multi_label_session (void)
+{
+	static int trusted = -1;
+
+	if (trusted < 0) {
+		if (getenv ("TRUSTED_SESSION")) {
+			trusted = 1;
+		} else {
+			trusted = 0;
+		}
+	}
+
+	return trusted ? TRUE : FALSE;
+}
+
+void
+gnome_desktop_tsol_proxy_app_launch (char *command)
+{
+	GdkDisplay *dpy;
+	Display *xdpy;
+	Window root;
+	Atom atom, utf8_string;
+
+	if (!command) return;
+
+	dpy = gdk_display_get_default ();
+	xdpy = GDK_DISPLAY_XDISPLAY (dpy);
+
+	utf8_string = XInternAtom (xdpy, "UTF8_STRING", FALSE);
+
+	root = DefaultRootWindow (xdpy);
+
+	atom = XInternAtom (xdpy, ATOM, FALSE);
+
+	gdk_error_trap_push ();
+
+	XChangeProperty (xdpy, root, atom, utf8_string, 8, PropModeReplace,
+			 command, strlen (command));
+
+	XSync (xdpy, False);
+
+	gdk_error_trap_pop ();
+}
+
diff -urN gnome-desktop.orig/libgnome-desktop/libgnome/Makefile.am gnome-desktop.new/libgnome-desktop/libgnome/Makefile.am
--- gnome-desktop.orig/libgnome-desktop/libgnome/Makefile.am	2006-06-30 15:04:46.300359000 +0100
+++ gnome-desktop.new/libgnome-desktop/libgnome/Makefile.am	2006-06-30 15:19:12.412292000 +0100
@@ -1,3 +1,4 @@
 libgnome_desktopdir = $(includedir)/gnome-desktop-2.0/libgnome
 libgnome_desktop_HEADERS = \
-	gnome-desktop-item.h
+	gnome-desktop-item.h \
+	gnome-desktop-tsol-extensions.h
diff -urN gnome-desktop.orig/libgnome-desktop/libgnome/gnome-desktop-tsol-extensions.h gnome-desktop.new/libgnome-desktop/libgnome/gnome-desktop-tsol-extensions.h
--- gnome-desktop.orig/libgnome-desktop/libgnome/gnome-desktop-tsol-extensions.h	1970-01-01 01:00:00.000000000 +0100
+++ gnome-desktop.new/libgnome-desktop/libgnome/gnome-desktop-tsol-extensions.h	2006-06-30 15:19:39.732188000 +0100
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+gboolean gnome_desktop_tsol_is_multi_label_session (void);
+void gnome_desktop_tsol_proxy_app_launch (char *command);
+