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 davelam
Thu, 21 Aug 2008 08:32:17 +0000
changeset 13218 96755f314561
parent 13113 e0003844f498
child 15330 a935e2c278b2
permissions -rw-r--r--
2008-08-21 Dave Lin <[email protected]> * base-specs/gedit.spec: Bump to 2.23.90. * patches/gedit-02-gthread-dependency.diff: Removed the upstreamed patch. 2008-08-21 Dave Lin <[email protected]> * SUNWgnome-session.spec: Removed man5/default.session.5. * base-specs/gnome-session.spec: Bump to 2.23.90. * patches/gnome-session-01-gnome-atom.diff: Update. * patches/gnome-session-02-gnome-about.diff: Update. * patches/gnome-session-03-wait-for-postrun.diff: Update. * patches/gnome-session-07-compiz-integration.diff: Update. * patches/gnome-session-10-trusted-extensions.diff: Update. * patches/gnome-session-12-missing-libs.diff: Removed. * patches/gnome-session-13-gconf-schema.diff: Removed. * patches/gnome-session-14-gconftool-error.diff: Removed. * patches/gnome-session-12-null-string.diff: * patches/gnome-session-15-null-string.diff: Renamed to *-12-*
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13218
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
     1
 
diff -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
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
     2
 
--- gnome-session-2.23.7/gnome-session/gsm-manager.c	2008-08-18 15:07:31.000000000 +0100
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
     3
 
+++ ../SUNWgnome-session-2.23.7-p2/gnome-session-2.23.7/gnome-session/gsm-manager.c	2008-08-19 10:46:06.118671000 +0100
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
     4
 
@@ -337,6 +337,23 @@
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
     5
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
     6
 
 static void start_phase (GsmManager *manager);
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
     7
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
 
+{
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    13
 
+	int status;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    14
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    15
 
+	if (g_spawn_command_line_async("gnome-about", NULL))
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    16
 
+	{
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    17
 
+		GConfClient *gconf_client = gconf_client_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    18
 
+		gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    19
 
+		g_object_unref (gconf_client);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    20
 
+	}
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    21
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    22
 
+	return FALSE;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    23
 
+}
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    24
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    25
 
 static void
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    26
 
 end_phase (GsmManager *manager)
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset 
    27
 
 {
13218
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    28
 
@@ -1053,6 +1070,9 @@
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    29
 
 void
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    30
 
 gsm_manager_start (GsmManager *manager)
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    31
 
 {
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    32
 
+	gboolean show_about;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    33
 
+	GConfClient *gconf_client;
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset 
    34
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    35
 
         g_debug ("GsmManager: GSM starting to manage");
13056
0a67822e2c77 2008-08-06 Ghee Teo <[email protected]>
gheet
parents: 13029
diff changeset 
    36
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    37
 
         g_return_if_fail (GSM_IS_MANAGER (manager));
13218
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    38
 
@@ -1060,6 +1080,10 @@
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    39
 
         manager->priv->phase = GSM_MANAGER_PHASE_INITIALIZATION;
13218
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    40
 
         debug_app_summary (manager);
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    41
 
         start_phase (manager);
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset 
    42
 
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    43
 
+	gconf_client = gconf_client_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    44
 
+	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 
    45
 
+	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 
    46
 
 }
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset 
    47
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    48
 
 static gboolean
upstream/oracle/spec-files