--- a/patches/SUNWtgnome-xagent-01-trusted-extensions.diff Tue Aug 05 12:47:12 2008 +0000
+++ b/patches/SUNWtgnome-xagent-01-trusted-extensions.diff Tue Aug 05 13:04:30 2008 +0000
@@ -1,6 +1,6 @@
-diff -urN xagent.orig/gnome-session/Makefile.am xagent.new/gnome-session/Makefile.am
---- xagent.orig/gnome-session/Makefile.am 2008-07-14 17:46:08.660910000 +0100
-+++ xagent.new/gnome-session/Makefile.am 2008-07-14 19:35:52.590734000 +0100
+diff -urN -x '*.orig' -x '*.rej' xagent.orig/gnome-session/Makefile.am xagent.new/gnome-session/Makefile.am
+--- xagent.orig/gnome-session/Makefile.am 2008-08-05 14:17:55.406294000 +0100
++++ xagent.new/gnome-session/Makefile.am 2008-08-05 14:19:07.105079000 +0100
@@ -1,4 +1,4 @@
-bin_PROGRAMS = gnome-session
+bin_PROGRAMS = tsoljds-xagent
@@ -27,8 +27,8 @@
app-resumed.c \
@@ -47,11 +47,9 @@
gsm.h \
- logout-dialog.h \
- logout-dialog.c \
+ logout.h \
+ logout.c \
- main.c \
+ xagent.c \
power-manager.h \
@@ -38,9 +38,9 @@
session.c \
session.h \
xsmp.c \
-diff -urN xagent.orig/gnome-session/session.c xagent.new/gnome-session/session.c
---- xagent.orig/gnome-session/session.c 2008-07-14 17:46:08.661992000 +0100
-+++ xagent.new/gnome-session/session.c 2008-07-21 16:22:09.831012000 +0100
+diff -urN -x '*.orig' -x '*.rej' xagent.orig/gnome-session/session.c xagent.new/gnome-session/session.c
+--- xagent.orig/gnome-session/session.c 2008-08-05 14:17:55.392661000 +0100
++++ xagent.new/gnome-session/session.c 2008-08-05 14:18:31.474823000 +0100
@@ -171,6 +171,20 @@
session->name = g_strdup (name);
}
@@ -50,7 +50,7 @@
+{
+ char **app;
+ char *xagent_blacklist[] = {"metacity", "gnome-panel", "tsoljdsselmgr",
-+ "tsoljds-tstripe", "gnome-session-splash", NULL};
++ "tsoljds-tstripe", "gnome-session-splash", "gnome-settings-deamon", "gnome-power-manager", "at-spi-registryd-wrapper", "gnome-login-sound", "ospm-applet", NULL};
+
+ for (app = xagent_blacklist; *app != NULL; app++) {
+ if (strncmp (name, *app, strlen (*app)) == 0) return TRUE;
@@ -71,9 +71,9 @@
{
g_object_unref (app);
return;
-diff -urN xagent.orig/gnome-session/xagent.c xagent.new/gnome-session/xagent.c
+diff -urN -x '*.orig' -x '*.rej' xagent.orig/gnome-session/xagent.c xagent.new/gnome-session/xagent.c
--- xagent.orig/gnome-session/xagent.c 1970-01-01 01:00:00.000000000 +0100
-+++ xagent.new/gnome-session/xagent.c 2008-07-21 16:54:05.363806000 +0100
++++ xagent.new/gnome-session/xagent.c 2008-08-05 14:18:31.477084000 +0100
@@ -0,0 +1,288 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -323,6 +323,7 @@
+ * already running. This requires us to initialize XSMP too, because
+ * we want $SESSION_MANAGER to be set before launching dbus-daemon.
+ */
++ if (!nosession) {
+ gsm_gconf_init ();
+ gsm_xsmp_init ();
+ gsm_dbus_init ();
@@ -331,14 +332,13 @@
+ * gsm_initialization_error() if they failed.)
+ */
+ gsm_gconf_check ();
-+ gsm_dbus_check ();
++ gsm_dbus_check ();
+
+ global_session = gsm_session_new (defaultsession);
+
+ gsm_xsmp_run ();
+ gsm_dbus_run ();
+
-+ if (!nosession) {
+ if (g_file_test (TSOLJDS_MIGRATION_SCRIPT, G_FILE_TEST_IS_EXECUTABLE)) {
+ system (TSOLJDS_MIGRATION_SCRIPT);
+ }