13960N/Adiff -urN -x'*.orig' -x'*.rej' gnome-session-2.23.7/gnome-session/gsm-manager.c ../SUNWgnome-session-2.23.7-p2/gnome-session-2.23.7/gnome-session/gsm-manager.c

13960N/A--- gnome-session-2.23.7/gnome-session/gsm-manager.c 2008-08-18 15:07:31.000000000 +0100

13960N/A+++ ../SUNWgnome-session-2.23.7-p2/gnome-session-2.23.7/gnome-session/gsm-manager.c 2008-08-19 10:46:06.118671000 +0100

13960N/A@@ -337,6 +337,23 @@

13855N/A

13855N/A static void start_phase (GsmManager *manager);

13494N/A

13771N/A+#define ABOUT_PROMPT_KEY "/desktop/gnome/session/sun_extensions/viewed_about_jds_three"

13494N/A+

13494N/A+static gint

13494N/A+show_gnome_about (gpointer data)

13494N/A+{

13855N/A+ int status;

13494N/A+

13855N/A+ if (g_spawn_command_line_async("gnome-about", NULL))

13855N/A+ {

13855N/A+ GConfClient *gconf_client = gconf_client_get_default ();

13855N/A+ gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);

13855N/A+ g_object_unref (gconf_client);

13855N/A+ }

13494N/A+

13855N/A+ return FALSE;

13494N/A+}

13494N/A+

13855N/A static void

13855N/A end_phase (GsmManager *manager)

13771N/A {

13960N/A@@ -1053,6 +1070,9 @@

13855N/A void

13855N/A gsm_manager_start (GsmManager *manager)

13855N/A {

13855N/A+ gboolean show_about;

13855N/A+ GConfClient *gconf_client;

13771N/A+

13855N/A g_debug ("GsmManager: GSM starting to manage");

13798N/A

13855N/A g_return_if_fail (GSM_IS_MANAGER (manager));

13960N/A@@ -1060,6 +1080,10 @@

13855N/A manager->priv->phase = GSM_MANAGER_PHASE_INITIALIZATION;

13960N/A debug_app_summary (manager);

13855N/A start_phase (manager);

13771N/A+

13855N/A+ gconf_client = gconf_client_get_default ();

13855N/A+ show_about = gconf_client_get_bool (gconf_client, ABOUT_PROMPT_KEY, NULL);

13855N/A+ if (!show_about) gtk_timeout_add (4000, show_gnome_about, NULL);

13771N/A }

13494N/A

13855N/A static gboolean