[gnome-session] Remove the splash program

[Paolo Borelli <pborelli src gnome org>]

commit cda5b398f5c4043923d2c7a784e2294ae96a2079
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Jul 24 18:03:44 2010 +0200

    Remove the splash program
    
    The splash screen has been off by default in the last few releases so
    lets just drop it for 3.0.

 Makefile.am                                  |    8 +-
 configure.in                                 |   20 -
 data/Makefile.am                             |    6 -
 data/gnome-session.schemas.in.in             |   22 -
 data/gnome-splash.png                        |  Bin 37056 -> 0 bytes
 po/POTFILES.in                               |    2 -
 po/POTFILES.skip                             |    2 -
 splash/Makefile.am                           |   48 ---
 splash/README                                |   17 -
 splash/gnome-session-splash.c                |  345 ----------------
 splash/gnome-session-splash.desktop.in.in.in |   14 -
 splash/splash-window.c                       |  558 --------------------------
 splash/splash-window.h                       |   69 ----
 13 files changed, 2 insertions(+), 1109 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c03ae54..718f195 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,10 +7,6 @@ SUBDIRS =			\
 	doc			\
 	data
 
-if ENABLE_SPLASH
-SUBDIRS += splash
-endif
-
 ACLOCAL_AMFLAGS = -I m4
 
 MAINTAINERCLEANFILES = \
@@ -24,8 +20,8 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs \
-	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(srcdir)/configure \
-	$(srcdir)/m4/intltool.m4
+	$(srcdir)/m4/intltool.m4 \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.in b/configure.in
index b96e0b1..b8c291f 100644
--- a/configure.in
+++ b/configure.in
@@ -60,13 +60,6 @@ PKG_CHECK_MODULES(SESSION_PROPERTIES,
         gtk+-3.0 >= $GTK_REQUIRED
 )
 
-PKG_CHECK_MODULES(SPLASH,
-        glib-2.0 >= $GLIB_REQUIRED
-        gtk+-3.0 >= $GTK_REQUIRED
-        dbus-glib-1 >= $DBUS_GLIB_REQUIRED
-        libstartup-notification-1.0
-        gconf-2.0)
-
 PKG_CHECK_MODULES(SM, sm)
 PKG_CHECK_MODULES(ICE, ice)
 PKG_CHECK_MODULES(XEXT, xext xau)
@@ -90,16 +83,6 @@ AC_SUBST(DEFAULT_WM)
 AM_CONDITIONAL(USE_GNOME_WM, test x$with_default_wm = xgnome-wm)
 
 dnl ====================================================================
-dnl Option to enable the splash screen
-dnl ====================================================================
-AC_ARG_ENABLE(splash,
-              [AC_HELP_STRING([--enable-splash],
-                              [enable splash screen @<:@default=no@:>@])],,
-              [enable_splash=no])
-
-AM_CONDITIONAL(ENABLE_SPLASH, test x$enable_splash = xyes)
-
-dnl ====================================================================
 dnl GConf Checks
 dnl ====================================================================
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
@@ -352,8 +335,6 @@ data/icons/48x48/Makefile
 data/icons/scalable/Makefile
 egg/Makefile
 gnome-session/Makefile
-splash/Makefile
-splash/gnome-session-splash.desktop.in.in
 tools/Makefile
 po/Makefile.in
 ])
@@ -386,7 +367,6 @@ echo "
         XRender support:          ${have_xrender}
         XSync support:            ${have_xsync}
         XTest support:            ${have_xtest}
-        Build splash:             ${enable_splash}
         Build documentation:      ${enable_docbook_docs}
 
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index 8899c5b..3037a1d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,12 +16,6 @@ xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_SCHEMAS_RULE@
 
-pixmap_DATA_dist = gnome-splash.png
-if ENABLE_SPLASH
-pixmapdir = $(datadir)/pixmaps/splash/
-pixmap_DATA = $(pixmap_DATA_dist)
-endif
-
 schemas_in_in_files = gnome-session.schemas.in.in
 schemas_in_files = $(schemas_in_in_files:.schemas.in.in=.schemas.in)
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/data/gnome-session.schemas.in.in b/data/gnome-session.schemas.in.in
index bd818eb..4e5d87d 100644
--- a/data/gnome-session.schemas.in.in
+++ b/data/gnome-session.schemas.in.in
@@ -3,17 +3,6 @@
    <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>false</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>
@@ -36,17 +25,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 affect the next session login.</long>
-         </locale>
-      </schema>
-      <schema>
         <key>/schemas/desktop/gnome/session/idle_delay</key>
         <applyto>/desktop/gnome/session/idle_delay</applyto>
         <owner>gnome</owner>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4ad0212..7fce90f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,6 +20,4 @@ gnome-session/gsm-xsmp-client.c
 gnome-session/gsm-xsmp-server.c
 gnome-session/gsm-util.c
 gnome-session/main.c
-splash/gnome-session-splash.c
-splash/gnome-session-splash.desktop.in.in.in
 tools/gnome-session-save.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index f63361f..78f8fe7 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -4,5 +4,3 @@
 data/gnome-session.schemas.in
 data/gnome-wm.desktop.in
 data/session-properties.desktop.in
-splash/gnome-session-splash.desktop.in
-splash/gnome-session-splash.desktop.in.in