patches/gnome-session-02-gnome-about.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 16100 4d7b9d2fbc25
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16100
4d7b9d2fbc25 2009-07-23 Ghee Teo <[email protected]>
gheet
parents: 15621
diff changeset
     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
4d7b9d2fbc25 2009-07-23 Ghee Teo <[email protected]>
gheet
parents: 15621
diff changeset
     2
--- gnome-session-2.27.4/gnome-session/gsm-manager.c	2009-07-23 15:42:09.679931892 +0100
4d7b9d2fbc25 2009-07-23 Ghee Teo <[email protected]>
gheet
parents: 15621
diff changeset
     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
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
     4
@@ -376,6 +376,22 @@
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
     5
 }
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
     6
 
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
     7
 static void start_phase (GsmManager *manager);
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset
     8
+#define ABOUT_PROMPT_KEY "/desktop/gnome/session/sun_extensions/viewed_about_jds_three"
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
     9
+
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    10
+static gint
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    11
+show_gnome_about (gpointer data)
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    12
+{
15621
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    13
+       int status;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    14
+
15621
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    15
+       if (g_spawn_command_line_async("gnome-about", NULL))
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    16
+       {
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    17
+               GConfClient *gconf_client = gconf_client_get_default ();
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    18
+               gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    19
+               g_object_unref (gconf_client);
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    20
+       }
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    21
+
15621
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    22
+       return FALSE;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    23
+}
15621
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    24
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    25
 static void
15621
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    26
 quit_request_completed (GsmConsolekit *consolekit,
b447de05cc21 Bump to 2.26.1
davelam
parents: 15330
diff changeset
    27
@@ -1276,6 +1292,9 @@
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    28
 void
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    29
 gsm_manager_start (GsmManager *manager)
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    30
 {
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    31
+	gboolean show_about;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    32
+	GConfClient *gconf_client;
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset
    33
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    34
         g_debug ("GsmManager: GSM starting to manage");
13056
0a67822e2c77 2008-08-06 Ghee Teo <[email protected]>
gheet
parents: 13029
diff changeset
    35
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    36
         g_return_if_fail (GSM_IS_MANAGER (manager));
16100
4d7b9d2fbc25 2009-07-23 Ghee Teo <[email protected]>
gheet
parents: 15621
diff changeset
    37
@@ -1283,6 +1302,13 @@
15330
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset
    38
         gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_INITIALIZATION);
13218
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset
    39
         debug_app_summary (manager);
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    40
         start_phase (manager);
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset
    41
+
16100
4d7b9d2fbc25 2009-07-23 Ghee Teo <[email protected]>
gheet
parents: 15621
diff changeset
    42
+	/* Do not attempt to show gnome-about dialog if user is gdm (uid 50) */
4d7b9d2fbc25 2009-07-23 Ghee Teo <[email protected]>
gheet
parents: 15621
diff changeset
    43
+	if (getuid()==50)
4d7b9d2fbc25 2009-07-23 Ghee Teo <[email protected]>
gheet
parents: 15621
diff changeset
    44
+		return;
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    45
+	gconf_client = gconf_client_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    46
+	show_about = gconf_client_get_bool (gconf_client, ABOUT_PROMPT_KEY, NULL);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    47
+	if (!show_about) gtk_timeout_add (4000, show_gnome_about, NULL);
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset
    48
 }
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    49
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    50
 static gboolean