diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2004-09-16 11:13:44 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2004-09-16 11:13:44 +0000 |
| commit | 08e66020a89df06e2cc9bfa0cdfc7ad2987f038d (patch) | |
| tree | f56d66c84c3c207243218d6c8fe3abdd1a76f88a /gnome-base/gnome-session | |
| parent | Marked stable on x86 (Manifest recommit) (diff) | |
| download | gentoo-2-08e66020a89df06e2cc9bfa0cdfc7ad2987f038d.tar.gz gentoo-2-08e66020a89df06e2cc9bfa0cdfc7ad2987f038d.tar.bz2 gentoo-2-08e66020a89df06e2cc9bfa0cdfc7ad2987f038d.zip | |
add splash patch
Diffstat (limited to 'gnome-base/gnome-session')
| -rw-r--r-- | gnome-base/gnome-session/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-base/gnome-session/files/gnome-session-2-hide_splash.patch | 52 | ||||
| -rw-r--r-- | gnome-base/gnome-session/gnome-session-2.8.0.ebuild | 6 |
3 files changed, 61 insertions, 2 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/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() { |