--- a/patches/gnome-desktop-03-trusted-extensions.diff Fri Nov 17 05:23:10 2006 +0000
+++ b/patches/gnome-desktop-03-trusted-extensions.diff Fri Nov 17 06:22:46 2006 +0000
@@ -1,7 +1,7 @@
-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 @@
+diff -urN -x '*~' gd.orig/libgnome-desktop/Makefile.am gd.new/libgnome-desktop/Makefile.am
+--- gd.orig/libgnome-desktop/Makefile.am 2006-11-17 02:35:58.532629000 +0000
++++ gd.new/libgnome-desktop/Makefile.am 2006-11-17 02:36:48.058570000 +0000
+@@ -19,6 +19,7 @@
libgnome_desktop_2_la_SOURCES = \
gnome-desktop-item.c \
@@ -9,10 +9,17 @@
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 @@
+diff -urN -x '*~' gd.orig/libgnome-desktop/gnome-desktop-item.c gd.new/libgnome-desktop/gnome-desktop-item.c
+--- gd.orig/libgnome-desktop/gnome-desktop-item.c 2006-11-17 02:35:58.539593000 +0000
++++ gd.new/libgnome-desktop/gnome-desktop-item.c 2006-11-17 02:39:21.143779000 +0000
+@@ -44,12 +44,14 @@
+ #include <libgnome/gnome-url.h>
+ #include <locale.h>
+ #include <popt.h>
++#include <zone.h>
+
+ #include <libgnomevfs/gnome-vfs-uri.h>
+ #include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libgnome/gnome-desktop-item.h>
@@ -20,7 +27,7 @@
#ifdef HAVE_STARTUP_NOTIFICATION
#define SN_API_NOT_YET_FROZEN
-@@ -1751,6 +1752,7 @@
+@@ -1747,6 +1749,7 @@
char *new_exec, *uris, *temp;
char *exec_locale;
int launched = 0;
@@ -28,14 +35,15 @@
#ifdef HAVE_STARTUP_NOTIFICATION
SnLauncherContext *sn_context;
SnDisplay *sn_display;
-@@ -1948,8 +1950,13 @@
+@@ -1944,8 +1947,14 @@
}
#endif
-
- if ( ! g_spawn_async (working_dir,
+
-+ if (gnome_desktop_tsol_is_multi_label_session ()) {
++ if (gnome_desktop_tsol_is_multi_label_session () &&
++ getzoneid () == 0) {
+ 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);
@@ -44,7 +52,7 @@
real_argv,
envp,
G_SPAWN_SEARCH_PATH /* flags */,
-@@ -1957,11 +1964,12 @@
+@@ -1953,11 +1962,12 @@
NULL, /* child_setup_func_data */
&ret /* child_pid */,
error)) {
@@ -62,9 +70,9 @@
}
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
+diff -urN -x '*~' gd.orig/libgnome-desktop/gnome-desktop-tsol-extensions.c gd.new/libgnome-desktop/gnome-desktop-tsol-extensions.c
+--- gd.orig/libgnome-desktop/gnome-desktop-tsol-extensions.c 1970-01-01 01:00:00.000000000 +0100
++++ gd.new/libgnome-desktop/gnome-desktop-tsol-extensions.c 2006-11-17 02:36:48.073763000 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
@@ -125,18 +133,18 @@
+ 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
+diff -urN -x '*~' gd.orig/libgnome-desktop/libgnome/Makefile.am gd.new/libgnome-desktop/libgnome/Makefile.am
+--- gd.orig/libgnome-desktop/libgnome/Makefile.am 2006-11-17 02:35:58.545399000 +0000
++++ gd.new/libgnome-desktop/libgnome/Makefile.am 2006-11-17 02:36:48.074528000 +0000
@@ -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
+diff -urN -x '*~' gd.orig/libgnome-desktop/libgnome/gnome-desktop-tsol-extensions.h gd.new/libgnome-desktop/libgnome/gnome-desktop-tsol-extensions.h
+--- gd.orig/libgnome-desktop/libgnome/gnome-desktop-tsol-extensions.h 1970-01-01 01:00:00.000000000 +0100
++++ gd.new/libgnome-desktop/libgnome/gnome-desktop-tsol-extensions.h 2006-11-17 02:36:48.075300000 +0000
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.