--- a/ChangeLog	Fri May 16 15:23:42 2008 +0000
+++ b/ChangeLog	Fri May 16 16:39:21 2008 +0000
@@ -1,3 +1,7 @@
+2008-05-16  Niall Power <[email protected]>
+
+	* patches/SUNWtgnome-xagent-01.diff: launch dbus-daemon. Fixes 6699794
+
 2008-05-16  Damien Carbery <[email protected]>
 
 	* SUNWgnome-devhelp.spec, SUNWgnome-help-viewer.spec: Undo Evan's

--- a/patches/SUNWtgnome-xagent-01-trusted-extensions.diff	Fri May 16 15:23:42 2008 +0000
+++ b/patches/SUNWtgnome-xagent-01-trusted-extensions.diff	Fri May 16 16:39:21 2008 +0000
@@ -34,7 +34,7 @@
  endif
  
  splash_test_SOURCES =	\
-@@ -130,6 +130,45 @@
+@@ -125,6 +135,47 @@
  	migrate-trash.c		\
  	migrate-trash.h
  
@@ -49,6 +49,8 @@
 +	remote.h                \
 +	ice.c                   \
 +	ice.h                   \
++	gsm-dbus.c		\
++	gsm-dbus.h		\
 +	gsm-keyring.c           \
 +	gsm-keyring.h           \
 +	splash-widget.c         \
@@ -83,7 +85,7 @@
 diff -urN -x '*.orig' gnome-session-2.20.3/gnome-session/tsoljds-xagent.c ../SUNWtgnome-xagent-2.21.4.hacked/gnome-session-2.20.3/gnome-session/tsoljds-xagent.c
 --- gnome-session-2.20.3/gnome-session/tsoljds-xagent.c	1970-01-01 00:00:00.000000000 +0000
 +++ ../SUNWtgnome-xagent-2.21.4.hacked/gnome-session-2.20.3/gnome-session/tsoljds-xagent.c	2008-01-11 17:56:14.079640000 +0000
-@@ -0,0 +1,514 @@
+@@ -0,0 +1,522 @@
 +#include <config.h>
 +#ifdef HAVE_XTSOL
 +
@@ -123,6 +125,7 @@
 +#include "ice.h"
 +#include "headers.h"
 +#include "save.h"
++#include "gsm-dbus.h"
 +#include "gsm-keyring.h"
 +
 +gint purge_delay = 30000;
@@ -351,6 +354,7 @@
 +  GIOChannel *channel;
 +  guint result;
 +  Session *session;
++  gboolean dbus_daemon_owner;
 +  static gboolean first_startup= TRUE;
 +
 +    /* redirect stdout and stderr to /dev/null */
@@ -366,6 +370,8 @@
 +      atexit (AtExit);
 +    }
 +
++    dbus_daemon_owner = gsm_dbus_daemon_start ();
++
 +    if ((argc > 1) && !(strcmp (argv[1], "--defaultsession")))
 +      default_session = TRUE;
 +
@@ -474,6 +480,10 @@
 +                                  (GIOFunc)handle_pipe_input, NULL, so_long_pipe);
 +    gtk_main ();
 +
++    if (dbus_daemon_owner) {
++        gsm_dbus_daemon_stop ();
++    }
++
 +    return 0;
 +}
 +