gnome-session r4846 - in branches/dbus_based: . data splash

[mccann svn gnome org]

Author: mccann
Date: Fri Jul 25 03:25:22 2008
New Revision: 4846
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4846&view=rev

Log:
2008-07-24  William Jon McCann  <jmccann redhat com>

	* data/gnome-session.schemas.in:
	* splash/Makefile.am:
	* splash/README:
	* splash/gnome-session-splash.c:
	* splash/gnome-session-splash.desktop.in:
	* splash/splash-window.c:
	* splash/splash-window.h:
	Make startup faster by removing the splash.



Removed:
   branches/dbus_based/splash/gnome-session-splash.c
   branches/dbus_based/splash/gnome-session-splash.desktop.in
   branches/dbus_based/splash/splash-window.c
   branches/dbus_based/splash/splash-window.h
Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/data/gnome-session.schemas.in
   branches/dbus_based/splash/Makefile.am
   branches/dbus_based/splash/README

Modified: branches/dbus_based/data/gnome-session.schemas.in
==============================================================================
--- branches/dbus_based/data/gnome-session.schemas.in	(original)
+++ branches/dbus_based/data/gnome-session.schemas.in	Fri Jul 25 03:25:22 2008
@@ -2,17 +2,6 @@
 <gconfschemafile>
    <schemalist>
       <schema>
-         <key>/schemas/apps/gnome-session/options/show_splash_screen</key>
-         <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
-         <owner>gnome</owner>
-         <type>bool</type>
-         <default>true</default>
-         <locale name="C">
-            <short>Show the splash screen</short>
-            <long>Show the splash screen when the session starts up</long>
-         </locale>
-      </schema>
-      <schema>
          <key>/schemas/apps/gnome-session/options/auto_save_session</key>
          <applyto>/apps/gnome-session/options/auto_save_session</applyto>
          <owner>gnome</owner>
@@ -35,17 +24,6 @@
          </locale>
       </schema>
       <schema>
-         <key>/schemas/apps/gnome-session/options/splash_image</key>
-         <applyto>/apps/gnome-session/options/splash_image</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
-         <default>splash/gnome-splash.png</default>
-         <locale name="C">
-            <short>Preferred Image to use for login splash screen</short>
-            <long>This is a relative path value based off the $datadir/pixmaps/ directory.  Sub-directories and image names are valid values. Changing this value will effect the next session login.</long>
-         </locale>
-      </schema>
-      <schema>
          <key>/schemas/apps/gnome-session/options/logout_option</key>
          <applyto>/apps/gnome-session/options/logout_option</applyto>
          <owner>gnome</owner>

Modified: branches/dbus_based/splash/Makefile.am
==============================================================================
--- branches/dbus_based/splash/Makefile.am	(original)
+++ branches/dbus_based/splash/Makefile.am	Fri Jul 25 03:25:22 2008
@@ -10,7 +10,6 @@
 
 helperdir = $(pkglibdir)/helpers
 helper_PROGRAMS =				\
-	gnome-session-splash			\
 	gnome-login-sound
 
 shutdowndir = $(datadir)/gnome/shutdown
@@ -19,18 +18,8 @@
 
 default_sessiondir = $(datadir)/gnome/autostart
 default_session_DATA =				\
-	gnome-session-splash.desktop		\
 	gnome-login-sound.desktop
 
-gnome_session_splash_SOURCES =			\
-	gnome-session-splash.c			\
-	splash-window.c				\
-	splash-window.h
-gnome_session_splash_LDADD =			\
-	$(STARTUP_NOTIFICATION_LIBS)		\
-	$(DBUS_GLIB_LIBS)			\
-	$(LDADD)
-
 gnome_login_sound_SOURCES =			\
 	gnome-login-sound.c
 
@@ -43,6 +32,5 @@
 
 EXTRA_DIST =					\
 	README					\
-	gnome-session-splash.desktop.in		\
 	gnome-login-sound.desktop.in		\
 	gnome-logout-sound.sh

Modified: branches/dbus_based/splash/README
==============================================================================
--- branches/dbus_based/splash/README	(original)
+++ branches/dbus_based/splash/README	Fri Jul 25 03:25:22 2008
@@ -1,14 +1,7 @@
-This directory contains three small programs used at startup or
+This directory contains two small programs used at startup or
 shutdown to do some user-notificationy things that used to be handled
 directly by gnome-session.
 
-  * gnome-session-splash: This provides the splash screen. It is
-    mostly a straight port of the old gnome-session splash screen, but
-    modified to get its data from Startup Notification rather than
-    having gnome-session directly provide it with binary names, and
-    then looking those binary names up in a hardcoded list in hopes of
-    finding localized names and icons.
-
   * gnome-login-sound: This plays the login sound. If invoked with the
     "--logout" flag, it plays the logout sound instead.