patches/gnome-session-02-gnome-about.diff
author erwannc
Wed, 13 Aug 2008 14:56:46 +0000
changeset 13113 e0003844f498
parent 13088 d5eae28f14ef
child 13218 96755f314561
permissions -rw-r--r--
2008-08-13 Erwann Chenede - <[email protected]> * patches/gnome-session-10-logout-dialog.diff * patches/gnome-session-07-compiz-integration.diff * patches/gnome-session-05-solaris-branding.diff * patches/gnome-session-01-gnome-atom.diff * patches/gnome-session-04-busy-cursor.diff * patches/gnome-session-03-wait-for-postrun.diff * patches/gnome-session-02-gnome-about.diff * patches/gnome-session-08-indiana-splash-hack.diff * patches/gnome-session-13-missing-libs.diff : New build fix * base-specs/gnome-session.spec : bumped to 2.23.6 ported my patches, included Ghee's ported patches and commented out the others.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
     1
--- gnome-session-2.23.6/gnome-session/gsm-manager.c	2008-08-05 04:46:44.000000000 +0100
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
     2
+++ gnome-session-2.23.6/gnome-session/gsm-manager.c.new	2008-08-06 11:28:56.733523000 +0100
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
     3
@@ -318,6 +318,23 @@
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
     4
 
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
     5
 static void start_phase (GsmManager *manager);
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
     6
 
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset
     7
+#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
     8
+
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
     9
+static gint
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    10
+show_gnome_about (gpointer data)
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    11
+{
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    12
+	int status;
12752
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
+	if (g_spawn_command_line_async("gnome-about", NULL))
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    15
+	{
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    16
+		GConfClient *gconf_client = gconf_client_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    17
+		gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    18
+		g_object_unref (gconf_client);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    19
+	}
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    20
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    21
+	return FALSE;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    22
+}
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    23
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    24
 static void
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    25
 end_phase (GsmManager *manager)
13029
4be2c81a1c27 2008-08-05 Stephen Browne <[email protected]>
stephen
parents: 12752
diff changeset
    26
 {
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    27
@@ -970,6 +988,9 @@
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));
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    37
@@ -977,6 +998,11 @@
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    38
         manager->priv->phase = GSM_MANAGER_PHASE_INITIALIZATION;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    39
 
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
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    42
+	gconf_client = gconf_client_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    43
+	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
    44
+	if (!show_about) gtk_timeout_add (4000, show_gnome_about, NULL);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset
    45
+
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