16100
|
1 |
diff -urN -x '*.orig' gnome-session-2.27.4/gnome-session/gsm-manager.c ../SUNWgnome-session-2.26.1.hacked/gnome-session-2.27.4/gnome-session/gsm-manager.c
|
|
2 |
--- gnome-session-2.27.4/gnome-session/gsm-manager.c 2009-07-23 15:42:09.679931892 +0100
|
|
3 |
+++ ../SUNWgnome-session-2.26.1.hacked/gnome-session-2.27.4/gnome-session/gsm-manager.c 2009-07-23 15:50:29.967601535 +0100
|
15621
|
4 |
@@ -376,6 +376,22 @@
|
|
5 |
}
|
13113
|
6 |
|
|
7 |
static void start_phase (GsmManager *manager);
|
13029
|
8 |
+#define ABOUT_PROMPT_KEY "/desktop/gnome/session/sun_extensions/viewed_about_jds_three"
|
12752
|
9 |
+
|
|
10 |
+static gint
|
|
11 |
+show_gnome_about (gpointer data)
|
|
12 |
+{
|
15621
|
13 |
+ int status;
|
12752
|
14 |
+
|
15621
|
15 |
+ if (g_spawn_command_line_async("gnome-about", NULL))
|
|
16 |
+ {
|
|
17 |
+ GConfClient *gconf_client = gconf_client_get_default ();
|
|
18 |
+ gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
|
|
19 |
+ g_object_unref (gconf_client);
|
|
20 |
+ }
|
12752
|
21 |
+
|
15621
|
22 |
+ return FALSE;
|
12752
|
23 |
+}
|
15621
|
24 |
|
13113
|
25 |
static void
|
15621
|
26 |
quit_request_completed (GsmConsolekit *consolekit,
|
|
27 |
@@ -1276,6 +1292,9 @@
|
13113
|
28 |
void
|
|
29 |
gsm_manager_start (GsmManager *manager)
|
|
30 |
{
|
|
31 |
+ gboolean show_about;
|
|
32 |
+ GConfClient *gconf_client;
|
13029
|
33 |
+
|
13113
|
34 |
g_debug ("GsmManager: GSM starting to manage");
|
13056
|
35 |
|
13113
|
36 |
g_return_if_fail (GSM_IS_MANAGER (manager));
|
16100
|
37 |
@@ -1283,6 +1302,13 @@
|
15330
|
38 |
gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_INITIALIZATION);
|
13218
|
39 |
debug_app_summary (manager);
|
13113
|
40 |
start_phase (manager);
|
13029
|
41 |
+
|
16100
|
42 |
+ /* Do not attempt to show gnome-about dialog if user is gdm (uid 50) */
|
|
43 |
+ if (getuid()==50)
|
|
44 |
+ return;
|
13113
|
45 |
+ gconf_client = gconf_client_get_default ();
|
|
46 |
+ show_about = gconf_client_get_bool (gconf_client, ABOUT_PROMPT_KEY, NULL);
|
|
47 |
+ if (!show_about) gtk_timeout_add (4000, show_gnome_about, NULL);
|
13029
|
48 |
}
|
12752
|
49 |
|
13113
|
50 |
static gboolean
|