Drop splash screens

9 files changed, 14 insertions, 1116 deletions

diff --git a/settings/Makefile.am b/settings/Makefile.am
index f629b518..4c85c44e 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -2,10 +2,7 @@ bin_PROGRAMS = xfce4-session-settings
 
 xfce4_session_settings_SOURCES = \
 	main.c \
-	module.c \
-	module.h \
 	session-editor.c \
-	splash-settings.c \
 	xfae-dialog.c \
 	xfae-dialog.h \
 	xfae-model.c \
@@ -23,7 +20,6 @@ xfce4_session_settings_SOURCES = \
 
 xfce4_session_settings_CFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DMODULESDIR=\"$(libdir)/xfce4/session/splash-engines\" \
 	-DG_LOG_DOMAIN=\"xfce4-session-settings\" \
 	-I$(top_srcdir) \
 	$(LIBXFCE4UTIL_CFLAGS) \
diff --git a/settings/main.c b/settings/main.c
index 8786706b..cd488c7b 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -123,7 +123,6 @@ main(int argc,
         return EXIT_FAILURE;
     }
 
-    splash_settings_init(builder);
     session_editor_init(builder);
 
     /* FIXME: someday, glade-ify this, maybe. */
@@ -132,7 +131,7 @@ main(int argc,
     notebook = GTK_WIDGET(gtk_builder_get_object(builder, "plug-child"));
     lbl = gtk_label_new_with_mnemonic(_("App_lication Autostart"));
     gtk_widget_show(lbl);
-    gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), xfae_page, lbl, 2);
+    gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), xfae_page, lbl, 1);
 
     channel = xfconf_channel_get(SETTINGS_CHANNEL);
 
diff --git a/settings/module.c b/settings/module.c
deleted file mode 100644
index 8b0dc3b3..00000000
--- a/settings/module.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2003-2004 Benedikt Meurer <benny@xfce.org>
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <gmodule.h>
-
-#include <libxfce4ui/libxfce4ui.h>
-
-#include <libxfsm/xfsm-splash-engine.h>
-#include <libxfsm/xfsm-splash-rc.h>
-
-#include "module.h"
-
-
-struct _Module
-{
-  gchar             *engine;
-  GModule           *handle;
-  XfsmSplashConfig   config;
-};
-
-
-
-Module*
-module_load (const gchar *path,
-             const gchar *channel_name)
-{
-  void (*init) (XfsmSplashConfig *config);
-  Module *module;
-  gchar          property_base[512];
-  XfconfChannel *channel;
-  gchar         *dp;
-  gchar         *sp;
-
-  /* load module */
-  module = g_new0 (Module, 1);
-#if GLIB_CHECK_VERSION(2,4,0)
-  module->handle = g_module_open (path, G_MODULE_BIND_LOCAL);
-#else
-  module->handle = g_module_open (path, 0);
-#endif
-  if (G_UNLIKELY (module->handle == NULL))
-    goto error0;
-  if (!g_module_symbol (module->handle, "config_init", (gpointer)&init))
-    goto error1;
-
-  /* determine engine name */
-  sp = module->engine = g_path_get_basename (path);
-  if (sp[0] == 'l' && sp[1] == 'i' && sp[2] == 'b')
-    sp += 3;
-  for (dp = module->engine; *sp != '\0'; ++dp, ++sp)
-    {
-      if (*sp == '.')
-        break;
-      else
-        *dp = *sp;
-    }
-  *dp = '\0';
-
-  g_snprintf (property_base, sizeof (property_base),
-              "/splash/engines/%s", module->engine);
-  channel = xfconf_channel_new_with_property_base (channel_name,
-                                                   property_base);
-
-  /* initialize module */
-  module->config.rc = xfsm_splash_rc_new (channel);
-  g_object_unref (channel);
-  init (&module->config);
-  if (G_UNLIKELY (module->config.name == NULL))
-    {
-      module_free (module);
-      return NULL;
-    }
-
-  /* succeed */
-  return module;
-
-error1:
-  g_module_close (module->handle);
-error0:
-  g_free (module);
-  return NULL;
-}
-
-
-const gchar*
-module_engine (const Module *module)
-{
-  return module->engine;
-}
-
-
-const gchar*
-module_name (const Module *module)
-{
-  return module->config.name;
-}
-
-
-const gchar*
-module_descr (const Module *module)
-{
-  return module->config.description;
-}
-
-
-const gchar*
-module_version (const Module *module)
-{
-  return module->config.version;
-}
-
-
-const gchar*
-module_author (const Module *module)
-{
-  return module->config.author;
-}
-
-
-const gchar*
-module_homepage (const Module *module)
-{
-  return module->config.homepage;
-}
-
-
-GdkPixbuf*
-module_preview (Module *module)
-{
-  if (G_LIKELY (module->config.preview != NULL))
-    return module->config.preview (&module->config);
-  else
-    return NULL;
-}
-
-
-gboolean
-module_can_configure (const Module *module)
-{
-  return module->config.configure != NULL;
-}
-
-
-void
-module_configure (Module    *module,
-                  GtkWidget *parent)
-{
-  if (G_LIKELY (module->config.configure != NULL))
-    module->config.configure (&module->config, parent);
-}
-
-
-void
-module_test (Module     *module,
-             GdkDisplay *display)
-{
-  static char *steps[] =
-  {
-    "Starting the Window Manager",
-    "Starting the Desktop Manager",
-    "Starting the Taskbar",
-    "Starting the Panel",
-    NULL,
-  };
-
-  void (*init) (XfsmSplashEngine *engine);
-  XfsmSplashEngine  engine;
-  GdkScreen        *screen;
-  guint             id;
-  int               monitor;
-  int               step;
-
-  /* properly initialize the engine struct with zeros! */
-  bzero (&engine, sizeof (engine));
-
-  /* locate monitor with pointer */
-  screen = xfce_gdk_screen_get_active (&monitor);
-  if (G_UNLIKELY (screen == NULL) || (gdk_screen_get_display(screen) != display))
-    {
-      screen  = gdk_display_get_default_screen (display);
-      monitor = 0;
-    }
-
-  /* initialize engine struct */
-  engine.display          = display;
-  engine.primary_screen   = screen;
-  engine.primary_monitor  = monitor;
-
-  /* load and setup the engine */
-  if (g_module_symbol (module->handle, "engine_init", (gpointer)&init))
-    {
-      init (&engine);
-
-      if (G_LIKELY (engine.setup != NULL))
-        {
-          engine.setup (&engine, module->config.rc);
-          gdk_flush ();
-        }
-
-      if (G_LIKELY (engine.start != NULL))
-        {
-          engine.start (&engine, "Default", NULL, 4);
-          gdk_flush ();
-        }
-
-      if (G_LIKELY (engine.next != NULL))
-        {
-          for (step = 0; steps[step] != NULL; ++step)
-            {
-              engine.next (&engine, steps[step]);
-              id = g_timeout_add (1000, (GSourceFunc) gtk_main_quit, NULL);
-              gtk_main ();
-              g_source_remove (id);
-            }
-        }
-
-      if (G_LIKELY (engine.destroy != NULL))
-        engine.destroy (&engine);
-    }
-}
-
-
-void
-module_free (Module *module)
-{
-  if (G_LIKELY (module->config.destroy != NULL))
-    module->config.destroy (&module->config);
-
-  if (G_LIKELY (module->config.name != NULL))
-    g_free (module->config.name);
-
-  if (G_LIKELY (module->config.description != NULL))
-    g_free (module->config.description);
-
-  if (G_LIKELY (module->config.version != NULL))
-    g_free (module->config.version);
-
-  if (G_LIKELY (module->config.author != NULL))
-    g_free (module->config.author);
-
-  if (G_LIKELY (module->config.homepage != NULL))
-    g_free (module->config.homepage);
-
-  xfsm_splash_rc_free (module->config.rc);
-  g_module_close (module->handle);
-  g_free (module->engine);
-  g_free (module);
-}
-
-
-
-
diff --git a/settings/module.h b/settings/module.h
deleted file mode 100644
index c2a6e29e..00000000
--- a/settings/module.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2003-2004 Benedikt Meurer <benny@xfce.org>
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- */
-
-#ifndef __MODULE_H__
-#define __MODULE_H__
-
-#include <gtk/gtk.h>
-
-#include <libxfce4util/libxfce4util.h>
-
-
-G_BEGIN_DECLS;
-
-#define MODULE(obj) ((Module *)(obj))
-
-typedef struct _Module Module;
-
-
-Module      *module_load          (const gchar *path,
-                                   const gchar *channel_name);
-
-const gchar *module_engine        (const Module *module);
-
-const gchar *module_name          (const Module *module);
-
-const gchar *module_descr         (const Module *module);
-
-const gchar *module_version       (const Module *module);
-
-const gchar *module_author        (const Module *module);
-
-const gchar *module_homepage      (const Module *module);
-
-GdkPixbuf   *module_preview       (Module       *module);
-
-gboolean     module_can_configure (const Module *module);
-
-void         module_configure     (Module       *module,
-                                   GtkWidget    *parent);
-
-void         module_test          (Module       *module,
-                                   GdkDisplay   *display);
-
-void         module_free          (Module       *module);
-
-G_END_DECLS;
-
-
-#endif /* !__XFSM_SPLASH_MODULE_H__ */
diff --git a/settings/splash-settings.c b/settings/splash-settings.c
deleted file mode 100644
index 4892cf82..00000000
--- a/settings/splash-settings.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2003-2006 Benedikt Meurer <benny@xfce.org>
- * Copyright (c) 2008 Jannis Pohlmann <jannis@xfce.org>
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#ifndef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef XFCE_DISABLE_DEPRECATED
-#undef XFCE_DISABLE_DEPRECATED
-#endif
-
-#include <xfconf/xfconf.h>
-
-#include <gdk-pixbuf/gdk-pixdata.h>
-#include <gmodule.h>
-#include <gtk/gtk.h>
-
-#include <libxfce4ui/libxfce4ui.h>
-
-#include <libxfsm/xfsm-util.h>
-#include <libxfsm/xfsm-splash-engine.h>
-
-#include "module.h"
-#include "xfce4-session-settings-common.h"
-
-#define SPLASH_ENGINE_PROP  "/splash/Engine"
-
-/*
-   Prototypes
- */
-static void splash_selection_changed (GtkTreeSelection *selection);
-
-
-/*
-   Declarations
- */
-enum
-{
-  COLUMN_NAME,
-  COLUMN_MODULE,
-  N_COLUMNS,
-};
-
-
-/*
-   Global variables
- */
-static GList       *modules = NULL;
-static XfceRc      *modules_rc = NULL;
-static gboolean     kiosk_can_splash = FALSE;
-static gboolean     splash_centered;
-static GtkWidget   *splash_dialog = NULL;
-static GtkWidget   *splash_treeview;
-static GtkWidget   *splash_button_cfg;
-static GtkWidget   *splash_button_test;
-static GtkWidget   *splash_image;
-static GtkWidget   *splash_descr0;
-static GtkWidget   *splash_descr1;
-static GtkWidget   *splash_version0;
-static GtkWidget   *splash_version1;
-static GtkWidget   *splash_author0;
-static GtkWidget   *splash_author1;
-static GtkWidget   *splash_www0;
-static GtkWidget   *splash_www1;
-
-
-/*
-   Module loading/unloading
- */
-static void
-splash_load_modules (void)
-{
-  const gchar *entry;
-  Module      *module;
-  gchar       *file;
-  GDir        *dir;
-
-  modules_rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG,
-                                    "xfce4-session/xfce4-splash.rc",
-                                    FALSE);
-
-  dir = g_dir_open (MODULESDIR, 0, NULL);
-  if (G_LIKELY (dir != NULL))
-    {
-      while ((entry = g_dir_read_name (dir)) != NULL)
-        {
-          if (*entry == '\0' || *entry == '.')
-            continue;
-
-          if (!g_str_has_suffix (entry, "." G_MODULE_SUFFIX))
-            continue;
-
-          file = g_strconcat (MODULESDIR, G_DIR_SEPARATOR_S, entry, NULL);
-          module = module_load (file, SETTINGS_CHANNEL);
-          if (G_LIKELY (module != NULL))
-            modules = g_list_append (modules, module);
-          g_free (file);
-        }
-
-      g_dir_close (dir);
-    }
-}
-
-
-static void
-splash_unload_modules (void)
-{
-  GList *lp;
-
-  if (G_LIKELY (modules != NULL))
-    {
-      for (lp = modules; lp != NULL; lp = lp->next)
-        module_free (MODULE (lp->data));
-      g_list_free (modules);
-      modules = NULL;
-    }
-
-  if (G_LIKELY (modules_rc != NULL))
-    {
-      xfce_rc_close (modules_rc);
-      modules_rc = NULL;
-    }
-}
-
-
-static void
-splash_configure (void)
-{
-  GtkTreeSelection *selection;
-  GtkTreeModel     *model;
-  GtkTreeIter       iter;
-  Module           *module;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (splash_treeview));
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      gtk_tree_model_get (model, &iter, COLUMN_MODULE, &module, -1);
-      module_configure (module, splash_dialog);
-      splash_selection_changed (selection);
-      xfce_rc_flush (modules_rc);
-    }
-}
-
-
-static void
-splash_test (void)
-{
-  GtkTreeSelection *selection;
-  GtkTreeModel     *model;
-  GtkTreeIter       iter;
-  Module           *module;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (splash_treeview));
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      gtk_tree_model_get (model, &iter, COLUMN_MODULE, &module, -1);
-      gtk_widget_set_sensitive (splash_dialog, FALSE);
-      module_test (module, gtk_widget_get_display (splash_dialog));
-      gtk_widget_set_sensitive (splash_dialog, TRUE);
-    }
-}
-
-
-static void
-splash_selection_changed (GtkTreeSelection *selection)
-{
-  XfconfChannel *channel;
-  GtkTreeModel  *model;
-  GtkTreeIter    iter;
-  const gchar   *str;
-  GdkPixbuf     *preview;
-  Module        *module;
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    {
-      gtk_tree_model_get (model, &iter, COLUMN_MODULE, &module, -1);
-
-      if (module != NULL)
-        {
-          str = module_descr (module);
-          if (G_LIKELY (str != NULL))
-            {
-              gtk_label_set_text (GTK_LABEL (splash_descr1), str);
-              gtk_widget_show (splash_descr0);
-              gtk_widget_show (splash_descr1);
-            }
-          else
-            {
-              gtk_widget_hide (splash_descr0);
-              gtk_widget_hide (splash_descr1);
-            }
-          gtk_widget_set_sensitive (splash_descr1, TRUE);
-
-          str = module_version (module);
-          if (G_LIKELY (str != NULL))
-            {
-              gtk_label_set_text (GTK_LABEL (splash_version1), str);
-              gtk_widget_show (splash_version0);
-              gtk_widget_show (splash_version1);
-            }
-          else
-            {
-              gtk_widget_hide (splash_version0);
-              gtk_widget_hide (splash_version1);
-            }
-          gtk_widget_set_sensitive (splash_version1, TRUE);
-
-          str = module_author (module);
-          if (G_LIKELY (str != NULL))
-            {
-              gtk_label_set_text (GTK_LABEL (splash_author1), str);
-              gtk_widget_show (splash_author0);
-              gtk_widget_show (splash_author1);
-            }
-          else
-            {
-              gtk_widget_hide (splash_author0);
-              gtk_widget_hide (splash_author1);
-            }
-          gtk_widget_set_sensitive (splash_author1, TRUE);
-
-          str = module_homepage (module);
-          if (G_LIKELY (str != NULL))
-            {
-              gtk_label_set_text (GTK_LABEL (splash_www1), str);
-              gtk_widget_show (splash_www0);
-              gtk_widget_show (splash_www1);
-            }
-          else
-            {
-              gtk_widget_hide (splash_www0);
-              gtk_widget_hide (splash_www1);
-            }
-          gtk_widget_set_sensitive (splash_www1, TRUE);
-
-          preview = module_preview (module);
-          if (G_LIKELY (preview != NULL))
-            {
-              gtk_image_set_from_pixbuf (GTK_IMAGE (splash_image), preview);
-              g_object_unref (G_OBJECT (preview));
-            }
-          else
-            {
-              gtk_image_set_from_icon_name (GTK_IMAGE (splash_image),
-                                            "image-missing",
-                                            GTK_ICON_SIZE_DIALOG);
-            }
-
-          channel = xfconf_channel_get (SETTINGS_CHANNEL);
-          xfconf_channel_set_string (channel, SPLASH_ENGINE_PROP, module_engine (module));
-
-          gtk_widget_set_sensitive (splash_button_cfg, kiosk_can_splash
-                                 && module_can_configure (module));
-          gtk_widget_set_sensitive (splash_button_test, TRUE);
-        }
-      else
-        {
-          gtk_image_set_from_icon_name (GTK_IMAGE (splash_image),
-                                        "image-missing",
-                                        GTK_ICON_SIZE_DIALOG);
-
-          gtk_label_set_text (GTK_LABEL (splash_descr1), _("None"));
-          gtk_widget_set_sensitive (splash_descr1, FALSE);
-
-          gtk_label_set_text (GTK_LABEL (splash_version1), _("None"));
-          gtk_widget_set_sensitive (splash_version1, FALSE);
-
-          gtk_label_set_text (GTK_LABEL (splash_author1), _("None"));
-          gtk_widget_set_sensitive (splash_author1, FALSE);
-
-          gtk_label_set_text (GTK_LABEL (splash_www1), _("None"));
-          gtk_widget_set_sensitive (splash_www1, FALSE);
-
-          gtk_widget_set_sensitive (splash_button_cfg, FALSE);
-          gtk_widget_set_sensitive (splash_button_test, FALSE);
-
-          channel = xfconf_channel_get (SETTINGS_CHANNEL);
-          xfconf_channel_set_string (channel, SPLASH_ENGINE_PROP, "");
-        }
-    }
-
-  /* centering must be delayed! */
-  if (!splash_centered)
-    {
-      xfce_gtk_window_center_on_active_screen(GTK_WINDOW(splash_dialog));
-      splash_centered = TRUE;
-    }
-}
-
-
-static void
-splash_dialog_destroy (GtkWidget *widget,
-                       gpointer user_data)
-{
-  splash_unload_modules ();
-}
-
-
-void
-splash_settings_init (GtkBuilder *builder)
-{
-  XfconfChannel     *channel;
-  GtkTreeSelection  *selection;
-  GtkTreeViewColumn *column;
-  GtkCellRenderer   *renderer;
-  GtkListStore      *store;
-  gchar             *engine;
-  GtkTreePath       *path;
-  GtkTreeIter        iter;
-  XfceKiosk         *kiosk;
-  GList             *lp;
-
-  /* load splash modules */
-  splash_load_modules ();
-
-  /* query kiosk settings */
-  kiosk = xfce_kiosk_new ("xfce4-session");
-  kiosk_can_splash = xfce_kiosk_query (kiosk, "Splash") || xfce_kiosk_query (kiosk, "CustomizeSplash");
-  xfce_kiosk_free (kiosk);
-
-  /* load config */
-  channel = xfconf_channel_get (SETTINGS_CHANNEL);
-  engine = xfconf_channel_get_string (channel, SPLASH_ENGINE_PROP, "");
-
-  store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER);
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter,
-                      COLUMN_NAME, _("None"),
-                      COLUMN_MODULE, NULL,
-                      -1);
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
-
-  for (lp = modules; lp != NULL; lp = lp->next)
-    {
-      gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter,
-                          COLUMN_NAME, module_name (MODULE (lp->data)),
-                          COLUMN_MODULE, MODULE (lp->data),
-                          -1);
-
-      if (strcmp (module_engine (MODULE (lp->data)), engine) == 0)
-        {
-          gtk_tree_path_free (path);
-          path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
-        }
-    }
-
-  g_free (engine);
-
-  splash_centered = FALSE;
-
-  splash_treeview = GTK_WIDGET(gtk_builder_get_object (builder, "treeview_splash"));
-  gtk_tree_view_set_model (GTK_TREE_VIEW (splash_treeview), GTK_TREE_MODEL (store));
-  g_object_unref (G_OBJECT (store));
-
-  /* FIXME: this won't work right when we embed */
-  splash_dialog = gtk_widget_get_toplevel (splash_treeview);
-  g_signal_connect (G_OBJECT (splash_dialog), "destroy",
-                    G_CALLBACK (splash_dialog_destroy), NULL);
-
-  /* add tree view column */
-  column = gtk_tree_view_column_new ();
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_column_pack_start (column, renderer, FALSE);
-  gtk_tree_view_column_set_attributes (column, renderer,
-                                       "text", COLUMN_NAME,
-                                       NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (splash_treeview), column);
-
-  splash_button_cfg = GTK_WIDGET(gtk_builder_get_object (builder, "btn_splash_configure"));
-  g_signal_connect (G_OBJECT (splash_button_cfg), "clicked",
-                    splash_configure, NULL);
-
-  splash_button_test = GTK_WIDGET(gtk_builder_get_object (builder, "btn_splash_test"));
-  g_signal_connect (G_OBJECT (splash_button_test), "clicked",
-                    splash_test, NULL);
-
-  splash_image = GTK_WIDGET(gtk_builder_get_object (builder, "img_splash_preview"));
-  gtk_widget_set_size_request (splash_image, 300, 240);
-
-  splash_descr0 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_desc0"));
-  splash_version0 =GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_version0"));
-  splash_author0 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_author0"));
-  splash_www0 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_homepage0"));
-  splash_descr1 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_desc1"));
-  splash_version1 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_version1"));
-  splash_author1 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_author1"));
-  splash_www1 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_homepage1"));
-
-  /* handle selection */
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (splash_treeview));
-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-  g_signal_connect (G_OBJECT (selection), "changed",
-                    G_CALLBACK (splash_selection_changed), NULL);
-  gtk_tree_view_set_cursor (GTK_TREE_VIEW (splash_treeview), path, NULL, FALSE);
-  gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (splash_treeview), path, NULL,
-                                TRUE, 0.5, 0.0);
-  gtk_tree_path_free (path);
-}
diff --git a/settings/xfce-session-settings.desktop.in b/settings/xfce-session-settings.desktop.in
index 9c4dced3..1c1c3768 100644
--- a/settings/xfce-session-settings.desktop.in
+++ b/settings/xfce-session-settings.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=Session and Startup
-_Comment=Customize desktop startup and splash screen
+_Comment=Customize desktop startup
 Exec=xfce4-session-settings
 Icon=xfce4-session
 Terminal=false
diff --git a/settings/xfce4-session-settings-common.h b/settings/xfce4-session-settings-common.h
index 03623be9..3c1a11db 100644
--- a/settings/xfce4-session-settings-common.h
+++ b/settings/xfce4-session-settings-common.h
@@ -21,7 +21,6 @@
 
 #define  SETTINGS_CHANNEL  "xfce4-session"
 
-void splash_settings_init(GtkBuilder *builder);
 void session_editor_init(GtkBuilder *builder);
 
 #endif
diff --git a/settings/xfce4-session-settings.ui b/settings/xfce4-session-settings.ui
index f33536c5..307bfadf 100644
--- a/settings/xfce4-session-settings.ui
+++ b/settings/xfce4-session-settings.ui
@@ -56,7 +56,7 @@
             <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -201,329 +201,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="hbox2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">12</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkBox" id="vbox6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">etched-in</property>
-                        <child>
-                          <object class="GtkTreeView" id="treeview_splash">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="headers_visible">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection1"/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="btn_splash_configure">
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Opens the configuration panel for the selected splash screen</property>
-                        <child>
-                          <object class="GtkBox" id="hbox3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">4</property>
-                            <child>
-                              <object class="GtkImage" id="image2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">1</property>
-                                <property name="stock">gtk-preferences</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Con_figure</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">btn_splash_configure</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="btn_splash_test">
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Demonstrates the selected splash screen</property>
-                        <child>
-                          <object class="GtkBox" id="hbox4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">4</property>
-                            <child>
-                              <object class="GtkImage" id="image3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">1</property>
-                                <property name="stock">gtk-execute</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label12">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Test</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">btn_splash_test</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="vbox7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkImage" id="img_splash_preview">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="stock">gtk-missing-image</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="bottom_padding">4</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkGrid" id="table1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="row_spacing">2</property>
-                                <property name="column_spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="lbl_splash_desc0">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Description:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="lbl_splash_homepage1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">label</property>
-                                    <property name="selectable">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="lbl_splash_desc1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">label</property>
-                                    <property name="selectable">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="lbl_splash_version0">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Version:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="lbl_splash_version1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">label</property>
-                                    <property name="selectable">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="lbl_splash_author0">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Author:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="lbl_splash_author1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">label</property>
-                                    <property name="selectable">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="lbl_splash_homepage0">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Homepage:&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">3</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Information&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">S_plash</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkBox" id="vbox8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -751,7 +428,7 @@
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child type="tab">
@@ -762,7 +439,7 @@
                 <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -932,7 +609,7 @@
                 </child>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child type="tab">
@@ -943,15 +620,21 @@
                 <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="position">2</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
diff --git a/settings/xfce4-session.xml b/settings/xfce4-session.xml
index a1c87bdd..acb5afe3 100644
--- a/settings/xfce4-session.xml
+++ b/settings/xfce4-session.xml
@@ -32,7 +32,4 @@
       <property name="Client4_PerScreen" type="bool" value="false"/>
     </property>
   </property>
-  <property name="splash" type="empty">
-    <property name="Engine" type="string" value=""/>
-  </property>
 </channel>