--- a/patches/SUNWtgnome-xagent-01-trusted-extensions.diff Thu Apr 12 14:25:06 2007 +0000
+++ b/patches/SUNWtgnome-xagent-01-trusted-extensions.diff Thu Apr 12 18:29:58 2007 +0000
@@ -1,6 +1,6 @@
-diff -urN gnome-session-2.16.1/gnome-session/Makefile.am ../SUNWtgnome-xagent-2.16.1.hacked/gnome-session-2.16.1/gnome-session/Makefile.am
---- gnome-session-2.16.1/gnome-session/Makefile.am 2006-11-03 11:51:16.494053000 +0000
-+++ ../SUNWtgnome-xagent-2.16.1.hacked/gnome-session-2.16.1/gnome-session/Makefile.am 2006-11-03 11:43:57.016588000 +0000
+diff -urN -x'*~' gnome-session-2.18.0/gnome-session/Makefile.am ../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/gnome-session/Makefile.am
+--- gnome-session-2.18.0/gnome-session/Makefile.am 2007-04-12 17:59:16.954363000 +0000
++++ ../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/gnome-session/Makefile.am 2007-04-12 18:04:53.249935000 +0000
@@ -4,6 +4,7 @@
INCLUDES = \
@@ -9,7 +9,7 @@
$(STANDARD_PROPERTIES_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-@@ -34,6 +34,14 @@
+@@ -33,6 +34,14 @@
gnome_session_properties_LDADD = $(GNOME_SESSION_LIBS)
splash_test_LDADD = $(X_LIBS) $(GNOME_SESSION_LIBS)
logout_test_LDADD = $(X_LIBS) $(GNOME_SESSION_LIBS)
@@ -24,7 +24,7 @@
if SESSION
noinst_PROGRAMS = \
-@@ -46,7 +56,8 @@
+@@ -43,7 +52,8 @@
gnome-session \
gnome-session-save \
gnome-session-remove \
@@ -34,7 +34,7 @@
endif
splash_test_SOURCES = \
-@@ -116,6 +127,40 @@
+@@ -115,6 +125,42 @@
tsoljds-misc.h \
endif
@@ -49,6 +49,8 @@
+ remote.h \
+ ice.c \
+ ice.h \
++ gsm-keyring.c \
++ gsm-keyring.h \
+ splash-widget.c \
+ splash-widget.h \
+ logout.c \
@@ -75,10 +77,10 @@
gnome_session_save_SOURCES = \
save-session.c \
gsm-typebuiltins.c \
-diff -urN gnome-session-2.16.1/gnome-session/tsoljds-xagent.c ../SUNWtgnome-xagent-2.16.1.hacked/gnome-session-2.16.1/gnome-session/tsoljds-xagent.c
---- gnome-session-2.16.1/gnome-session/tsoljds-xagent.c 1970-01-01 00:00:00.000000000 +0000
-+++ ../SUNWtgnome-xagent-2.16.1.hacked/gnome-session-2.16.1/gnome-session/tsoljds-xagent.c 2006-11-03 11:47:40.815778000 +0000
-@@ -0,0 +1,502 @@
+diff -urN -x'*~' gnome-session-2.18.0/gnome-session/tsoljds-xagent.c ../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/gnome-session/tsoljds-xagent.c
+--- gnome-session-2.18.0/gnome-session/tsoljds-xagent.c 1970-01-01 00:00:00.000000000 +0000
++++ ../SUNWtgnome-xagent-2.18.0.hacked/gnome-session-2.18.0/gnome-session/tsoljds-xagent.c 2007-04-12 18:03:20.518279000 +0000
+@@ -0,0 +1,507 @@
+#include <config.h>
+#ifdef HAVE_XTSOL
+
@@ -118,6 +120,7 @@
+#include "ice.h"
+#include "headers.h"
+#include "save.h"
++#include "gsm-keyring.h"
+
+gint purge_delay = 30000;
+gint warn_delay = 30000;
@@ -354,6 +357,8 @@
+ if ((argc > 1) && !(strcmp (argv[1], "--defaultsession")))
+ default_session = TRUE;
+
++ gsm_keyring_daemon_start ();
++
+ /* This is required some that the ~/.gnome2 are setup */
+ if (managesession)
+ gnome_program_init ("tsoljds-xagent", "0.1", LIBGNOMEUI_MODULE,
@@ -456,6 +461,8 @@
+ G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP,
+ (GIOFunc)handle_pipe_input, NULL, so_long_pipe);
+ gtk_main ();
++
++ gsm_keyring_daemon_stop ();
+
+ return 0;
+}