add splash patch

4 files changed, 64 insertions, 4 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index e5e35c0240e3..c350a2e964d5 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.77 2004/09/15 21:51:14 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.78 2004/09/16 11:13:44 foser Exp $
 
 *gnome-session-2.8.0 (15 Sep 2004)
 
+  16 Sep 2004; foser <foser@gentoo.org> gnome-session-2.8.0.ebuild, files/gnome-session-2-hide_splash.patch :
+  Add workaround patch to remove lingering splash (http://bugzilla.gnome.org/show_bug.cgi?id=116814)
+
   15 Sep 2004; foser <foser@gentoo.org> gnome-session-2.8.0.ebuild :
   Gnome 2.8 release
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 25904102d3e4..173f2f667840 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,8 +1,8 @@
 MD5 bad89e26a6330a28e23570c62e6620d6 gnome-session-2.6.2.ebuild 1364
-MD5 7e73cfd735a6cfd206b7b329ef4757c7 gnome-session-2.8.0.ebuild 1369
+MD5 8ac6ca2a8de479017f6cc366252aa67f gnome-session-2.8.0.ebuild 1542
 MD5 1a40398023ec2fe024110e31a72fa1b0 gnome-session-2.6.1.ebuild 1364
 MD5 a016b8df4641fc6486e374124922b784 gnome-session-2.4.2.ebuild 1314
-MD5 284c4fb3aaaf2100da2792852dadf7db ChangeLog 10030
+MD5 3a14d60976cb588cc1dae99cc0b4daef ChangeLog 10242
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 6fede0a1766b4660dde4632d1b01ca3f gnome-session-2.6.0.ebuild 1357
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
@@ -12,6 +12,7 @@ MD5 2491d6c88bbbdc63af18a9b01a0c5a0e files/digest-gnome-session-2.6.0 72
 MD5 ff0c34f7b3b38e54e77cccfed76a230d files/digest-gnome-session-2.6.1 72
 MD5 d71ad6bbed92ba29fddd9c12be898740 files/digest-gnome-session-2.6.2 72
 MD5 70b59c75e8a1ccc5b3d88f594082a4c3 files/digest-gnome-session-2.8.0 72
+MD5 9ef946bc879dec308dc85b43f1e6b29f files/gnome-session-2-hide_splash.patch 1584
 MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484
 MD5 f02a80d3f1435547a479312c15cc1030 files/gentoo-splash.png 78064
 MD5 9b6a487176c392343b5ce7eab34297af files/gnome-session-2.4-defaults.patch 1004
diff --git a/gnome-base/gnome-session/files/gnome-session-2-hide_splash.patch b/gnome-base/gnome-session/files/gnome-session-2-hide_splash.patch
new file mode 100644
index 000000000000..ebf6bef683dd
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2-hide_splash.patch
@@ -0,0 +1,52 @@
+Index: gnome-session/splash-widget.h
+===================================================================
+RCS file: /cvs/gnome/gnome-session/gnome-session/splash-widget.h,v
+retrieving revision 1.5
+diff -u -r1.5 splash-widget.h
+--- gnome-session/splash-widget.h	13 Feb 2003 22:29:57 -0000	1.5
++++ gnome-session/splash-widget.h	16 Jul 2004 04:17:00 -0000
+@@ -79,5 +79,6 @@
+ void splash_start  (void);
+ void splash_update (const gchar *text);
+ void splash_stop   (void);
++void splash_hide   (void);
+ 
+ #endif /* SPLASH_WIDGET_H */
+Index: gnome-session/splash-widget.c
+===================================================================
+RCS file: /cvs/gnome/gnome-session/gnome-session/splash-widget.c,v
+retrieving revision 1.12
+diff -u -r1.12 splash-widget.c
+--- gnome-session/splash-widget.c	14 Jun 2004 13:06:06 -0000	1.12
++++ gnome-session/splash-widget.c	16 Jul 2004 04:17:08 -0000
+@@ -600,3 +600,11 @@
+ 	}
+ }
+ 
++void
++splash_hide (void)
++{
++	if (global_splash) {
++		gtk_widget_hide (GTK_WIDGET (global_splash));
++	}
++}
++
+Index: gnome-session/manager.c
+===================================================================
+RCS file: /cvs/gnome/gnome-session/gnome-session/manager.c,v
+retrieving revision 1.78
+diff -u -r1.78 manager.c
+--- gnome-session/manager.c	25 Feb 2003 08:50:09 -0000	1.78
++++ gnome-session/manager.c	16 Jul 2004 04:17:32 -0000
+@@ -1165,8 +1165,10 @@
+ 	      if (pending_list)
+ 		runlevel = client->priority;
+ 	    }
+-	  if (pending_list)
++	  if (pending_list) {
++	    splash_hide();
+ 	    return;
++	  }
+ 	}
+       save_state = MANAGER_IDLE;
+       splash_stop ();
diff --git a/gnome-base/gnome-session/gnome-session-2.8.0.ebuild b/gnome-base/gnome-session/gnome-session-2.8.0.ebuild
index 6c8061d333ba..e11fafcf76a6 100644
--- a/gnome-base/gnome-session/gnome-session-2.8.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.8.0.ebuild,v 1.1 2004/09/15 21:51:14 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.8.0.ebuild,v 1.2 2004/09/16 11:13:44 foser Exp $
 
 inherit gnome2 eutils
 
@@ -41,6 +41,10 @@ src_unpack() {
 	# patch to set the Gentoo splash by default in the gconf key (#42687)
 	epatch ${FILESDIR}/${PN}-2.6-schema_defaults.patch
 
+	# Hide the splash after defaults have been loaded, a temp workaround
+	# for http://bugzilla.gnome.org/show_bug.cgi?id=116814
+	epatch ${FILESDIR}/${PN}-2-hide_splash.patch
+
 }
 
 src_install() {