23 files changed, 358 insertions, 251 deletions

diff --git a/NEWS b/NEWS
index c84b721d..9b9a37b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+20030713:
+---------
+	* Version 0.1.0
+	* Fixed problem with SaveYourself Phase2 being aborted (that
+	  should also correct the xfwm4 save problem).
+	* Fixed problem with "session control" window beeing undecorated
+	* Fix problem with users splash themes directory not being created
+	  when installing new themes
+	* Skip the splash screen window in tasklists and pagers (Gdk >= 2.2
+	  only for now, a netk version is on the way, see util.c)
+
 20030712:
 ---------
 	* Fixed tray icon problem
diff --git a/TODO b/TODO
index 5e107947..eb1031e1 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,3 @@
  * Honor SmRestartStyleHint
  * Add APM support
  * Use GScanner to parse splash.theme files?!
-
-Fix the following unknown problem:
-----------------------------------
-** (xfce4-session:6616): CRITICAL **: file manager.c: line 689 (save_yourself_done): assertion `state == MANAGER_CHECKPOINT || state == MANAGER_SHUTDOWN' failed
diff --git a/config.h.in b/config.h.in
index e212e376..11489228 100644
--- a/config.h.in
+++ b/config.h.in
@@ -54,6 +54,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `mkdir' function. */
+#undef HAVE_MKDIR
+
 /* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
diff --git a/configure b/configure
index e680ea93..f707233f 100755
--- a/configure
+++ b/configure
@@ -1753,7 +1753,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=xfce4-session
- VERSION=0.0.24
+ VERSION=0.1.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19469,7 +19469,8 @@ fi
 
 
 
-for ac_func in gethostname setenv sigaction
+
+for ac_func in gethostname mkdir setenv sigaction
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/configure.ac b/configure.ac
index eace5542..820dce63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([configure.ac])
 
 AM_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE([xfce4-session], [0.0.24])
+AM_INIT_AUTOMAKE([xfce4-session], [0.1.0])
 
 AM_MAINTAINER_MODE
 
@@ -23,7 +23,7 @@ AC_PROG_LIBTOOL
 
 dnl check for standard header files
 AC_HEADER_STDC
-AC_CHECK_FUNCS([gethostname setenv sigaction])
+AC_CHECK_FUNCS([gethostname mkdir setenv sigaction])
 AC_CHECK_HEADERS([errno.h fcntl.h limits.h signal.h sys/param.h sys/utsname.h \
   sys/wait.h time.h])
 
diff --git a/po/de.gmo b/po/de.gmo
index 07800d9a..bdde3360 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index e39cef1b..d7339842 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XFSession 0.0.15\n"
-"POT-Creation-Date: 2003-07-13 10:10+0200\n"
+"POT-Creation-Date: 2003-07-13 18:14+0200\n"
 "PO-Revision-Date: 2003-07-011 20:10+0100\n"
 "Last-Translator: Moritz Heiber <moritz-heiber@arcor.de>\n"
 "Language-Team: none <none@none>\n"
@@ -13,80 +13,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings/session.c:219
+#: settings/session.c:226
 msgid "Default Theme"
 msgstr "Default Theme"
 
-#: settings/session.c:224
+#: settings/session.c:231
 msgid "Default splash screen"
 msgstr "Default Splashscreen"
 
-#: settings/session.c:263
+#: settings/session.c:270
 #, c-format
 msgid "About %s..."
 msgstr "Über %s..."
 
-#: settings/session.c:285
+#: settings/session.c:292
 msgid "Info:"
 msgstr "Info:"
 
-#: settings/session.c:293
+#: settings/session.c:300
 msgid "Author:"
 msgstr "Autor:"
 
-#: settings/session.c:360
+#: settings/session.c:376
 #, c-format
 msgid "Unable to install splash theme from file %s: %s"
 msgstr "Kann Splashtheme aus %s nicht installieren: %s"
 
-#: settings/session.c:381 settings/session.c:684
+#: settings/session.c:397 settings/session.c:700
 msgid "Install new theme"
 msgstr "Neues Theme installieren"
 
-#: settings/session.c:450 settings/session.c:561 settings/session.c:575
+#: settings/session.c:466 settings/session.c:577 settings/session.c:591
 msgid "Session management"
 msgstr "Sitzungsmanagement"
 
 #. General settings
-#: settings/session.c:586
+#: settings/session.c:602
 msgid "General"
 msgstr "Allgemeine Einstellungen"
 
 #.
-#: settings/session.c:595
+#: settings/session.c:611
 msgid "Confirm logout"
 msgstr "Ausloggen bestätigen"
 
-#: settings/session.c:604
+#: settings/session.c:620
 msgid "Automatically save session on logout"
 msgstr "Sitzung automatisch beim Beenden speichern"
 
 #. Logout action settings
-#: settings/session.c:612
+#: settings/session.c:628
 msgid "Default action on logout"
 msgstr "Standardaktion beim Beenden"
 
 #.
-#: settings/session.c:624 xfce4-session/shutdown.c:252
+#: settings/session.c:640 xfce4-session/shutdown.c:252
 msgid "_Quit current session"
 msgstr "_Beende laufende Sitzung"
 
 #.
-#: settings/session.c:628 xfce4-session/shutdown.c:257
+#: settings/session.c:644 xfce4-session/shutdown.c:257
 msgid "_Reboot the computer"
 msgstr "Computer _rebooten"
 
 #.
-#: settings/session.c:632 xfce4-session/shutdown.c:262
+#: settings/session.c:648 xfce4-session/shutdown.c:262
 msgid "_Turn off computer"
 msgstr "Computer _herunterfahren"
 
 #. Logout action settings
-#: settings/session.c:644
+#: settings/session.c:660
 msgid "Splash screen theme"
 msgstr "Splashscreen Theme"
 
-#: settings/session.c:675
+#: settings/session.c:691
 msgid "Show theme info"
 msgstr "Information zu diesem Thema anzeigen"
 
@@ -113,7 +113,7 @@ msgid ""
 msgstr "Kann Sitzungsverzeichnis %s nicht erstellen: %s"
 
 #.
-#: xfce4-session/main.c:289 xfce4-session/client-list.c:264
+#: xfce4-session/main.c:289 xfce4-session/client-list.c:265
 msgid "Session control"
 msgstr "Sitzungsübersicht"
 
@@ -156,12 +156,12 @@ msgstr ""
 "gestartet."
 
 #. update the tray icon tooltip
-#: xfce4-session/manager.c:524 xfce4-session/manager.c:835
+#: xfce4-session/manager.c:524 xfce4-session/manager.c:833
 #, c-format
 msgid "%u clients connected"
 msgstr "%u Anwendungen angemeldet"
 
-#: xfce4-session/manager.c:824
+#: xfce4-session/manager.c:822
 #, c-format
 msgid ""
 "The client \"%s\" closed the connection\n"
@@ -206,7 +206,7 @@ msgstr ""
 "%s"
 
 #.
-#: xfce4-session/splash-screen.c:264
+#: xfce4-session/splash-screen.c:271
 #, c-format
 msgid "Starting %s..."
 msgstr "Starte %s..."
@@ -219,36 +219,36 @@ msgstr "Durchlaufe Autostart..."
 msgid "Starting session manager..."
 msgstr "Starte Sitzungsmanager..."
 
-#: xfce4-session/client-list.c:71
+#: xfce4-session/client-list.c:72
 msgid "Idle"
 msgstr "Leerlauf"
 
-#: xfce4-session/client-list.c:72
+#: xfce4-session/client-list.c:73
 msgid "Interacting"
 msgstr "Interagiere"
 
-#: xfce4-session/client-list.c:73
+#: xfce4-session/client-list.c:74
 msgid "Save completed"
 msgstr "Gespeichert"
 
-#. global save
-#: xfce4-session/client-list.c:74 xfce4-session/client-list.c:75
+#: xfce4-session/client-list.c:75
 msgid "Saving"
 msgstr "Speichere"
 
-#. local save
+#. global save
 #: xfce4-session/client-list.c:76
+msgid "Saving (local)"
+msgstr "Speichere (lokal)"
+
+#. local save
+#: xfce4-session/client-list.c:77
 msgid "Waiting to interact"
 msgstr "Warte auf Interaktion"
 
-#: xfce4-session/client-list.c:77
+#: xfce4-session/client-list.c:78
 msgid "Waiting to enter Phase2"
 msgstr "Warte auf Phase 2"
 
-#: xfce4-session/client-list.c:78
-msgid "Saving (Phase2)"
-msgstr "Speichere (Phase2)"
-
 #: xfce4-session/client-list.c:79
 msgid "Disconnecting"
 msgstr "Trenne Verbindung"
@@ -258,33 +258,33 @@ msgstr "Trenne Verbindung"
 msgid "Unable to clone client: %s"
 msgstr "Konnte Client %s nicht duplizieren"
 
-#: xfce4-session/client-list.c:288
+#: xfce4-session/client-list.c:293
 msgid "Program"
 msgstr "Programm"
 
-#: xfce4-session/client-list.c:293
+#: xfce4-session/client-list.c:298
 msgid "User"
 msgstr "Benutzer"
 
-#: xfce4-session/client-list.c:300
+#: xfce4-session/client-list.c:305
 msgid "Priority"
 msgstr "Priorität"
 
-#: xfce4-session/client-list.c:305
+#: xfce4-session/client-list.c:310
 msgid "State"
 msgstr "Status"
 
 #. kill button
-#: xfce4-session/client-list.c:324
+#: xfce4-session/client-list.c:329
 msgid "Kill client"
 msgstr "Töte Client"
 
 #. clone button
-#: xfce4-session/client-list.c:330
+#: xfce4-session/client-list.c:335
 msgid "Clone client"
 msgstr "Client duplizieren"
 
-#: xfce4-session/client-list.c:436 xfce4-session/client-list.c:439
+#: xfce4-session/client-list.c:441 xfce4-session/client-list.c:444
 msgid "Unknown"
 msgstr "Unbekannt"
 
diff --git a/po/es.gmo b/po/es.gmo
index e752a806..d81eab2e 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 1fd881cb..da87110f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-13 10:10+0200\n"
+"POT-Creation-Date: 2003-07-13 18:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,80 +15,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings/session.c:219
+#: settings/session.c:226
 msgid "Default Theme"
 msgstr "Tema por omisión"
 
-#: settings/session.c:224
+#: settings/session.c:231
 msgid "Default splash screen"
 msgstr "Desplegado inicial"
 
-#: settings/session.c:263
+#: settings/session.c:270
 #, c-format
 msgid "About %s..."
 msgstr "Acerca de %s..."
 
-#: settings/session.c:285
+#: settings/session.c:292
 msgid "Info:"
 msgstr "Información"
 
-#: settings/session.c:293
+#: settings/session.c:300
 msgid "Author:"
 msgstr "Autor:"
 
-#: settings/session.c:360
+#: settings/session.c:376
 #, c-format
 msgid "Unable to install splash theme from file %s: %s"
 msgstr "Imposible instalar tema para desplegado del archivo %s: %s"
 
-#: settings/session.c:381 settings/session.c:684
+#: settings/session.c:397 settings/session.c:700
 msgid "Install new theme"
 msgstr "Instalar tema nuevo"
 
-#: settings/session.c:450 settings/session.c:561 settings/session.c:575
+#: settings/session.c:466 settings/session.c:577 settings/session.c:591
 msgid "Session management"
 msgstr "Administración de session"
 
 #. General settings
-#: settings/session.c:586
+#: settings/session.c:602
 msgid "General"
 msgstr "General"
 
 #.
-#: settings/session.c:595
+#: settings/session.c:611
 msgid "Confirm logout"
 msgstr "Confirmar salir"
 
-#: settings/session.c:604
+#: settings/session.c:620
 msgid "Automatically save session on logout"
 msgstr "Guardar sessión al salir"
 
 #. Logout action settings
-#: settings/session.c:612
+#: settings/session.c:628
 msgid "Default action on logout"
 msgstr "Acción por omisión al salir"
 
 #.
-#: settings/session.c:624 xfce4-session/shutdown.c:252
+#: settings/session.c:640 xfce4-session/shutdown.c:252
 msgid "_Quit current session"
 msgstr "_Salir de la sessión"
 
 #.
-#: settings/session.c:628 xfce4-session/shutdown.c:257
+#: settings/session.c:644 xfce4-session/shutdown.c:257
 msgid "_Reboot the computer"
 msgstr "_Reiniciar la computadora"
 
 #.
-#: settings/session.c:632 xfce4-session/shutdown.c:262
+#: settings/session.c:648 xfce4-session/shutdown.c:262
 msgid "_Turn off computer"
 msgstr "_Apagar la computadora"
 
 #. Logout action settings
-#: settings/session.c:644
+#: settings/session.c:660
 msgid "Splash screen theme"
 msgstr "Tema del desplegado"
 
-#: settings/session.c:675
+#: settings/session.c:691
 msgid "Show theme info"
 msgstr "Mostrar información del tema"
 
@@ -115,7 +115,7 @@ msgid ""
 msgstr "Imposible crear session de usuariodirectorio %s: %s"
 
 #.
-#: xfce4-session/main.c:289 xfce4-session/client-list.c:264
+#: xfce4-session/main.c:289 xfce4-session/client-list.c:265
 #, fuzzy
 msgid "Session control"
 msgstr "Administración de session"
@@ -155,12 +155,12 @@ msgid ""
 msgstr ""
 
 #. update the tray icon tooltip
-#: xfce4-session/manager.c:524 xfce4-session/manager.c:835
+#: xfce4-session/manager.c:524 xfce4-session/manager.c:833
 #, c-format
 msgid "%u clients connected"
 msgstr ""
 
-#: xfce4-session/manager.c:824
+#: xfce4-session/manager.c:822
 #, c-format
 msgid ""
 "The client \"%s\" closed the connection\n"
@@ -204,7 +204,7 @@ msgstr ""
 "%s"
 
 #.
-#: xfce4-session/splash-screen.c:264
+#: xfce4-session/splash-screen.c:271
 #, c-format
 msgid "Starting %s..."
 msgstr "Comenzando %s..."
@@ -217,34 +217,34 @@ msgstr "Haciendo el autoarranque..."
 msgid "Starting session manager..."
 msgstr "Comenzando el administrador de sessión"
 
-#: xfce4-session/client-list.c:71
+#: xfce4-session/client-list.c:72
 msgid "Idle"
 msgstr ""
 
-#: xfce4-session/client-list.c:72
+#: xfce4-session/client-list.c:73
 msgid "Interacting"
 msgstr ""
 
-#: xfce4-session/client-list.c:73
+#: xfce4-session/client-list.c:74
 msgid "Save completed"
 msgstr ""
 
-#. global save
-#: xfce4-session/client-list.c:74 xfce4-session/client-list.c:75
+#: xfce4-session/client-list.c:75
 msgid "Saving"
 msgstr ""
 
-#. local save
+#. global save
 #: xfce4-session/client-list.c:76
-msgid "Waiting to interact"
+msgid "Saving (local)"
 msgstr ""
 
+#. local save
 #: xfce4-session/client-list.c:77
-msgid "Waiting to enter Phase2"
+msgid "Waiting to interact"
 msgstr ""
 
 #: xfce4-session/client-list.c:78
-msgid "Saving (Phase2)"
+msgid "Waiting to enter Phase2"
 msgstr ""
 
 #: xfce4-session/client-list.c:79
@@ -256,33 +256,33 @@ msgstr ""
 msgid "Unable to clone client: %s"
 msgstr "Imposible comenzar el cliente MCS"
 
-#: xfce4-session/client-list.c:288
+#: xfce4-session/client-list.c:293
 msgid "Program"
 msgstr ""
 
-#: xfce4-session/client-list.c:293
+#: xfce4-session/client-list.c:298
 msgid "User"
 msgstr ""
 
-#: xfce4-session/client-list.c:300
+#: xfce4-session/client-list.c:305
 msgid "Priority"
 msgstr ""
 
-#: xfce4-session/client-list.c:305
+#: xfce4-session/client-list.c:310
 msgid "State"
 msgstr ""
 
 #. kill button
-#: xfce4-session/client-list.c:324
+#: xfce4-session/client-list.c:329
 msgid "Kill client"
 msgstr ""
 
 #. clone button
-#: xfce4-session/client-list.c:330
+#: xfce4-session/client-list.c:335
 msgid "Clone client"
 msgstr ""
 
-#: xfce4-session/client-list.c:436 xfce4-session/client-list.c:439
+#: xfce4-session/client-list.c:441 xfce4-session/client-list.c:444
 msgid "Unknown"
 msgstr ""
 
diff --git a/po/es_MX.gmo b/po/es_MX.gmo
index e752a806..d81eab2e 100644
--- a/po/es_MX.gmo
+++ b/po/es_MX.gmo
diff --git a/po/es_MX.po b/po/es_MX.po
index 1fd881cb..da87110f 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-13 10:10+0200\n"
+"POT-Creation-Date: 2003-07-13 18:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,80 +15,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings/session.c:219
+#: settings/session.c:226
 msgid "Default Theme"
 msgstr "Tema por omisión"
 
-#: settings/session.c:224
+#: settings/session.c:231
 msgid "Default splash screen"
 msgstr "Desplegado inicial"
 
-#: settings/session.c:263
+#: settings/session.c:270
 #, c-format
 msgid "About %s..."
 msgstr "Acerca de %s..."
 
-#: settings/session.c:285
+#: settings/session.c:292
 msgid "Info:"
 msgstr "Información"
 
-#: settings/session.c:293
+#: settings/session.c:300
 msgid "Author:"
 msgstr "Autor:"
 
-#: settings/session.c:360
+#: settings/session.c:376
 #, c-format
 msgid "Unable to install splash theme from file %s: %s"
 msgstr "Imposible instalar tema para desplegado del archivo %s: %s"
 
-#: settings/session.c:381 settings/session.c:684
+#: settings/session.c:397 settings/session.c:700
 msgid "Install new theme"
 msgstr "Instalar tema nuevo"
 
-#: settings/session.c:450 settings/session.c:561 settings/session.c:575
+#: settings/session.c:466 settings/session.c:577 settings/session.c:591
 msgid "Session management"
 msgstr "Administración de session"
 
 #. General settings
-#: settings/session.c:586
+#: settings/session.c:602
 msgid "General"
 msgstr "General"
 
 #.
-#: settings/session.c:595
+#: settings/session.c:611
 msgid "Confirm logout"
 msgstr "Confirmar salir"
 
-#: settings/session.c:604
+#: settings/session.c:620
 msgid "Automatically save session on logout"
 msgstr "Guardar sessión al salir"
 
 #. Logout action settings
-#: settings/session.c:612
+#: settings/session.c:628
 msgid "Default action on logout"
 msgstr "Acción por omisión al salir"
 
 #.
-#: settings/session.c:624 xfce4-session/shutdown.c:252
+#: settings/session.c:640 xfce4-session/shutdown.c:252
 msgid "_Quit current session"
 msgstr "_Salir de la sessión"
 
 #.
-#: settings/session.c:628 xfce4-session/shutdown.c:257
+#: settings/session.c:644 xfce4-session/shutdown.c:257
 msgid "_Reboot the computer"
 msgstr "_Reiniciar la computadora"
 
 #.
-#: settings/session.c:632 xfce4-session/shutdown.c:262
+#: settings/session.c:648 xfce4-session/shutdown.c:262
 msgid "_Turn off computer"
 msgstr "_Apagar la computadora"
 
 #. Logout action settings
-#: settings/session.c:644
+#: settings/session.c:660
 msgid "Splash screen theme"
 msgstr "Tema del desplegado"
 
-#: settings/session.c:675
+#: settings/session.c:691
 msgid "Show theme info"
 msgstr "Mostrar información del tema"
 
@@ -115,7 +115,7 @@ msgid ""
 msgstr "Imposible crear session de usuariodirectorio %s: %s"
 
 #.
-#: xfce4-session/main.c:289 xfce4-session/client-list.c:264
+#: xfce4-session/main.c:289 xfce4-session/client-list.c:265
 #, fuzzy
 msgid "Session control"
 msgstr "Administración de session"
@@ -155,12 +155,12 @@ msgid ""
 msgstr ""
 
 #. update the tray icon tooltip
-#: xfce4-session/manager.c:524 xfce4-session/manager.c:835
+#: xfce4-session/manager.c:524 xfce4-session/manager.c:833
 #, c-format
 msgid "%u clients connected"
 msgstr ""
 
-#: xfce4-session/manager.c:824
+#: xfce4-session/manager.c:822
 #, c-format
 msgid ""
 "The client \"%s\" closed the connection\n"
@@ -204,7 +204,7 @@ msgstr ""
 "%s"
 
 #.
-#: xfce4-session/splash-screen.c:264
+#: xfce4-session/splash-screen.c:271
 #, c-format
 msgid "Starting %s..."
 msgstr "Comenzando %s..."
@@ -217,34 +217,34 @@ msgstr "Haciendo el autoarranque..."
 msgid "Starting session manager..."
 msgstr "Comenzando el administrador de sessión"
 
-#: xfce4-session/client-list.c:71
+#: xfce4-session/client-list.c:72
 msgid "Idle"
 msgstr ""
 
-#: xfce4-session/client-list.c:72
+#: xfce4-session/client-list.c:73
 msgid "Interacting"
 msgstr ""
 
-#: xfce4-session/client-list.c:73
+#: xfce4-session/client-list.c:74
 msgid "Save completed"
 msgstr ""
 
-#. global save
-#: xfce4-session/client-list.c:74 xfce4-session/client-list.c:75
+#: xfce4-session/client-list.c:75
 msgid "Saving"
 msgstr ""
 
-#. local save
+#. global save
 #: xfce4-session/client-list.c:76
-msgid "Waiting to interact"
+msgid "Saving (local)"
 msgstr ""
 
+#. local save
 #: xfce4-session/client-list.c:77
-msgid "Waiting to enter Phase2"
+msgid "Waiting to interact"
 msgstr ""
 
 #: xfce4-session/client-list.c:78
-msgid "Saving (Phase2)"
+msgid "Waiting to enter Phase2"
 msgstr ""
 
 #: xfce4-session/client-list.c:79
@@ -256,33 +256,33 @@ msgstr ""
 msgid "Unable to clone client: %s"
 msgstr "Imposible comenzar el cliente MCS"
 
-#: xfce4-session/client-list.c:288
+#: xfce4-session/client-list.c:293
 msgid "Program"
 msgstr ""
 
-#: xfce4-session/client-list.c:293
+#: xfce4-session/client-list.c:298
 msgid "User"
 msgstr ""
 
-#: xfce4-session/client-list.c:300
+#: xfce4-session/client-list.c:305
 msgid "Priority"
 msgstr ""
 
-#: xfce4-session/client-list.c:305
+#: xfce4-session/client-list.c:310
 msgid "State"
 msgstr ""
 
 #. kill button
-#: xfce4-session/client-list.c:324
+#: xfce4-session/client-list.c:329
 msgid "Kill client"
 msgstr ""
 
 #. clone button
-#: xfce4-session/client-list.c:330
+#: xfce4-session/client-list.c:335
 msgid "Clone client"
 msgstr ""
 
-#: xfce4-session/client-list.c:436 xfce4-session/client-list.c:439
+#: xfce4-session/client-list.c:441 xfce4-session/client-list.c:444
 msgid "Unknown"
 msgstr ""
 
diff --git a/po/nl.gmo b/po/nl.gmo
index cf944a6f..3625012e 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 0ba38ba8..55aabd71 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-13 10:10+0200\n"
+"POT-Creation-Date: 2003-07-13 18:14+0200\n"
 "PO-Revision-Date: 2003-07-08 15:00+0200\n"
 "Last-Translator: Jasper Huijsmans <huysmans@users.sourceforge.net>\n"
 "Language-Team: Nederlands <NL@li.org>\n"
@@ -15,80 +15,80 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings/session.c:219
+#: settings/session.c:226
 msgid "Default Theme"
 msgstr "Standaard Thema"
 
-#: settings/session.c:224
+#: settings/session.c:231
 msgid "Default splash screen"
 msgstr "Standaard splash screen"
 
-#: settings/session.c:263
+#: settings/session.c:270
 #, c-format
 msgid "About %s..."
 msgstr "Over %s..."
 
-#: settings/session.c:285
+#: settings/session.c:292
 msgid "Info:"
 msgstr "Info:"
 
-#: settings/session.c:293
+#: settings/session.c:300
 msgid "Author:"
 msgstr "Auteur:"
 
-#: settings/session.c:360
+#: settings/session.c:376
 #, c-format
 msgid "Unable to install splash theme from file %s: %s"
 msgstr "Kan splash screen niet installeren uit bestand %s: %s"
 
-#: settings/session.c:381 settings/session.c:684
+#: settings/session.c:397 settings/session.c:700
 msgid "Install new theme"
 msgstr "Nieuw thema installeren"
 
-#: settings/session.c:450 settings/session.c:561 settings/session.c:575
+#: settings/session.c:466 settings/session.c:577 settings/session.c:591
 msgid "Session management"
 msgstr "Sessiebeheer"
 
 #. General settings
-#: settings/session.c:586
+#: settings/session.c:602
 msgid "General"
 msgstr "Algemeen"
 
 #.
-#: settings/session.c:595
+#: settings/session.c:611
 msgid "Confirm logout"
 msgstr "Uitloggen bevestigen"
 
-#: settings/session.c:604
+#: settings/session.c:620
 msgid "Automatically save session on logout"
 msgstr "Automatisch sessie bewaren bij uitloggen"
 
 #. Logout action settings
-#: settings/session.c:612
+#: settings/session.c:628
 msgid "Default action on logout"
 msgstr "Standaard actie bij uitloggen"
 
 #.
-#: settings/session.c:624 xfce4-session/shutdown.c:252
+#: settings/session.c:640 xfce4-session/shutdown.c:252
 msgid "_Quit current session"
 msgstr "_Huidige sessie afsluiten"
 
 #.
-#: settings/session.c:628 xfce4-session/shutdown.c:257
+#: settings/session.c:644 xfce4-session/shutdown.c:257
 msgid "_Reboot the computer"
 msgstr "Computer opnieuw _opstarten"
 
 #.
-#: settings/session.c:632 xfce4-session/shutdown.c:262
+#: settings/session.c:648 xfce4-session/shutdown.c:262
 msgid "_Turn off computer"
 msgstr "Computer _afsluiten"
 
 #. Logout action settings
-#: settings/session.c:644
+#: settings/session.c:660
 msgid "Splash screen theme"
 msgstr "Splash screen thema"
 
-#: settings/session.c:675
+#: settings/session.c:691
 msgid "Show theme info"
 msgstr "Thema informatie"
 
@@ -119,7 +119,7 @@ msgstr ""
 "XFce sessie niet creëren: %s: %s"
 
 #.
-#: xfce4-session/main.c:289 xfce4-session/client-list.c:264
+#: xfce4-session/main.c:289 xfce4-session/client-list.c:265
 #, fuzzy
 msgid "Session control"
 msgstr "Sessiebeheer"
@@ -163,12 +163,12 @@ msgstr ""
 "Een standaard sessie zal worden gestart."
 
 #. update the tray icon tooltip
-#: xfce4-session/manager.c:524 xfce4-session/manager.c:835
+#: xfce4-session/manager.c:524 xfce4-session/manager.c:833
 #, c-format
 msgid "%u clients connected"
 msgstr ""
 
-#: xfce4-session/manager.c:824
+#: xfce4-session/manager.c:822
 #, c-format
 msgid ""
 "The client \"%s\" closed the connection\n"
@@ -212,7 +212,7 @@ msgstr ""
 "%s"
 
 #.
-#: xfce4-session/splash-screen.c:264
+#: xfce4-session/splash-screen.c:271
 #, c-format
 msgid "Starting %s..."
 msgstr "Bezig met starten %s..."
@@ -225,34 +225,34 @@ msgstr "Bezig met uitvoeren Autostart..."
 msgid "Starting session manager..."
 msgstr "Bezig met starten sesiebeheerder"
 
-#: xfce4-session/client-list.c:71
+#: xfce4-session/client-list.c:72
 msgid "Idle"
 msgstr ""
 
-#: xfce4-session/client-list.c:72
+#: xfce4-session/client-list.c:73
 msgid "Interacting"
 msgstr ""
 
-#: xfce4-session/client-list.c:73
+#: xfce4-session/client-list.c:74
 msgid "Save completed"
 msgstr ""
 
-#. global save
-#: xfce4-session/client-list.c:74 xfce4-session/client-list.c:75
+#: xfce4-session/client-list.c:75
 msgid "Saving"
 msgstr ""
 
-#. local save
+#. global save
 #: xfce4-session/client-list.c:76
-msgid "Waiting to interact"
+msgid "Saving (local)"
 msgstr ""
 
+#. local save
 #: xfce4-session/client-list.c:77
-msgid "Waiting to enter Phase2"
+msgid "Waiting to interact"
 msgstr ""
 
 #: xfce4-session/client-list.c:78
-msgid "Saving (Phase2)"
+msgid "Waiting to enter Phase2"
 msgstr ""
 
 #: xfce4-session/client-list.c:79
@@ -264,33 +264,33 @@ msgstr ""
 msgid "Unable to clone client: %s"
 msgstr "Kan MCS client niet creëren"
 
-#: xfce4-session/client-list.c:288
+#: xfce4-session/client-list.c:293
 msgid "Program"
 msgstr ""
 
-#: xfce4-session/client-list.c:293
+#: xfce4-session/client-list.c:298
 msgid "User"
 msgstr ""
 
-#: xfce4-session/client-list.c:300
+#: xfce4-session/client-list.c:305
 msgid "Priority"
 msgstr ""
 
-#: xfce4-session/client-list.c:305
+#: xfce4-session/client-list.c:310
 msgid "State"
 msgstr ""
 
 #. kill button
-#: xfce4-session/client-list.c:324
+#: xfce4-session/client-list.c:329
 msgid "Kill client"
 msgstr ""
 
 #. clone button
-#: xfce4-session/client-list.c:330
+#: xfce4-session/client-list.c:335
 msgid "Clone client"
 msgstr ""
 
-#: xfce4-session/client-list.c:436 xfce4-session/client-list.c:439
+#: xfce4-session/client-list.c:441 xfce4-session/client-list.c:444
 msgid "Unknown"
 msgstr ""
 
diff --git a/po/xfce4-session.pot b/po/xfce4-session.pot
index f965b6d0..0347d8b9 100644
--- a/po/xfce4-session.pot
+++ b/po/xfce4-session.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-13 10:10+0200\n"
+"POT-Creation-Date: 2003-07-13 18:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,80 +15,80 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings/session.c:219
+#: settings/session.c:226
 msgid "Default Theme"
 msgstr ""
 
-#: settings/session.c:224
+#: settings/session.c:231
 msgid "Default splash screen"
 msgstr ""
 
-#: settings/session.c:263
+#: settings/session.c:270
 #, c-format
 msgid "About %s..."
 msgstr ""
 
-#: settings/session.c:285
+#: settings/session.c:292
 msgid "Info:"
 msgstr ""
 
-#: settings/session.c:293
+#: settings/session.c:300
 msgid "Author:"
 msgstr ""
 
-#: settings/session.c:360
+#: settings/session.c:376
 #, c-format
 msgid "Unable to install splash theme from file %s: %s"
 msgstr ""
 
-#: settings/session.c:381 settings/session.c:684
+#: settings/session.c:397 settings/session.c:700
 msgid "Install new theme"
 msgstr ""
 
-#: settings/session.c:450 settings/session.c:561 settings/session.c:575
+#: settings/session.c:466 settings/session.c:577 settings/session.c:591
 msgid "Session management"
 msgstr ""
 
 #. General settings
-#: settings/session.c:586
+#: settings/session.c:602
 msgid "General"
 msgstr ""
 
 #.
-#: settings/session.c:595
+#: settings/session.c:611
 msgid "Confirm logout"
 msgstr ""
 
-#: settings/session.c:604
+#: settings/session.c:620
 msgid "Automatically save session on logout"
 msgstr ""
 
 #. Logout action settings
-#: settings/session.c:612
+#: settings/session.c:628
 msgid "Default action on logout"
 msgstr ""
 
 #.
-#: settings/session.c:624 xfce4-session/shutdown.c:252
+#: settings/session.c:640 xfce4-session/shutdown.c:252
 msgid "_Quit current session"
 msgstr ""
 
 #.
-#: settings/session.c:628 xfce4-session/shutdown.c:257
+#: settings/session.c:644 xfce4-session/shutdown.c:257
 msgid "_Reboot the computer"
 msgstr ""
 
 #.
-#: settings/session.c:632 xfce4-session/shutdown.c:262
+#: settings/session.c:648 xfce4-session/shutdown.c:262
 msgid "_Turn off computer"
 msgstr ""
 
 #. Logout action settings
-#: settings/session.c:644
+#: settings/session.c:660
 msgid "Splash screen theme"
 msgstr ""
 
-#: settings/session.c:675
+#: settings/session.c:691
 msgid "Show theme info"
 msgstr ""
 
@@ -115,7 +115,7 @@ msgid ""
 msgstr ""
 
 #.
-#: xfce4-session/main.c:289 xfce4-session/client-list.c:264
+#: xfce4-session/main.c:289 xfce4-session/client-list.c:265
 msgid "Session control"
 msgstr ""
 
@@ -150,12 +150,12 @@ msgid ""
 msgstr ""
 
 #. update the tray icon tooltip
-#: xfce4-session/manager.c:524 xfce4-session/manager.c:835
+#: xfce4-session/manager.c:524 xfce4-session/manager.c:833
 #, c-format
 msgid "%u clients connected"
 msgstr ""
 
-#: xfce4-session/manager.c:824
+#: xfce4-session/manager.c:822
 #, c-format
 msgid ""
 "The client \"%s\" closed the connection\n"
@@ -192,7 +192,7 @@ msgid ""
 msgstr ""
 
 #.
-#: xfce4-session/splash-screen.c:264
+#: xfce4-session/splash-screen.c:271
 #, c-format
 msgid "Starting %s..."
 msgstr ""
@@ -205,34 +205,34 @@ msgstr ""
 msgid "Starting session manager..."
 msgstr ""
 
-#: xfce4-session/client-list.c:71
+#: xfce4-session/client-list.c:72
 msgid "Idle"
 msgstr ""
 
-#: xfce4-session/client-list.c:72
+#: xfce4-session/client-list.c:73
 msgid "Interacting"
 msgstr ""
 
-#: xfce4-session/client-list.c:73
+#: xfce4-session/client-list.c:74
 msgid "Save completed"
 msgstr ""
 
-#. global save
-#: xfce4-session/client-list.c:74 xfce4-session/client-list.c:75
+#: xfce4-session/client-list.c:75
 msgid "Saving"
 msgstr ""
 
-#. local save
+#. global save
 #: xfce4-session/client-list.c:76
-msgid "Waiting to interact"
+msgid "Saving (local)"
 msgstr ""
 
+#. local save
 #: xfce4-session/client-list.c:77
-msgid "Waiting to enter Phase2"
+msgid "Waiting to interact"
 msgstr ""
 
 #: xfce4-session/client-list.c:78
-msgid "Saving (Phase2)"
+msgid "Waiting to enter Phase2"
 msgstr ""
 
 #: xfce4-session/client-list.c:79
@@ -244,33 +244,33 @@ msgstr ""
 msgid "Unable to clone client: %s"
 msgstr ""
 
-#: xfce4-session/client-list.c:288
+#: xfce4-session/client-list.c:293
 msgid "Program"
 msgstr ""
 
-#: xfce4-session/client-list.c:293
+#: xfce4-session/client-list.c:298
 msgid "User"
 msgstr ""
 
-#: xfce4-session/client-list.c:300
+#: xfce4-session/client-list.c:305
 msgid "Priority"
 msgstr ""
 
-#: xfce4-session/client-list.c:305
+#: xfce4-session/client-list.c:310
 msgid "State"
 msgstr ""
 
 #. kill button
-#: xfce4-session/client-list.c:324
+#: xfce4-session/client-list.c:329
 msgid "Kill client"
 msgstr ""
 
 #. clone button
-#: xfce4-session/client-list.c:330
+#: xfce4-session/client-list.c:335
 msgid "Clone client"
 msgstr ""
 
-#: xfce4-session/client-list.c:436 xfce4-session/client-list.c:439
+#: xfce4-session/client-list.c:441 xfce4-session/client-list.c:444
 msgid "Unknown"
 msgstr ""
 
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index e62dd390..be575191 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4dd86090..f48a5d84 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XFSession 0.0.15\n"
-"POT-Creation-Date: 2003-07-13 10:10+0200\n"
+"POT-Creation-Date: 2003-07-13 18:14+0200\n"
 "PO-Revision-Date: 2003-07-10 13:10+0200\n"
 "Last-Translator: Yongtao Yang <yongtao.yang@telia.com>\n"
 "Language-Team: none <none@none>\n"
@@ -17,80 +17,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings/session.c:219
+#: settings/session.c:226
 msgid "Default Theme"
 msgstr "默认主题"
 
-#: settings/session.c:224
+#: settings/session.c:231
 msgid "Default splash screen"
 msgstr "默认飞溅屏幕"
 
-#: settings/session.c:263
+#: settings/session.c:270
 #, c-format
 msgid "About %s..."
 msgstr "关于 %s..."
 
-#: settings/session.c:285
+#: settings/session.c:292
 msgid "Info:"
 msgstr "信息:"
 
-#: settings/session.c:293
+#: settings/session.c:300
 msgid "Author:"
 msgstr "作者:"
 
-#: settings/session.c:360
+#: settings/session.c:376
 #, c-format
 msgid "Unable to install splash theme from file %s: %s"
 msgstr "无法从文件 %s 中安装飞溅屏幕主题: %s"
 
-#: settings/session.c:381 settings/session.c:684
+#: settings/session.c:397 settings/session.c:700
 msgid "Install new theme"
 msgstr "安装新主题"
 
-#: settings/session.c:450 settings/session.c:561 settings/session.c:575
+#: settings/session.c:466 settings/session.c:577 settings/session.c:591
 msgid "Session management"
 msgstr "会话管理"
 
 #. General settings
-#: settings/session.c:586
+#: settings/session.c:602
 msgid "General"
 msgstr "通用"
 
 #.
-#: settings/session.c:595
+#: settings/session.c:611
 msgid "Confirm logout"
 msgstr "注销确认"
 
-#: settings/session.c:604
+#: settings/session.c:620
 msgid "Automatically save session on logout"
 msgstr "注销时自动保存会话"
 
 #. Logout action settings
-#: settings/session.c:612
+#: settings/session.c:628
 msgid "Default action on logout"
 msgstr "注销时的默认动作"
 
 #.
-#: settings/session.c:624 xfce4-session/shutdown.c:252
+#: settings/session.c:640 xfce4-session/shutdown.c:252
 msgid "_Quit current session"
 msgstr "退出当前会话(_Q)"
 
 #.
-#: settings/session.c:628 xfce4-session/shutdown.c:257
+#: settings/session.c:644 xfce4-session/shutdown.c:257
 msgid "_Reboot the computer"
 msgstr "重新启动计算机(_R)"
 
 #.
-#: settings/session.c:632 xfce4-session/shutdown.c:262
+#: settings/session.c:648 xfce4-session/shutdown.c:262
 msgid "_Turn off computer"
 msgstr "关闭计算机(_T)"
 
 #. Logout action settings
-#: settings/session.c:644
+#: settings/session.c:660
 msgid "Splash screen theme"
 msgstr "飞溅屏幕主题"
 
-#: settings/session.c:675
+#: settings/session.c:691
 msgid "Show theme info"
 msgstr "显示主题信息"
 
@@ -117,7 +117,7 @@ msgid ""
 msgstr "msgstr \"无法创建用户的XFce会话目录 %s: %s\""
 
 #.
-#: xfce4-session/main.c:289 xfce4-session/client-list.c:264
+#: xfce4-session/main.c:289 xfce4-session/client-list.c:265
 msgid "Session control"
 msgstr "会话控制"
 
@@ -159,12 +159,12 @@ msgstr ""
 "默认会话。"
 
 #. update the tray icon tooltip
-#: xfce4-session/manager.c:524 xfce4-session/manager.c:835
+#: xfce4-session/manager.c:524 xfce4-session/manager.c:833
 #, c-format
 msgid "%u clients connected"
 msgstr ""
 
-#: xfce4-session/manager.c:824
+#: xfce4-session/manager.c:822
 #, c-format
 msgid ""
 "The client \"%s\" closed the connection\n"
@@ -207,7 +207,7 @@ msgstr ""
 "%s"
 
 #.
-#: xfce4-session/splash-screen.c:264
+#: xfce4-session/splash-screen.c:271
 #, c-format
 msgid "Starting %s..."
 msgstr "启动 %s..."
@@ -220,34 +220,34 @@ msgstr "执行自动启动..."
 msgid "Starting session manager..."
 msgstr "启动会话管理器..."
 
-#: xfce4-session/client-list.c:71
+#: xfce4-session/client-list.c:72
 msgid "Idle"
 msgstr ""
 
-#: xfce4-session/client-list.c:72
+#: xfce4-session/client-list.c:73
 msgid "Interacting"
 msgstr ""
 
-#: xfce4-session/client-list.c:73
+#: xfce4-session/client-list.c:74
 msgid "Save completed"
 msgstr ""
 
-#. global save
-#: xfce4-session/client-list.c:74 xfce4-session/client-list.c:75
+#: xfce4-session/client-list.c:75
 msgid "Saving"
 msgstr ""
 
-#. local save
+#. global save
 #: xfce4-session/client-list.c:76
-msgid "Waiting to interact"
+msgid "Saving (local)"
 msgstr ""
 
+#. local save
 #: xfce4-session/client-list.c:77
-msgid "Waiting to enter Phase2"
+msgid "Waiting to interact"
 msgstr ""
 
 #: xfce4-session/client-list.c:78
-msgid "Saving (Phase2)"
+msgid "Waiting to enter Phase2"
 msgstr ""
 
 #: xfce4-session/client-list.c:79
@@ -259,33 +259,33 @@ msgstr ""
 msgid "Unable to clone client: %s"
 msgstr "无法复制客户：%s"
 
-#: xfce4-session/client-list.c:288
+#: xfce4-session/client-list.c:293
 msgid "Program"
 msgstr "程序"
 
-#: xfce4-session/client-list.c:293
+#: xfce4-session/client-list.c:298
 msgid "User"
 msgstr "用户"
 
-#: xfce4-session/client-list.c:300
+#: xfce4-session/client-list.c:305
 msgid "Priority"
 msgstr "优先级"
 
-#: xfce4-session/client-list.c:305
+#: xfce4-session/client-list.c:310
 msgid "State"
 msgstr ""
 
 #. kill button
-#: xfce4-session/client-list.c:324
+#: xfce4-session/client-list.c:329
 msgid "Kill client"
 msgstr "中止客户程序"
 
 #. clone button
-#: xfce4-session/client-list.c:330
+#: xfce4-session/client-list.c:335
 msgid "Clone client"
 msgstr "复制客户程序"
 
-#: xfce4-session/client-list.c:436 xfce4-session/client-list.c:439
+#: xfce4-session/client-list.c:441 xfce4-session/client-list.c:444
 msgid "Unknown"
 msgstr "未知"
 
diff --git a/settings/session.c b/settings/session.c
index 37ca6b95..4211e4a2 100644
--- a/settings/session.c
+++ b/settings/session.c
@@ -39,6 +39,9 @@
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include <libxfce4mcs/mcs-manager.h>
 #include <libxfce4util/debug.h>
@@ -360,8 +363,13 @@ do_install_theme(GtkWidget *dialog, gpointer data)
 	error = NULL;
 
 	/* check if users splash themes directory exists */
-	if (!g_file_test(dir, G_FILE_TEST_IS_DIR))
+	if (!g_file_test(dir, G_FILE_TEST_IS_DIR)) {
+#ifdef HAVE_MKDIR
 		(void)mkdir(dir, 0755);
+#else
+		(void)execlp("mkdir", "mkdir", dir, NULL);
+#endif
+	}
 
 	if (!g_spawn_sync(dir, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
 				NULL, NULL, NULL, &error)) {
diff --git a/xfce4-session/client-list.c b/xfce4-session/client-list.c
index 5f2513e7..85ff78c4 100644
--- a/xfce4-session/client-list.c
+++ b/xfce4-session/client-list.c
@@ -28,10 +28,11 @@
 #include <config.h>
 #endif /* !HAVE_CONFIG_H */
 
+#include <gtk/gtk.h>
 #include <libxfce4util/i18n.h>
 #include <libxfcegui4/libxfcegui4.h>
-#include <gtk/gtk.h>
 
+#include <settings/session-icon.h>
 #include <xfce4-session/client.h>
 #include <xfce4-session/client-list.h>
 #include <xfce4-session/util.h>
@@ -72,10 +73,9 @@ static const gchar *state_names[] = {
 	N_("Interacting"),
 	N_("Save completed"),
 	N_("Saving"),			/* global save */
-	N_("Saving"),			/* local save */
+	N_("Saving (local)"),		/* local save */
 	N_("Waiting to interact"),
 	N_("Waiting to enter Phase2"),
-	N_("Saving (Phase2)"),
 	N_("Disconnecting"),
 	NULL
 };
@@ -253,6 +253,7 @@ xfsm_client_list_init(XfsmClientList *list)
 	GtkTreeSelection *selection;
 	GtkCellRenderer *renderer;
 	GtkListStore *store;
+	GdkPixbuf *icon;
 	GtkWidget *swin;
 	GtkWidget *vbox;
 
@@ -263,6 +264,11 @@ xfsm_client_list_init(XfsmClientList *list)
 	gtk_window_set_position(GTK_WINDOW(list), GTK_WIN_POS_CENTER_ALWAYS);
 	gtk_window_set_title(GTK_WINDOW(list), _("Session control"));
 
+	/* set window icon */
+	icon = gdk_pixbuf_new_from_inline(-1, session_icon_data, FALSE, NULL);
+	gtk_window_set_icon(GTK_WINDOW(list), icon);
+	g_object_unref(G_OBJECT(icon));
+
 	/* */
 	vbox = GTK_DIALOG(list)->vbox;
 
diff --git a/xfce4-session/client.h b/xfce4-session/client.h
index 331f3a51..f3072899 100644
--- a/xfce4-session/client.h
+++ b/xfce4-session/client.h
@@ -44,7 +44,6 @@ enum
 	CLIENT_SAVINGLOCAL,
 	CLIENT_WAITFORINTERACT,
 	CLIENT_WAITFORPHASE2,
-	CLIENT_PHASE2,
 	CLIENT_DISCONNECTED,
 };
 
diff --git a/xfce4-session/manager.c b/xfce4-session/manager.c
index 14eeea1b..e349ddfd 100644
--- a/xfce4-session/manager.c
+++ b/xfce4-session/manager.c
@@ -646,7 +646,6 @@ save_yourself_phase2_request(SmsConn smsConn, Client *client)
 		 * send the save yourself phase2.
 		 */
 		SmsSaveYourselfPhase2(client->smsConn);
-		/*client->state = CLIENT_PHASE2;*/
 		return;
 	}
 
@@ -663,7 +662,7 @@ save_yourself_phase2_request(SmsConn smsConn, Client *client)
 	/* ok, we are ready to enter SaveYourselfPhase2 */
 	for (lp = g_list_first(clients); lp; lp = lp->next) {
 		if (client_state(lp->data) == CLIENT_WAITFORPHASE2) {
-			client_set_state(lp->data, CLIENT_PHASE2);
+			client_set_state(lp->data, CLIENT_SAVING);
 			SmsSaveYourselfPhase2(CLIENT(lp->data)->smsConn);
 		}
 	}
@@ -685,8 +684,7 @@ save_yourself_done(SmsConn smsConn, Client *client, Bool success)
 	}
 
 	/* validate client requests */
-	if (client_state(client) != CLIENT_PHASE2 &&
-	    client_state(client) != CLIENT_SAVING) {
+	if (client_state(client) != CLIENT_SAVING) {
 #ifdef DEBUG
 		g_warning("The client %s which is neither in SaveYourself "
 			  "nor in SaveYourselfPhase2 state send a "
@@ -726,7 +724,7 @@ save_yourself_done(SmsConn smsConn, Client *client, Bool success)
 			if (CLIENT(lp->data)->state != CLIENT_WAITFORPHASE2)
 				continue;
 
-			client_set_state(lp->data, CLIENT_PHASE2);
+			client_set_state(lp->data, CLIENT_SAVING);
 			SmsSaveYourselfPhase2(CLIENT(lp->data)->smsConn);
 		}
 
diff --git a/xfce4-session/splash-screen.c b/xfce4-session/splash-screen.c
index 83ccda24..0ac9f4cc 100644
--- a/xfce4-session/splash-screen.c
+++ b/xfce4-session/splash-screen.c
@@ -39,13 +39,14 @@
 #include <string.h>
 #endif
 
+#include <gtk/gtk.h>
 #include <libxfce4util/i18n.h>
 #include <libxfce4util/util.h>
 #include <libxfcegui4/libxfcegui4.h>
-#include <gtk/gtk.h>
 
-#include <xfce4-session/splash-screen.h>
 #include <xfce4-session/splash-fallback.h>
+#include <xfce4-session/splash-screen.h>
+#include <xfce4-session/util.h>
 
 /* max number of pictures for a splash theme */
 #define	MAX_PICTURES	25
@@ -134,6 +135,12 @@ xfsm_splash_screen_init(XfsmSplashScreen *splash)
 			gdk_cursor_new(GDK_WATCH));
 
 	/* */
+#if GTK_CHECK_VERSION(2, 2, 0)
+	gdk_window_set_skip_pager_hint(GTK_WIDGET(splash)->window, TRUE);
+	gdk_window_set_skip_taskbar_hint(GTK_WIDGET(splash)->window, TRUE);
+#endif
+
+	/* */
 	vbox = gtk_vbox_new(FALSE, 1);
 	gtk_container_add(GTK_CONTAINER(splash), vbox);
 	gtk_widget_show(vbox);
diff --git a/xfce4-session/util.c b/xfce4-session/util.c
index 47fd8908..80b8b631 100644
--- a/xfce4-session/util.c
+++ b/xfce4-session/util.c
@@ -49,9 +49,12 @@
 #include <unistd.h>
 #endif
 
+#include <X11/Xlib.h>
+
+#include <gdk/gdkx.h>
 #include <glib.h>
 
-#include "util.h"
+#include <xfce4-session/util.h>
 
 /*
  * Read a string from session file
@@ -182,3 +185,72 @@ xfsm_imgbtn_new(const gchar *text, const gchar *icon)
 	return(button);
 }
 
+#if 0
+/*
+ * XXX - move this to libxfcegui4
+ */
+static void
+set_skip_pager_handler(GtkWidget *widget, gpointer data)
+{
+	extern void p_netk_change_state(Screen *, Window, gboolean, Atom, Atom);
+	extern Atom p_netk_atom_get(const char *);
+
+	p_netk_change_state(DefaultScreenOfDisplay(GDK_DISPLAY()),
+			GDK_WINDOW_XWINDOW(widget->window),
+			GPOINTER_TO_UINT(data),
+			p_netk_atom_get("_NET_WM_STATE_SKIP_PAGER"), 0);
+}
+
+/*
+ * XXX - move this to libxfcegui4
+ */
+static void
+set_skip_tasklist_handler(GtkWidget *widget, gpointer data)
+{
+	extern void p_netk_change_state(Screen *, Window, gboolean, Atom, Atom);
+	extern Atom p_netk_atom_get(const char *);
+
+	p_netk_change_state(DefaultScreenOfDisplay(GDK_DISPLAY()),
+			GDK_WINDOW_XWINDOW(widget->window),
+			GPOINTER_TO_UINT(data),
+			p_netk_atom_get("_NET_WM_STATE_SKIP_TASKBAR"), 0);
+}
+
+/*
+ * XXX - move this to libxfcegui4
+ */
+void
+netk_gtk_window_set_skip_pager(GtkWindow *window, gboolean value)
+{
+	g_return_if_fail(GTK_IS_WINDOW(window));
+
+	if (GTK_WIDGET_REALIZED(window)) {
+		set_skip_pager_handler(GTK_WIDGET(window),
+				GUINT_TO_POINTER(value));
+	}
+
+	/* XXX - the handler should be removed prior to connecting a new one */
+	g_signal_connect(G_OBJECT(window), "realize",
+		G_CALLBACK(set_skip_pager_handler),
+		GUINT_TO_POINTER(value));
+}
+
+/*
+ * XXX - move this to libxfcegui4
+ */
+void
+netk_gtk_window_set_skip_tasklist(GtkWindow *window, gboolean value)
+{
+	g_return_if_fail(GTK_IS_WINDOW(window));
+
+	if (GTK_WIDGET_REALIZED(window)) {
+		set_skip_tasklist_handler(GTK_WIDGET(window),
+				GUINT_TO_POINTER(value));
+	}
+
+	/* XXX - the handler should be removed prior to connecting a new one */
+	g_signal_connect(G_OBJECT(window), "realize",
+		G_CALLBACK(set_skip_tasklist_handler),
+		GUINT_TO_POINTER(value));
+}
+#endif
diff --git a/xfce4-session/util.h b/xfce4-session/util.h
index 8fe7d95d..66106da5 100644
--- a/xfce4-session/util.h
+++ b/xfce4-session/util.h
@@ -40,5 +40,11 @@ extern gchar	*xfce_gethostname(void);
 
 extern GtkWidget	*xfsm_imgbtn_new(const gchar *, const gchar *);
 
+#if 0
+/* NOT YET: Does not work when no NET wm is running */
+extern void		netk_gtk_window_set_skip_pager(GtkWindow *, gboolean);
+extern void		netk_gtk_window_set_skip_tasklist(GtkWindow *,gboolean);
+#endif
+
 #endif	/* !__XFSM_UTIL_H__ */