Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gnome-session-02-gnome-about.diff
author gheet
Mon, 09 Mar 2009 16:42:04 +0000
changeset 15330 a935e2c278b2
parent 13218 96755f314561
child 15621 b447de05cc21
permissions -rw-r--r--
2009-03-09 ghee teo <[email protected]> Upreved tarball to 2.25.92 and reordered all patches sequentially. * ChangeLog * patches/gnome-session-10-show-splash.diff * patches/gnome-session-12-hide-preference-options.diff * patches/gnome-session-10-trusted-extensions.diff * patches/gnome-session-06-indiana-splash-hack.diff * patches/gnome-session-18-compiz-by-default.diff * patches/gnome-session-08-trusted-extensions.diff * patches/gnome-session-12-null-string.diff * patches/gnome-session-09-null-string.diff * patches/gnome-session-07-logout-dialog.diff * patches/gnome-session-13-show-splash.diff * patches/gnome-session-14-null-dbus-path.diff * patches/gnome-session-02-gnome-about.diff * patches/gnome-session-13-compiz-by-default.diff * patches/gnome-session-15-hide-preference-options.diff * patches/gnome-session-11-null-dbus-path.diff * patches/gnome-session-09-logout-dialog.diff * patches/gnome-session-08-indiana-splash-hack.diff * SUNWgnome-session.spec * base-specs/gnome-session.spec
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15330
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset 
     1
 
Binary files gnome-session-2.25.92/data/gnome-splash.png and ../SUNWgnome-session-2.25.91.p2/gnome-session-2.25.92/data/gnome-splash.png differ
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset 
     2
 
diff -urN -x'*.orig' -x'*.rej' gnome-session-2.25.92/gnome-session/gsm-manager.c ../SUNWgnome-session-2.25.91.p2/gnome-session-2.25.92/gnome-session/gsm-manager.c
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset 
     3
 
--- gnome-session-2.25.92/gnome-session/gsm-manager.c	2009-03-03 16:58:00.000000000 +0000
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset 
     4
 
+++ ../SUNWgnome-session-2.25.91.p2/gnome-session-2.25.92/gnome-session/gsm-manager.c	2009-03-09 15:35:49.160894000 +0000
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset 
     5
 
@@ -356,6 +356,23 @@
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);
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
     8
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset 
     9
 
+#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 
    10
 
+
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    11
 
+static gint
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    12
 
+show_gnome_about (gpointer data)
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    13
 
+{
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    14
 
+	int status;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    15
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    16
 
+	if (g_spawn_command_line_async("gnome-about", NULL))
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    17
 
+	{
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    18
 
+		GConfClient *gconf_client = gconf_client_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    19
 
+		gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    20
 
+		g_object_unref (gconf_client);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    21
 
+	}
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    22
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    23
 
+	return FALSE;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    24
 
+}
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    25
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    26
 
 static void
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    27
 
 end_phase (GsmManager *manager)
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset 
    28
 
 {
15330
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset 
    29
 
@@ -1089,6 +1106,9 @@
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    30
 
 void
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    31
 
 gsm_manager_start (GsmManager *manager)
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    32
 
 {
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    33
 
+	gboolean show_about;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    34
 
+	GConfClient *gconf_client;
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset 
    35
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    36
 
         g_debug ("GsmManager: GSM starting to manage");
13056
0a67822e2c77 2008-08-06 Ghee Teo <[email protected]>
gheet
parents: 13029
diff changeset 
    37
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    38
 
         g_return_if_fail (GSM_IS_MANAGER (manager));
15330
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset 
    39
 
@@ -1096,6 +1116,10 @@
a935e2c278b2 2009-03-09 ghee teo <[email protected]>
gheet
parents: 13218
diff changeset 
    40
 
         gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_INITIALIZATION);
13218
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    41
 
         debug_app_summary (manager);
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    42
 
         start_phase (manager);
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset 
    43
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    44
 
+	gconf_client = gconf_client_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    45
 
+	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 
    46
 
+	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 
    47
 
 }
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    48
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    49
 
 static gboolean
upstream/oracle/spec-files