patches/gnome-session-02-gnome-about.diff
changeset 13113 e0003844f498
parent 13088 d5eae28f14ef
child 13218 96755f314561
--- a/patches/gnome-session-02-gnome-about.diff	Wed Aug 13 14:20:35 2008 +0000
+++ b/patches/gnome-session-02-gnome-about.diff	Wed Aug 13 14:56:46 2008 +0000
@@ -1,40 +1,48 @@
-diff -urN session.orig/gnome-session/session.c session.new/gnome-session/session.c
---- session.orig/gnome-session/session.c	2008-08-05 13:11:56.645264000 +0100
-+++ session.new/gnome-session/session.c	2008-08-05 13:42:35.726774000 +0100
-@@ -636,12 +636,36 @@
-     end_phase (session);
- }
+--- gnome-session-2.23.6/gnome-session/gsm-manager.c	2008-08-05 04:46:44.000000000 +0100
++++ gnome-session-2.23.6/gnome-session/gsm-manager.c.new	2008-08-06 11:28:56.733523000 +0100
+@@ -318,6 +318,23 @@
+ 
+ static void start_phase (GsmManager *manager);
  
 +#define ABOUT_PROMPT_KEY "/desktop/gnome/session/sun_extensions/viewed_about_jds_three"
 +
 +static gint
 +show_gnome_about (gpointer data)
 +{
-+  int status;
++	int status;
 +
-+  if (g_spawn_command_line_async("gnome-about", NULL))
-+    {
-+      GConfClient *gconf_client = gconf_client_get_default ();
-+      gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
-+      g_object_unref (gconf_client);
-+    }
++	if (g_spawn_command_line_async("gnome-about", NULL))
++	{
++		GConfClient *gconf_client = gconf_client_get_default ();
++		gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
++		g_object_unref (gconf_client);
++	}
 +
-+  return FALSE;
++	return FALSE;
 +}
 +
- void
- gsm_session_start (GsmSession *session)
+ static void
+ end_phase (GsmManager *manager)
  {
-+  gboolean show_about;
-+  GConfClient *gconf_client;
+@@ -970,6 +988,9 @@
+ void
+ gsm_manager_start (GsmManager *manager)
+ {
++	gboolean show_about;
++	GConfClient *gconf_client;
 +
-   session->phase = GSM_SESSION_PHASE_INITIALIZATION;
+         g_debug ("GsmManager: GSM starting to manage");
  
-   start_phase (session);
+         g_return_if_fail (GSM_IS_MANAGER (manager));
+@@ -977,6 +998,11 @@
+         manager->priv->phase = GSM_MANAGER_PHASE_INITIALIZATION;
+ 
+         start_phase (manager);
 +
-+  gconf_client = gconf_client_get_default ();
-+  show_about = gconf_client_get_bool (gconf_client, ABOUT_PROMPT_KEY, NULL);
-+  if (!show_about) gtk_timeout_add (4000, show_gnome_about, NULL);
++	gconf_client = gconf_client_get_default ();
++	show_about = gconf_client_get_bool (gconf_client, ABOUT_PROMPT_KEY, NULL);
++	if (!show_about) gtk_timeout_add (4000, show_gnome_about, NULL);
++
  }
  
- GsmSessionPhase
+ static gboolean